Accepting request 637384 from graphics
- Define FLOATTEST=64bit on ppc - ctest-depends.patch: Add missing testsuite depedencies (forwarded request 637382 from Andreas_Schwab) OBS-URL: https://build.opensuse.org/request/show/637384 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libjpeg-turbo?expand=0&rev=42
This commit is contained in:
commit
187f34a83a
18
ctest-depends.patch
Normal file
18
ctest-depends.patch
Normal file
@ -0,0 +1,18 @@
|
||||
Index: libjpeg-turbo-2.0.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- libjpeg-turbo-2.0.0.orig/CMakeLists.txt
|
||||
+++ libjpeg-turbo-2.0.0/CMakeLists.txt
|
||||
@@ -997,9 +997,12 @@ foreach(libtype ${TEST_LIBTYPES})
|
||||
|
||||
add_test(djpeg-${libtype}-rgb-islow-icc-cmp
|
||||
${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc)
|
||||
+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES
|
||||
+ DEPENDS djpeg-${libtype}-rgb-islow)
|
||||
|
||||
add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc"
|
||||
- testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2})
|
||||
+ testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}
|
||||
+ cjpeg-${libtype}-rgb-islow)
|
||||
|
||||
if(NOT WITH_12BIT)
|
||||
# CC: RGB->RGB565 SAMP: fullsize IDCT: islow ENT: huff
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 24 07:11:27 UTC 2018 - schwab@suse.de
|
||||
|
||||
- Define FLOATTEST=64bit on ppc
|
||||
- ctest-depends.patch: Add missing testsuite depedencies
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 8 15:45:50 UTC 2018 - jengelh@inai.de
|
||||
|
||||
|
@ -35,6 +35,7 @@ URL: https://github.com/libjpeg-turbo/libjpeg-turbo
|
||||
Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
|
||||
Patch2: ctest-depends.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig
|
||||
@ -99,12 +100,17 @@ files using the libjpeg library.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
export LDFLAGS="-Wl,-z,relro,-z,now"
|
||||
%cmake \
|
||||
-DENABLE_STATIC=OFF \
|
||||
-DWITH_JPEG8=ON
|
||||
-DWITH_JPEG8=ON \
|
||||
%ifarch ppc
|
||||
-DFLOATTEST=64bit \
|
||||
%endif
|
||||
%{nil}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 24 07:11:27 UTC 2018 - schwab@suse.de
|
||||
|
||||
- Define FLOATTEST=64bit on ppc
|
||||
- ctest-depends.patch: Add missing testsuite depedencies
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 8 15:45:50 UTC 2018 - jengelh@inai.de
|
||||
|
||||
|
@ -31,6 +31,7 @@ URL: http://sourceforge.net/projects/libjpeg-turbo
|
||||
Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
|
||||
Patch2: ctest-depends.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
# needed for tests as we remove the lib here
|
||||
@ -74,11 +75,16 @@ files using the libjpeg library.
|
||||
%prep
|
||||
%setup -q -n libjpeg-turbo-%{srcver}
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
export LDFLAGS="-Wl,-z,relro,-z,now"
|
||||
%cmake \
|
||||
-DENABLE_STATIC=OFF
|
||||
-DENABLE_STATIC=OFF \
|
||||
%ifarch ppc
|
||||
-DFLOATTEST=64bit \
|
||||
%endif
|
||||
%{nil}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
|
Loading…
Reference in New Issue
Block a user