Hello community, here is the log from the commit of package openjpeg for openSUSE:Factory checked in at 2017-09-25 13:53:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjpeg (Old) and /work/SRC/openSUSE:Factory/.openjpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjpeg" Mon Sep 25 13:53:36 2017 rev:20 rq:527553 version:1.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/openjpeg/openjpeg.changes 2017-02-08 10:50:32.914823876 +0100 +++ /work/SRC/openSUSE:Factory/.openjpeg.new/openjpeg.changes 2017-09-25 13:53:37.431734494 +0200 @@ -1,0 +2,9 @@ +Wed Sep 20 09:06:49 UTC 2017 - [email protected] + +- Convert to pkgconfig +- Remove fedora conditionals as nothing in opensuse + actually builds against it +- Add patch to fix ffast-math issue bsc#1029609 bsc#1059440: + * openjpeg-fast-math.patch + +------------------------------------------------------------------- New: ---- openjpeg-fast-math.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openjpeg.spec ++++++ --- /var/tmp/diff_new_pack.tjp4Uz/_old 2017-09-25 13:53:38.155632643 +0200 +++ /var/tmp/diff_new_pack.tjp4Uz/_new 2017-09-25 13:53:38.159632080 +0200 @@ -33,18 +33,16 @@ Patch1: openjpeg-1.5.1-soname.patch # PATCH-FIX-UPSTREAM openjpeg-bsc999817-cve2016-7445-null-deref.patch CVE-2016-7445 bsc#999817 [email protected] -- Fix null pointer dereference in convert.c Patch2: openjpeg-bsc999817-cve2016-7445-null-deref.patch +# PATCH-FIX-UPSTREAM openjpeg-fast-math.patch only compile and not link with fast-math bsc#1059440 +Patch3: openjpeg-fast-math.patch BuildRequires: cmake BuildRequires: doxygen -BuildRequires: libtiff-devel -BuildRequires: pkg-config +BuildRequires: fdupes +BuildRequires: pkgconfig BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -BuildRequires: fdupes -%endif %description OpenJPEG library is an open-source JPEG 2000 codec written in C. It has been @@ -74,6 +72,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Remove build time references so build-compare can do its work echo "HTML_TIMESTAMP = NO" >> doc/Doxyfile.dox.cmake.in @@ -86,8 +85,7 @@ -DCMAKE_BUILD_TYPE=release \ -DBUILD_DOC=ON \ -DUSE_SYSTEM_GETOPT=ON \ - -DBUILD_THIRDPARTY=OFF .. - + -DBUILD_THIRDPARTY=OFF make %{?_smp_mflags} %install @@ -99,21 +97,12 @@ # Compatibility symlink ln -s openjpeg-1.5/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h -# Fix of Fedora build -%if 0%{?fedora_version} - rm -f %{buildroot}%{_docdir}/openjpeg/{CHANGES,LICENSE} -%endif - -%if 0%{?suse_version} %fdupes -s %{buildroot} -%endif %post -n libopenjpeg%{so_ver} -p /sbin/ldconfig - %postun -n libopenjpeg%{so_ver} -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE NEWS README THANKS %{_bindir}/image_to_j2k %{_bindir}/j2k_dump @@ -123,7 +112,6 @@ %{_mandir}/man1/j2k_to_image.1%{ext_man} %files devel -%defattr(-,root,root,-) %doc %{_docdir}/%{name}-devel/ %{_includedir}/openjpeg-1.5/ %{_includedir}/openjpeg.h @@ -134,7 +122,6 @@ %{_mandir}/man3/libopenjpeg.3%{ext_man} %files -n libopenjpeg%{so_ver} -%defattr(-,root,root,-) %{_libdir}/libopenjpeg.so.%{version} %{_libdir}/libopenjpeg.so.%{so_ver}* ++++++ openjpeg-fast-math.patch ++++++ diff -up openjpeg-1.5.1/CMakeLists.txt.fast-math openjpeg-1.5.1/CMakeLists.txt --- openjpeg-1.5.1/CMakeLists.txt.fast-math 2015-04-28 15:04:28.265928682 -0600 +++ openjpeg-1.5.1/CMakeLists.txt 2015-04-28 15:04:28.268928664 -0600 @@ -192,7 +192,7 @@ IF(CMAKE_COMPILER_IS_GNUCC) # For all builds, make sure openjpeg is std99 compliant: # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build. # Do not use ffast-math for all build, it would produce incorrect results, only set for release: - SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}") + SET(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>") ENDIF(CMAKE_COMPILER_IS_GNUCC) #----------------------------------------------------------------------------- diff -up openjpeg-1.5.1/libopenjpeg/CMakeLists.txt.fast-math openjpeg-1.5.1/libopenjpeg/CMakeLists.txt --- openjpeg-1.5.1/libopenjpeg/CMakeLists.txt.fast-math 2012-09-13 01:58:39.000000000 -0600 +++ openjpeg-1.5.1/libopenjpeg/CMakeLists.txt 2015-04-28 15:04:54.773770250 -0600 @@ -39,6 +39,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m) ENDIF(UNIX) SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) +TARGET_COMPILE_OPTIONS(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) # Build the JPWL library ? IF(BUILD_JPWL) diff -up openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt.fast-math openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt --- openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt.fast-math 2012-09-13 01:58:39.000000000 -0600 +++ openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt 2015-04-28 15:04:59.053744670 -0600 @@ -28,6 +28,7 @@ IF(UNIX) ENDIF(UNIX) SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) +TARGET_COMPILE_OPTIONS(${OPENJPEG_LIBRARY_NAME}_JPWL PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) # Install library INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
