X-Git-Url: https://git.pld-linux.org/?p=packages%2Flibvpx.git;a=blobdiff_plain;f=libvpx.spec;h=28cf6208c961cf58437d94e727d27afbe451f9da;hp=653c5027a22c7d6ca602aa4d18c312504bf116ae;hb=30fcd8a;hpb=2f397753fcf62bea2f3f22973cc4c21fe229e45a

diff --git a/libvpx.spec b/libvpx.spec
index 653c502..28cf620 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -2,10 +2,10 @@
 # Conditional build:
 %bcond_without	asm	# x86 assembler
 %bcond_without	doc	# don't build doc
-%bcond_without	tests	# build without tests
+%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
 
@@ -17,18 +17,18 @@
 Summary:	VP8, a high-quality video codec
 Summary(pl.UTF-8):	VP8 - kodek obrazu wysokiej jakości
 Name:		libvpx
-Version:	1.3.0
-Release:	1
+Version:	1.4.0
+Release:	2
 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
+# Source in git web, but regenerated on each fetch, so use gentoo tarball instead
 #Source0:	https://chromium.googlesource.com/webm/libvpx/+archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	dcf436a5dc8b56bdfb4aec63b2fe6729
+Source0:	http://distfiles.gentoo.org/distfiles/%{name}-%{version}.tar.bz2
+# Source0-md5:	63b1d7f59636a42eeeee9225cc14e7de
 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}
@@ -84,38 +84,36 @@ Static libvpx library.
 Statyczna biblioteka libvpx.
 
 %prep
-#%setup -q -n %{name}-v%{version}
-%setup -qc
+%setup -q
 
 %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}
@@ -130,7 +128,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.2.0
 
 # adjust prefix and libdir
 %{__sed} -i -e 's,^prefix=.*,prefix=%{_prefix},;s,^libdir=.*,libdir=%{_libdir},' $RPM_BUILD_ROOT%{_pkgconfigdir}/vpx.pc
@@ -144,12 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 %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.2
 
 %files devel
 %defattr(644,root,root,755)