Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11053923
D11072.id27156.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D11072.id27156.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,5 +1,5 @@
-libHalf-2_5.so.25
-libIlmImf-2_5.so.25
+libImath-3_0.so.28
+libOpenEXR-3_0.so.28
libc.so.6
libgcc_s.so.1
libjpeg.so.8
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -1,19 +1,19 @@
-libHalf-2_5.so.25:_ZN4half5_eLutE
-libHalf-2_5.so.25:_ZN4half7convertEi
-libHalf-2_5.so.25:_ZN4half8_toFloatE
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFile10readPixelsEii
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFile14setFrameBufferEPNS_4RgbaEmm
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFileC1EPKci
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFileD1Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFile11writePixelsEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFile14setFrameBufferEPKNS_4RgbaEmm
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFileC1EPKcRKNS_6HeaderENS_12RgbaChannelsEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_517globalThreadCountEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_56HeaderC1ERKN9Imath_2_53BoxINS1_4Vec2IiEEEES7_fRKNS3_IfEEfNS_9LineOrderENS_11CompressionE
-libIlmImf-2_5.so.25:_ZN7Imf_2_56HeaderD1Ev
-libIlmImf-2_5.so.25:_ZNK7Imf_2_513RgbaInputFile6headerEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header10dataWindowEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header13displayWindowEv
+libImath-3_0.so.28:_ZN9Imath_3_04half5_eLutE
+libImath-3_0.so.28:_ZN9Imath_3_04half7convertEi
+libImath-3_0.so.28:_ZN9Imath_3_04half8_toFloatE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFile10readPixelsEii
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFile14setFrameBufferEPNS_4RgbaEmm
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFileC1EPKci
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFileD1Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFile11writePixelsEi
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFile14setFrameBufferEPKNS_4RgbaEmm
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFileC1EPKcRKNS_6HeaderENS_12RgbaChannelsEi
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017globalThreadCountEv
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06HeaderC1ERKN9Imath_3_03BoxINS1_4Vec2IiEEEES7_fRKNS3_IfEEfNS_9LineOrderENS_11CompressionE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06HeaderD1Ev
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_013RgbaInputFile6headerEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header10dataWindowEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header13displayWindowEv
libc.so.6:__ctype_b_loc
libc.so.6:__cxa_atexit
libc.so.6:__fprintf_chk
diff --git a/files/OpenEXR-instead-of-ilmbase.patch b/files/OpenEXR-instead-of-ilmbase.patch
new file mode 100644
--- /dev/null
+++ b/files/OpenEXR-instead-of-ilmbase.patch
@@ -0,0 +1,53 @@
+--- a/config/FindOpenEXR.cmake
++++ b/config/FindOpenEXR.cmake
+@@ -24,30 +24,32 @@
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
++FIND_PATH(IMATH_INCLUDE_DIR half.h PATH_SUFFIXES Imath)
+
+-FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
++FOREACH(V -3_0 "" -2_2 -2_1 -2_0 -1_7)
+ if(NOT OPENEXR_ILMIMF_LIBRARY)
+- FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V})
+- if(OPENEXR_ILMIMF_LIBRARY)
++ FIND_LIBRARY(OPENEXR_OPENEXR_LIBRARY NAMES OpenEXR${V})
++ if(OPENEXR_OPENEXR_LIBRARY)
+ set(OPENEXR_VERSION ${V})
+ endif()
+ endif()
+ ENDFOREACH(V)
+
++set(OPENEXR_VERSION -3_0)
+ FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION})
+ FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION})
+ FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION})
+-FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half)
+
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
+- OPENEXR_HALF_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_IMATH_LIBRARY
+- OPENEXR_ILMIMF_LIBRARY OPENEXR_INCLUDE_DIR
++ OPENEXR_OPENEXR_LIBRARY
++ OPENEXR_IEX_LIBRARY OPENEXR_IMATH_LIBRARY
++ OPENEXR_INCLUDE_DIR IMATH_INCLUDE_DIR
+ )
+
+ IF(OpenEXR_FOUND)
+- SET(OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY}
+- ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY}
++ SET(OPENEXR_LIBRARIES ${OPENEXR_OPENEXR_LIBRARY}
++ ${IMATH_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY}
+ ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} )
+
+ if(MSVC)
+--- a/src/impex/CMakeLists.txt
++++ b/src/impex/CMakeLists.txt
+@@ -20,6 +20,7 @@ ENDIF(TIFF_FOUND)
+
+ IF(OpenEXR_FOUND)
+ ADD_DEFINITIONS(-DHasEXR ${OPENEXR_CPPFLAGS})
++ INCLUDE_DIRECTORIES(${SUPPRESS_WARNINGS} ${IMATH_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(${SUPPRESS_WARNINGS} ${OPENEXR_INCLUDE_DIR})
+ ENDIF(OpenEXR_FOUND)
+
diff --git a/files/vigra-cmake-config.patch b/files/vigra-cmake-config.patch
new file mode 100644
--- /dev/null
+++ b/files/vigra-cmake-config.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -368,10 +368,10 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/con
+
+ # export targets:
+ INSTALL(EXPORT vigra-targets
+- DESTINATION lib${LIB_SUFFIX}/vigra)
++ DESTINATION lib${LIB_SUFFIX}/cmake/vigra)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
+ ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
+- DESTINATION lib${LIB_SUFFIX}/vigra)
++ DESTINATION lib${LIB_SUFFIX}/cmake/vigra)
+ EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
+
+ ##################################################
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : vigra
version : 1.11.1
-release : 8
+release : 9
source :
- https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz : a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf
license : MIT
@@ -15,11 +15,15 @@
- pkgconfig(libturbojpeg)
- libboost-devel
setup : |
- %cmake -DWITH_OPENEXR=1 \
+ %patch -p1 < $pkgfiles/vigra-cmake-config.patch
+ %patch -p1 < $pkgfiles/OpenEXR-instead-of-ilmbase.patch
+
+ %cmake_ninja \
+ -DWITH_OPENEXR=1 \
-DWITH_BOOST_GRAPH=1 \
- -DDOCINSTALL=share/doc \
- .
+ -DLIB_SUFFIX=%LIBSUFFIX% \
+ -DDOCINSTALL=share/doc
build : |
- %make
+ %ninja_build
install : |
- %make_install
+ %ninja_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>vigra</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Packager>
<License>MIT</License>
<PartOf>multimedia.library</PartOf>
@@ -20,12 +20,8 @@
<PartOf>multimedia.library</PartOf>
<Files>
<Path fileType="executable">/usr/bin/vigra-config</Path>
- <Path fileType="library">/usr/lib/libvigraimpex.so.11</Path>
- <Path fileType="library">/usr/lib/libvigraimpex.so.11.1.11.1</Path>
- <Path fileType="library">/usr/lib/vigra/VigraConfig.cmake</Path>
- <Path fileType="library">/usr/lib/vigra/VigraConfigVersion.cmake</Path>
- <Path fileType="library">/usr/lib/vigra/vigra-targets-relwithdebinfo.cmake</Path>
- <Path fileType="library">/usr/lib/vigra/vigra-targets.cmake</Path>
+ <Path fileType="library">/usr/lib64/libvigraimpex.so.11</Path>
+ <Path fileType="library">/usr/lib64/libvigraimpex.so.11.1.11.1</Path>
<Path fileType="doc">/usr/share/doc/vigra/AlgebraicConcepts.html</Path>
<Path fileType="doc">/usr/share/doc/vigra/ArgumentObjectFactories.html</Path>
<Path fileType="doc">/usr/share/doc/vigra/BorderTreatmentMode.html</Path>
@@ -3304,7 +3300,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="8">vigra</Dependency>
+ <Dependency release="9">vigra</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/vigra/accessor.hxx</Path>
@@ -3537,16 +3533,20 @@
<Path fileType="header">/usr/include/vigra/watersheds3d.hxx</Path>
<Path fileType="header">/usr/include/vigra/wigner-matrix.hxx</Path>
<Path fileType="header">/usr/include/vigra/windows.h</Path>
- <Path fileType="library">/usr/lib/libvigraimpex.so</Path>
+ <Path fileType="library">/usr/lib64/cmake/vigra/VigraConfig.cmake</Path>
+ <Path fileType="library">/usr/lib64/cmake/vigra/VigraConfigVersion.cmake</Path>
+ <Path fileType="library">/usr/lib64/cmake/vigra/vigra-targets-relwithdebinfo.cmake</Path>
+ <Path fileType="library">/usr/lib64/cmake/vigra/vigra-targets.cmake</Path>
+ <Path fileType="library">/usr/lib64/libvigraimpex.so</Path>
</Files>
</Package>
<History>
- <Update release="8">
- <Date>2021-01-20</Date>
+ <Update release="9">
+ <Date>2021-05-30</Date>
<Version>1.11.1</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Aug 12, 12:13 AM (2 h, 41 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5813355
Default Alt Text
D11072.id27156.diff (9 KB)
Attached To
Mode
D11072: Rebuild vigra for OpenEXR
Attached
Detach File
Event Timeline
Log In to Comment