Browse Source

updated 4 packages

Field3D-1.7.3-5

OpenColorIO-2.1.0-1

OpenImageIO-2.2.18.0-1

hdf5-1.12.1-1
Tomohiro "Tomo-p" KATO 11 months ago
parent
commit
2c9bde9434
4 changed files with 86 additions and 74 deletions
  1. 9 12
      F/Field3D/Field3D-vl.spec
  2. 48 41
      O/OpenColorIO/OpenColorIO-vl.spec
  3. 14 14
      O/OpenImageIO/OpenImageIO-vl.spec
  4. 15 7
      h/hdf5/hdf5-vl.spec

+ 9 - 12
F/Field3D/Field3D-vl.spec

@@ -1,6 +1,6 @@
 Name:           Field3D
 Version:        1.7.3
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 Summary:        Library for storing voxel data
 Summary(ja):    ボクセルデータを蓄積するためのライブラリ
 Group:          system
@@ -11,11 +11,13 @@ License:        BSD
 URL:            https://sites.google.com/site/field3d/
 # https://github.com/imageworks/Field3D/archive/v1.6.2.tar.gz
 Source0:        https://github.com/imageworks/Field3D/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         Field3D-openexr.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  cmake doxygen
 BuildRequires:  hdf5-devel
-BuildRequires:  ilmbase-devel
+BuildRequires:  imath-devel
+BuildRequires:  OpenEXR-devel
 BuildRequires:  libboost-devel
 BuildRequires:  libboost-atomic
 BuildRequires:  libboost-chrono
@@ -50,17 +52,8 @@ Development headers and documentation for %{name}.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
-# for OpenEXR (IlmBase) >= 2.4.0
-SFX=`pkg-config --variable=libsuffix IlmBase`
-
-sed -i \
-	-e "s/ Iex / Iex$SFX /" \
-	-e "s/ Half / Half$SFX /" \
-	-e "s/ IlmThread / IlmThread$SFX /" \
-	-e "s/ Imath/ Imath$SFX/" \
-	CMakeLists.txt
 
 %build
 export CFLAGS="%{?optflags} -DH5_USE_110_API=1"
@@ -99,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7.3-5
+- rebuilt with OpenEXR-3.1.1.
+- imported Patch0 from rawhide to build with OpenEXR-3.x.
+
 * Thu Apr 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7.3-4
 - rebuilt with icu69.
 - dropped ldconfig scriptlets.

+ 48 - 41
O/OpenColorIO/OpenColorIO-vl.spec

@@ -7,12 +7,11 @@
 }
 
 Name:           OpenColorIO
-Version:        1.1.1
+Version:        2.1.0
 Release:        1%{?_dist_release}
 Summary:        Enables color transforms and image display across graphics apps
 Summary(ja):    アプリケーション間での色変換と画像表示を行うためのライブラリ
-Group:          System Environment/Libraries
-
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -22,12 +21,15 @@ URL:            https://opencolorio.org/
 # https://github.com/imageworks/OpenColorIO/tarball/v1.0.8
 
 Source0:        https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch1:         OpenColorIO-yaml_cpp3.patch
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1296
+Patch0:         ocio-install.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  cmake
 BuildRequires:  git
 BuildRequires:  help2man
+BuildRequires:  python3-devel
+BuildRequires:  python3-rpm-macros
 %if %{with doc}
 BuildRequires:  texlive-collection-fontsrecommended
 BuildRequires:  texlive-collection-latexextra
@@ -35,18 +37,28 @@ BuildRequires:  texlive-collection-latexrecommended
 %endif
 
 # Libraries
-BuildRequires:  python3-devel
-BuildRequires:  python3-rpm-macros
-BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
-BuildRequires:  libX11-devel libXmu-devel libXi-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libboost-devel
+BuildRequires:  expat-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  glew-devel
+BuildRequires:  libX11-devel libXmu-devel libXi-devel
+BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
+#BuildRequires:  opencv-devel
+BuildRequires:  pybind11-devel
+BuildRequires:  python3-devel
+BuildRequires:  python3-pip
+#BuildRequires:  pystring-devel
 BuildRequires:  zlib-devel
 
+# WARNING: OpenColorIO and OpenImageIO are cross dependent.
+# If an ABI incompatible update is done in one, the other also needs to be
+# rebuilt.
+BuildRequires:  OpenImageIO-devel
+
 #######################
 # Unbundled libraries #
 #######################
