- updated to 1.1.0

- rewritten x32 patch to apply unconditionally
- added link patch (adds missing linking with libpthread)

diff --git a/kvazaar-link.patch b/kvazaar-link.patch
new file mode 100644 (file)
index 0000000..5083fa5
--- /dev/null
+++ b/kvazaar-link.patch
@@ -0,0 +1,12 @@
+--- kvazaar-1.1.0/src/Makefile.am.orig 2016-09-29 18:17:33.000000000 +0200
++++ kvazaar-1.1.0/src/Makefile.am      2017-06-06 22:00:04.791623138 +0200
+@@ -142,7 +142,8 @@
+       libaltivec.la \
+       libavx2.la \
+       libsse2.la \
+-      libsse41.la
++      libsse41.la \
++      -lpthread
+ 
+ if USE_CRYPTOPP
+ libkvazaar_la_SOURCES += \

diff --git a/kvazaar.spec b/kvazaar.spec
index b138100fa214ff21c19802c07ec5427c26224e52..9cf3142ec4de57f4ec52974104e0ee2dce489dac 100644 (file)
--- a/kvazaar.spec
+++ b/kvazaar.spec
@@ -1,17 +1,25 @@
+#
+# Conditional build:
+%bcond_without cryptopp        # selective encryption using crypto++
+
 Summary:       Kvazaar - open-source HEVC encoder
 Summary(pl.UTF-8):     Kvazaar - koder HEVC o otwartych źródłach
 Name:          kvazaar
-Version:       0.8.2
-Release:       3
+Version:       1.1.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       https://github.com/ultravideo/kvazaar/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 9c614d753dc055dcbb343546d3cd4048
+#Source0Download: https://github.com/ultravideo/kvazaar/releases
+Source0:       https://github.com/ultravideo/kvazaar/releases/download/v%{version}/%{name}-v%{version}.tar.gz
+# Source0-md5: 1f4a3a90d61f3a9e2c29779a868f183d
 Patch0:                x32.patch
+Patch1:                %{name}-link.patch
 URL:           https://github.com/ultravideo/kvazaar
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.11
+%{?with_cryptopp:BuildRequires:        cryptopp-devel}
 BuildRequires: libtool >= 2:2
+BuildRequires: pkgconfig
 %ifarch %{ix86} %{x8664} x32
 BuildRequires: yasm
 %endif
@@ -27,12 +35,16 @@ v2.1.
 
 %package libs
 Summary:       Kvazaar library
+Summary(pl.UTF-8):     Biblioteka Kvazaar
 Group:         Libraries
 Conflicts:     kvazaar < 0.8.2-3
 
 %description libs
 Kvazaar library.
 
+%description libs -l pl.UTF-8
+Biblioteka Kvazaar.
+
 %package devel
 Summary:       Header files for Kvazaar library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Kvazaar
@@ -59,9 +71,8 @@ Statyczna biblioteka Kvazaar.
 
 %prep
 %setup -q
-%ifarch x32
 %patch0 -p1
-%endif
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -69,9 +80,9 @@ Statyczna biblioteka Kvazaar.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
 %configure \
-       --disable-silent-rules
+       --disable-silent-rules \
+       %{?with_cryptopp:--with-cryptopp}
 %{__make}
 
 %install
@@ -95,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING CREDITS README.md doc/syntax_elements.txt
 %attr(755,root,root) %{_bindir}/kvazaar
+%{_mandir}/man1/kvazaar.1*
 
 %files libs
 %defattr(644,root,root,755)
@@ -105,7 +117,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkvazaar.so
 %{_includedir}/kvazaar.h
-%{_includedir}/kvazaar_version.h
 %{_pkgconfigdir}/kvazaar.pc
 
 %files static

diff --git a/x32.patch b/x32.patch
index ae65c0503067b9cd259444ee6def589a971ba260..0305cc30a76c788cdbac42e267b21a155032a56c 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,11 +1,16 @@
---- kvazaar-0.8.2/configure.ac.orig    2016-03-15 18:41:05.548752072 +0100
-+++ kvazaar-0.8.2/configure.ac 2016-03-15 18:41:22.412326953 +0100
-@@ -56,7 +56,7 @@
+--- kvazaar-1.1.0/configure.ac.orig    2017-01-31 15:28:02.000000000 +0100
++++ kvazaar-1.1.0/configure.ac 2017-06-06 22:24:54.528272790 +0200
+@@ -95,9 +95,10 @@
+ 
+ 
  # host and cpu specific settings
- AS_CASE([$host_cpu],
-         [i?86], [BITS="32" ASFLAGS="$ASFLAGS -DARCH_X86_64=0" X86="true"],
+-AS_CASE([$host_cpu],
+-        [i?86], [BITS="32" ASFLAGS="$ASFLAGS -DARCH_X86_64=0" X86="true"],
 -        [x86_64], [BITS="64" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m amd64" X86="true"],
-+        [x86_64], [BITS="x32" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" X86="true"],
-         [powerpc*], [PPC="true"],
-         [arm*], [ARM="true"]
++AS_CASE([$host],
++        [i?86-*], [BITS="32" ASFLAGS="$ASFLAGS -DARCH_X86_64=0" X86="true"],
++        [x86_64-*-gnux32|amd64-*-gnux32], [BITS="x32" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" X86="true"],
++        [x86_64-*|amd64-*], [BITS="64" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m amd64" X86="true"],
+         [powerpc*], [PPC="true"]
  )
+