X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=libvpx.spec;h=4e6ee1998218db73bdb7ac094a10e88333f7677e;hb=20665a0;hp=02880f7cfd3147e5eb96691fe7b4743e83f5fb53;hpb=f23690265313f5e33853a82b0ca2d292a4445586;p=packages%2Flibvpx.git

diff --git a/libvpx.spec b/libvpx.spec
index 02880f7..4e6ee19 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -2,9 +2,10 @@
 # Conditional build:
 %bcond_without	asm	# x86 assembler
 %bcond_without	doc	# don't build doc
+%bcond_with	tests	# build tests (not useful, creates libgtest.a)
 %bcond_without	ssse3	# use SSSE3 instructions (Intel since Core2, Via Nano)
 
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
 %undefine	with_asm
 %endif
 
@@ -16,18 +17,19 @@
 Summary:	VP8, a high-quality video codec
 Summary(pl.UTF-8):	VP8 - kodek obrazu wysokiej jakości
 Name:		libvpx
-Version:	1.3.0
+Version:	1.7.0
 Release:	1
 License:	BSD
 Group:		Libraries
-#Source0Download: http://code.google.com/p/webm/downloads/list
-#Source0:	https://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
-# source, but regenerated on each fetch
-#Source0:	https://chromium.googlesource.com/webm/libvpx/+archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
+#Source0Download: http://downloads.webmproject.org/releases/webm/index.html
+#Source0:	https://chromium.googlesource.com/webm/libvpx/+archive/v%{version}.tar.gz?fakename=/%{name}-%{version}.tar.gz
+# ...but it recreates tarball each time, so use dropin
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	dcf436a5dc8b56bdfb4aec63b2fe6729
+# Source0-md5:	df97945958d8514ba9fc6ca5ca39ae6a
 URL:		http://www.webmproject.org/
 BuildRequires:	doxygen
+%{?with_tests:BuildRequires:	libstdc++-devel}
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.673
 BuildRequires:	sed >= 4.0
 %{?with_asm:BuildRequires:	yasm >= 0.8}
@@ -82,38 +84,49 @@ Static libvpx library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libvpx.
 
+%package tools
+Summary:	VPX decoding/encoding tools
+Summary(pl.UTF-8):	Narzędzia do kodowania/dekodowania formatu VPX
+Group:		Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description tools
+VPX decoding/encoding tools.
+
+%description tools -l pl.UTF-8
+Narzędzia do kodowania/dekodowania formatu VPX.
+
 %prep
-#%setup -q -n %{name}-v%{version}
-%setup -qc
+%setup -q -c
 
 %build
 install -d obj
 cd obj
 # not autoconf configure
-CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+CC="%{__cc}" \
+CXX="%{__cxx}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} %{!?with_asm:-DYUV_DISABLE_ASM}" \
 ../configure \
 %if %{with asm}
 	--as=yasm \
 %endif
 	--target=%{vpxtarget} \
-%if "%{vpxtarget}" != "%{generic_target}"
 	--enable-shared \
-%endif
 	%{!?with_ssse3:--disable-ssse3} \
 	--disable-optimizations \
+	--%{!?with_tests:dis}%{?with_tests:en}able-unit-tests \
+	--%{!?with_doc:dis}%{?with_doc:en}able-docs \
+	--%{!?with_doc:dis}%{?with_doc:en}able-install-docs \
+	--enable-vp8 \
 	--enable-vp8 \
 	--enable-postproc \
 	--enable-runtime-cpu-detect
 
 %{__make} verbose=true target=libs \
 	HAVE_GNU_STRIP=no \
-	CC="%{__cc}" \
-	LD="%{__cc}" \
 	LDFLAGS="%{rpmldflags}"
 
 %{__make} verbose=true target=examples \
-	CC="%{__cc}" \
-	LD="%{__cc}" \
 	LDFLAGS="%{rpmldflags} -L."
 
 %if %{with doc}
@@ -128,7 +141,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/vpx,%{_libdir}}
 	LIBSUBDIR=%{_lib} \
 	DIST_DIR=$RPM_BUILD_ROOT%{_prefix}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvpx.so.1.3
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvpx.so.5.0
 
 # adjust prefix and libdir
 %{__sed} -i -e 's,^prefix=.*,prefix=%{_prefix},;s,^libdir=.*,libdir=%{_libdir},' $RPM_BUILD_ROOT%{_pkgconfigdir}/vpx.pc
@@ -136,18 +149,14 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/vpx,%{_libdir}}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG LICENSE PATENTS README
-%attr(755,root,root) %{_bindir}/vp8_scalable_patterns
-%attr(755,root,root) %{_bindir}/vp9_spatial_scalable_encoder
-%attr(755,root,root) %{_bindir}/vpxdec
-%attr(755,root,root) %{_bindir}/vpxenc
 %attr(755,root,root) %{_libdir}/libvpx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvpx.so.1
+%attr(755,root,root) %ghost %{_libdir}/libvpx.so.5
 
 %files devel
 %defattr(644,root,root,755)
@@ -158,3 +167,8 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libvpx.a
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vpxdec
+%attr(755,root,root) %{_bindir}/vpxenc