-BuildRequires:  tinyxml-devel
 BuildRequires:  lcms2-devel
 #BuildRequires:  yaml-cpp-devel
 
@@ -61,7 +73,6 @@ BuildRequires:  lcms2-devel
 Obsoletes: %{name}-doc < %{version}-%{release}
 %endif
 
-
 %description
 OCIO enables color transforms and image display to be handled in a consistent
 manner across multiple graphics applications. Unlike other color management
@@ -72,7 +83,7 @@ emphasis on visual effects and animation color pipelines.
 %package devel
 Summary:        Development libraries and headers for %{name}
 Summary(ja):    %{name} の開発用ライブラリおよびヘッダファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
@@ -82,7 +93,7 @@ Development libraries and headers for %{name}.
 %package doc
 Summary:        API Documentation for %{name}
 Summary(ja):    %{name} API のドキュメント
-Group:          Documentation
+Group:          documentation
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
@@ -90,18 +101,15 @@ Requires:       %{name} = %{version}-%{release}
 API documentation for %{name}.
 
 
-%prep
-%setup -q
-#patch1 -p1 -b .yaml3
+%debug_package
 
-# Remove what bundled libraries
-rm -f ext/lcms*
-rm -f ext/tinyxml*
-#rm -f ext/yaml*
+
+%prep
+%autosetup -p1
 
 
 %build
-rm -rf build && mkdir build && pushd build
+rm -rf %{_vpath_builddir}
 
 export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-cast-function-type -Wno-unused-function"
 
@@ -115,37 +123,36 @@ export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-cast-function-typ
        -DOCIO_BUILD_DOCS=OFF \
 %endif
        -DOCIO_BUILD_TESTS=ON \
+       -DOCIO_USE_HEADLESS=ON \
        -DOCIO_PYGLUE_SONAME=OFF \
        -DUSE_EXTERNAL_YAML=FALSE \
-       -DUSE_EXTERNAL_TINYXML=TRUE \
        -DUSE_EXTERNAL_LCMS=TRUE \
 %ifnarch x86_64
        -DOCIO_USE_SSE=OFF \
 %endif
-       -DCMAKE_SKIP_RPATH=OFF \
-       ..
+       -DOpenGL_GL_PREFERENCE=GLVND
 
-#       -DUSE_EXTERNAL_YAML=FALSE \
+%cmake_build
 
-make %{_smp_mflags}
 
-			  
 %install
 rm -rf %{buildroot}
-pushd build
-%make_install
+%cmake_install
+
+# Remove static libs
+find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
 
 # Generate man pages
+pushd %{_vpath_builddir}/src/apps
 mkdir -p %{buildroot}%{_mandir}/man1
-help2man -N -s 1 --version-string=%{version} \
-         -o %{buildroot}%{_mandir}/man1/ociocheck.1 \
-         src/apps/ociocheck/ociocheck
-help2man -N -s 1 --version-string=%{version} \
-         -o %{buildroot}%{_mandir}/man1/ociobakelut.1 \
-         src/apps/ociobakelut/ociobakelut
+for app in ociobakelut ociocheck ociochecklut ocioconvert ociolutimage ociomakeclf ocioperf ociowrite; do \
+help2man -N -s 1 %{?fedora:--version-string=%{version}} \
+         -o %{buildroot}%{_mandir}/man1/$app.1 \
+         $app/$app
+done
+popd
 
 # Move installed documentation back so it doesn't conflict with the main package
-popd
 
 %if %{with doc}
 rm -rf _tmpdoc
@@ -153,17 +160,12 @@ mkdir -p _tmpdoc
 mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
 %endif
 
