From b7f3045a5193efd4004bea2a284e8865cda8c984126bdbd855086466b66fbf66 Mon Sep 17 00:00:00 2001 From: Mia Herkt <9+suse@cirno.systems> Date: Fri, 2 Aug 2019 02:43:47 +0000 Subject: [PATCH 1/6] - Update to version 2.9.2: * colorspace: fix crash on invalid conversion from unspec to real primaries * x86: additional optimizations for AMD Piledriver * x86: optimizations for AMD Zen2 processors OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=18 --- release-2.9.1.tar.gz | 3 --- release-2.9.2.tar.gz | 3 +++ zimg.changes | 9 +++++++++ zimg.spec | 8 ++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 release-2.9.1.tar.gz create mode 100644 release-2.9.2.tar.gz diff --git a/release-2.9.1.tar.gz b/release-2.9.1.tar.gz deleted file mode 100644 index 4108ac2..0000000 --- a/release-2.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8efa0c381aa6a9bcd5ea4ae22ad06dccf6c1dc705c394547de016951d1946154 -size 265943 diff --git a/release-2.9.2.tar.gz b/release-2.9.2.tar.gz new file mode 100644 index 0000000..824dac9 --- /dev/null +++ b/release-2.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10403c2964fe11b559a7ec5e081c358348fb787e26b91ec0d1f9dd7c01d1cd7b +size 266049 diff --git a/zimg.changes b/zimg.changes index 1bc8ff9..f66014a 100644 --- a/zimg.changes +++ b/zimg.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 2 02:43:17 UTC 2019 - Martin Herkt <9+suse@cirno.systems> + +- Update to version 2.9.2: + * colorspace: fix crash on invalid conversion from unspec to + real primaries + * x86: additional optimizations for AMD Piledriver + * x86: optimizations for AMD Zen2 processors + ------------------------------------------------------------------- Thu Jun 13 21:40:11 UTC 2019 - Martin Herkt <9+suse@cirno.systems> diff --git a/zimg.spec b/zimg.spec index dec93c5..a02b6cd 100644 --- a/zimg.spec +++ b/zimg.spec @@ -18,7 +18,7 @@ %define sover 2 Name: zimg -Version: 2.9.1 +Version: 2.9.2 Release: 0 Summary: Scaling, colorspace conversion, and dithering library License: WTFPL @@ -62,7 +62,8 @@ autoreconf -fiv %ifarch x86_64 %{ix86} --enable-x86simd \ %endif - --disable-static + --disable-static \ + --enable-unit-test make %{?_smp_mflags} V=1 %install @@ -70,6 +71,9 @@ make %{?_smp_mflags} V=1 rm -rf %{buildroot}%{_datadir}/doc/zimg find %{buildroot} -type f -name "*.la" -delete -print +%check +make check + %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From 5d1b342e25e8dc6a485c0bf2c3cbf6074a730643176ae3a7d5e0aff02f05f2f0 Mon Sep 17 00:00:00 2001 From: Mia Herkt <9+suse@cirno.systems> Date: Fri, 2 Aug 2019 03:16:20 +0000 Subject: [PATCH 2/6] - Switch to git checkout (GitHub tarbals lack required submodules) - Build unit tests separately as they impact the build result and produce a broken install rule OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=19 --- _service | 15 +++++++++++++++ release-2.9.2.tar.gz | 3 --- zimg-2.9.2.obscpio | 3 +++ zimg.changes | 3 +++ zimg.obsinfo | 5 +++++ zimg.spec | 22 +++++++++++++++------- 6 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 _service delete mode 100644 release-2.9.2.tar.gz create mode 100644 zimg-2.9.2.obscpio create mode 100644 zimg.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..51e55f1 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/sekrit-twc/zimg.git + git + @PARENT_TAG@ + release([0-9\.]*) + release-2.9.2 + + + + *.tar + xz + + + diff --git a/release-2.9.2.tar.gz b/release-2.9.2.tar.gz deleted file mode 100644 index 824dac9..0000000 --- a/release-2.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10403c2964fe11b559a7ec5e081c358348fb787e26b91ec0d1f9dd7c01d1cd7b -size 266049 diff --git a/zimg-2.9.2.obscpio b/zimg-2.9.2.obscpio new file mode 100644 index 0000000..1b76677 --- /dev/null +++ b/zimg-2.9.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f63334a98851cab72dede77924a6bb04177be796ab38af182adc20103f7873e +size 6436365 diff --git a/zimg.changes b/zimg.changes index f66014a..10cc820 100644 --- a/zimg.changes +++ b/zimg.changes @@ -1,6 +1,9 @@ ------------------------------------------------------------------- Fri Aug 2 02:43:17 UTC 2019 - Martin Herkt <9+suse@cirno.systems> +- Switch to git checkout (GitHub tarbals lack required submodules) +- Build unit tests separately as they impact the build result and + produce a broken install rule - Update to version 2.9.2: * colorspace: fix crash on invalid conversion from unspec to real primaries diff --git a/zimg.obsinfo b/zimg.obsinfo new file mode 100644 index 0000000..3850767 --- /dev/null +++ b/zimg.obsinfo @@ -0,0 +1,5 @@ +name: zimg +version: 2.9.2 +mtime: 1564070386 +commit: 1ea31d1588d7ac919a51ed7c98cd96b3898665ff + diff --git a/zimg.spec b/zimg.spec index a02b6cd..190f3f5 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,7 +1,7 @@ # # spec file for package zimg # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ Summary: Scaling, colorspace conversion, and dithering library License: WTFPL Group: Development/Libraries/C and C++ URL: https://github.com/sekrit-twc/zimg -Source0: https://github.com/sekrit-twc/zimg/archive/release-%{version}.tar.gz +Source0: zimg-%{version}.tar.xz Source99: baselibs.conf BuildRequires: autoconf BuildRequires: automake @@ -54,16 +54,17 @@ The libzimg-devel package contains libraries and header files for developing applications that use libzimg%{sover}. %prep -%setup -q -n zimg-release-%{version} +%setup -q %build autoreconf -fiv +# do not enable tests here — they make zimg slower and the install +# rule is broken %configure \ %ifarch x86_64 %{ix86} --enable-x86simd \ %endif - --disable-static \ - --enable-unit-test + --disable-static make %{?_smp_mflags} V=1 %install @@ -72,7 +73,14 @@ rm -rf %{buildroot}%{_datadir}/doc/zimg find %{buildroot} -type f -name "*.la" -delete -print %check -make check +make clean +%configure \ + %ifarch x86_64 %{ix86} + --enable-x86simd \ + %endif + --disable-static \ + --enable-unit-test +make %{?_smp_mflags} check %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From 85f01fc2ff92b39eb25db30b9c73ea13b6a97aa8734bce9778359b5645a6ec4f Mon Sep 17 00:00:00 2001 From: Mia Herkt <9+suse@cirno.systems> Date: Fri, 2 Aug 2019 05:47:17 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=20 --- zimg.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 190f3f5..0a848bf 100644 --- a/zimg.spec +++ b/zimg.spec @@ -80,7 +80,8 @@ make clean %endif --disable-static \ --enable-unit-test -make %{?_smp_mflags} check +make %{?_smp_mflags} +test/unit_test %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From 2cf21151e443a52dba9c7ece7395ca4cf52f876f4fc894b3ede1b6583c2fdf02 Mon Sep 17 00:00:00 2001 From: Mia Herkt <9+suse@cirno.systems> Date: Fri, 2 Aug 2019 05:58:39 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=21 --- zimg.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zimg.spec b/zimg.spec index 0a848bf..613f89d 100644 --- a/zimg.spec +++ b/zimg.spec @@ -80,8 +80,7 @@ make clean %endif --disable-static \ --enable-unit-test -make %{?_smp_mflags} -test/unit_test +make %{?_smp_mflags} V=1 check %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From a452f5ea08b104453aa21f1d77cca1854612e25c59f8119de3fd1556db7ef5d3 Mon Sep 17 00:00:00 2001 From: Mia Herkt <9+suse@cirno.systems> Date: Fri, 2 Aug 2019 06:07:20 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=22 --- zimg.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 613f89d..8c93b6d 100644 --- a/zimg.spec +++ b/zimg.spec @@ -80,7 +80,9 @@ make clean %endif --disable-static \ --enable-unit-test -make %{?_smp_mflags} V=1 check +make %{?_smp_mflags} V=1 +make %{?_smp_mflags} V=1 test/unit_test +test/unit_test %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig From 674b3a8d29c1e9d4a27b90241adbcb6556ad7bae24709ae67f3b7a4056b316e6 Mon Sep 17 00:00:00 2001 From: Mia Herkt <9+suse@cirno.systems> Date: Thu, 22 Aug 2019 14:50:34 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/zimg?expand=0&rev=23 --- zimg.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zimg.spec b/zimg.spec index 8c93b6d..7a1b4e7 100644 --- a/zimg.spec +++ b/zimg.spec @@ -72,6 +72,8 @@ make %{?_smp_mflags} V=1 rm -rf %{buildroot}%{_datadir}/doc/zimg find %{buildroot} -type f -name "*.la" -delete -print +# test suite is broken on other platforms, upstream informed +%ifarch x86_64 %check make clean %configure \ @@ -83,6 +85,7 @@ make clean make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1 test/unit_test test/unit_test +%endif %post -n libzimg%{sover} -p /sbin/ldconfig %postun -n libzimg%{sover} -p /sbin/ldconfig