X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=libvpx.spec;h=32d6320195f8b17b21dcd994921e825a8d6f41ad;hb=05641fc7da0ab70862a498a062dea5e0ace77d75;hp=3b90984d4df29d319df790ca3c0c381ee4481b76;hpb=df2948cbe553b84907dd2376e509389a163757ce;p=packages%2Flibvpx.git

diff --git a/libvpx.spec b/libvpx.spec
index 3b90984..32d6320 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -4,9 +4,8 @@
 %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)
-%bcond_without	vp9_encoder	# vp9 encoder
 
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
 %undefine	with_asm
 %endif
 
@@ -15,24 +14,15 @@
 %undefine	with_ssse3
 %endif
 
-# old gcc gets stuck on ac
-%ifarch sparc
-%undefine	with_vp9_encoder
-%endif
-
 Summary:	VP8, a high-quality video codec
 Summary(pl.UTF-8):	VP8 - kodek obrazu wysokiej jakości
 Name:		libvpx
-Version:	1.3.0
-Release:	2
+Version:	1.5.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
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	dcf436a5dc8b56bdfb4aec63b2fe6729
+Source0:	https://storage.googleapis.com/downloads.webmproject.org/releases/webm/%{name}-%{version}.tar.bz2
+# Source0-md5:	49e59dd184caa255886683facea56fca
 URL:		http://www.webmproject.org/
 BuildRequires:	doxygen
 %{?with_tests:BuildRequires:	libstdc++-devel}
@@ -92,14 +82,15 @@ 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 \
@@ -112,19 +103,15 @@ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 	--%{!?with_doc:dis}%{?with_doc:en}able-docs \
 	--%{!?with_doc:dis}%{?with_doc:en}able-install-docs \
 	--enable-vp8 \
-	%{!?with_vp9_encoder:--disable-vp9-encoder} \
+	--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}
@@ -139,7 +126,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.3.0
 
 # adjust prefix and libdir
 %{__sed} -i -e 's,^prefix=.*,prefix=%{_prefix},;s,^libdir=.*,libdir=%{_libdir},' $RPM_BUILD_ROOT%{_pkgconfigdir}/vpx.pc
@@ -153,12 +140,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
-%{?with_vp9_encoder:%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.3
 
 %files devel
 %defattr(644,root,root,755)