-mv -f %{buildroot}%{_prefix}/cmake %{buildroot}%{_libdir}/
-mv -f %{buildroot}%{_prefix}/*.cmake %{buildroot}%{_libdir}/cmake/
 
 %check
 # Testing passes locally in mock but fails on the fedora build servers.
 #pushd build && make test
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf %{buildroot}
 
@@ -180,7 +182,6 @@ rm -rf %{buildroot}
 
 %files devel
 %{_includedir}/OpenColorIO/
-%{_includedir}/PyOpenColorIO/
 %{_libdir}/*.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/%{name}.pc
@@ -194,6 +195,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.1.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- dropped Patch1.
+- imported Patch0 from rawhide.
+
 * Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.1-1
 - new upstream release.
 

+ 14 - 14
O/OpenImageIO/OpenImageIO-vl.spec

@@ -3,7 +3,7 @@
 %global subname oiio
 
 Name:           OpenImageIO
-Version:        2.2.11.1
+Version:        2.2.18.0
 Release:        1%{?_dist_release}
 Summary:        Library for reading and writing images
 Group:          system
@@ -127,10 +127,11 @@ rm -f src/include/OpenImageIO/pugixml.hpp \
 
 
 %build
-%{__rm} -rf build/linux && %{__mkdir_p} build/linux && pushd build/linux
+%{__rm} -rf %{_vpath_builddir}
 # CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
 # CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       -DCMAKE_CXX_STANDARD=17 \
        -DCMAKE_SKIP_RPATH:BOOL=TRUE \
        -DBUILDSTATIC=OFF \
        -DLINKSTATIC=OFF \
@@ -143,25 +144,21 @@ rm -f src/include/OpenImageIO/pugixml.hpp \
        -DUSE_TBB:BOOL=FALSE \
        -DUSE_OPENSSL:BOOL=TRUE \
        -DSTOP_ON_WARNING:BOOL=FALSE \
-       -DJPEG_INCLUDE_DIR=$(pkg-config --variable=includedir libopenjp2) \
-       -DVERBOSE=TRUE \
-       ../../
+       -DJPEG_INCLUDE_DIR=%{_includedir} \
+       -DOPENJPEG_INCLUDE_DIR=$(pkg-config --variable=includedir libopenjp2) \
+       -DOpenGL_GL_PREFERENCE=GLVND \
+       -DVERBOSE=TRUE
+
+%cmake_build
 
-%{__make} %{?_smp_mflags}
-popd
 
 %install
-pushd build/linux
-%{make_install}
-popd
+%cmake_install
 
 # # Move man pages to the right directory
 # mkdir -p %{buildroot}%{_mandir}/man1
 # cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
-%post -p %{_syssbindir}/ldconfig
-%postun -p %{_syssbindir}/ldconfig
-
 
 %files
 %license LICENSE*
@@ -183,7 +180,6 @@ popd
 # %{_mandir}/man1/iv.1.gz
 
 %files devel
-%doc src/doc/*.pdf
 %{_libdir}/libOpenImageIO.so
 %{_libdir}/libOpenImageIO_Util.so
 %dir %{_libdir}/pkgconfig
@@ -197,6 +193,10 @@ popd
 
 
 %changelog
+* Wed Sep 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.18.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Sat Feb 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.11.1-1
 - new upstream release.
 

+ 15 - 7
h/hdf5/hdf5-vl.spec

@@ -1,6 +1,8 @@
+%bcond_with test
+
 Summary: A general purpose library and file format for storing scientific data
 Name:		 hdf5
-Version:	1.12.0
+Version:	1.12.1
 Release:	1%{?_dist_release}
 Group:		system
 Vendor:		Project Vine
@@ -9,8 +11,8 @@ Distribution:	Vine Linux
 License: BSD
 URL:     http://www.hdfgroup.org/HDF5/
 
-Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
-# Source1: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}_docs.tar
+%define shortver %(echo %{version} | cut -d . -f 1-2)
+Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%{shortver}/hdf5-1.12.1/src/hdf5-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel, gcc-gfortran, time
@@ -50,6 +52,7 @@ HDF5 static libraries.
 %prep
 %setup -q
 
+
 %build
 export CC=gcc
 export CXX=g++
@@ -66,16 +69,16 @@ export F9X=gfortran
 %{makeinstall} docdir=${RPM_BUILD_ROOT}%{_docdir}
 %{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/*.la ${RPM_BUILD_ROOT}/%{_libdir}/*.settings
 
+
+%if %{with test}
 %check
 %{__make} check
+%endif
+
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post -p %{_syssbindir}/ldconfig
-
-%postun -p %{_syssbindir}/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -99,6 +102,8 @@ export F9X=gfortran
 %{_bindir}/h5stat
 %{_bindir}/h5unjam
 %{_bindir}/h5watch
+%{_bindir}/mirror_server
+%{_bindir}/mirror_server_stop
 %attr(0755,root,root) %{_libdir}/*.so.*
 
 %files devel
@@ -118,6 +123,9 @@ export F9X=gfortran
 
 
 %changelog
+* Wed Sep 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.1-1
+- new upstream release.
+- dropped ldconfig scriptlets.
 
 * Sat Dec 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.0-1
 - new upstream release.