spot pushed to libvpx (master). "1.4.0"

[notifications at fedoraproject.org]

>From f1e88794eaa2c4c72b0f8069f678f63855e47f29 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 6 Apr 2015 15:30:29 -0400
Subject: 1.4.0


diff --git a/.gitignore b/.gitignore
index 0330765..5e320b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libvpx-0.9.1.tar.bz2
 /libvpx-v1.1.0.tar.bz2
 /libvpx-v1.2.0.tar.bz2
 /libvpx-v1.3.0.tar.bz2
+/v1.4.0.tar.gz
diff --git a/libvpx.spec b/libvpx.spec
index 0ff210f..84dd402 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -1,18 +1,17 @@
-%global majorver 1
-%global minorver 3
-%global tinyver  0
+%global somajor 2
+%global sominor 0
+%global sotiny  0
+%global soversion %{somajor}.%{sominor}.%{sotiny}
 
 Name:			libvpx
 Summary:		VP8 Video Codec SDK
-Version:		%{majorver}.%{minorver}.%{tinyver}
-%global soversion	%{version}
-Release:		6%{?dist}
+Version:		1.4.0
+Release:		1%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
-Source0:		http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
+Source0:		https://libvpx.webm.googlecode.com/archive/v%{version}.tar.gz
 # Thanks to debian.
 Source2:		libvpx.ver
-Patch0:			Bug-fix-in-ssse3-quantize-function.patch
 URL:			http://www.webmproject.org/tools/vp8-sdk/
 %ifarch %{ix86} x86_64
 BuildRequires:		yasm
@@ -43,8 +42,7 @@ A selection of utilities and tools for VP8, including a sample encoder
 and decoder.
 
 %prep
-%setup -q -n %{name}-v%{version}
-%patch0 -p1 -b .patch0
+%setup -q -n libvpx.webm-v%{version}
 
 %build
 %ifarch %{ix86}
@@ -100,7 +98,7 @@ sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" examples-%{vpxtarget}.mk
 sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" docs-%{vpxtarget}.mk
 %endif
 
-make %{?_smp_mflags} verbose=true target=libs
+make %{?_smp_mflags} verbose=true
 
 %if %{generic_target}
 # Manual shared library creation
@@ -108,23 +106,23 @@ mkdir tmp
 cd tmp
 ar x ../libvpx_g.a
 cd ..
-gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.%{majorver} -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.%{soversion} tmp/*.o
+gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.%{somajor} -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.%{soversion} tmp/*.o
 rm -rf tmp
 %endif
 
 # Temporarily dance the static libs out of the way
-mv libvpx.a libNOTvpx.a
-mv libvpx_g.a libNOTvpx_g.a
+# mv libvpx.a libNOTvpx.a
+# mv libvpx_g.a libNOTvpx_g.a
 
 # We need to do this so the examples can link against it.
-ln -sf libvpx.so.%{soversion} libvpx.so
+# ln -sf libvpx.so.%{soversion} libvpx.so
 
-make %{?_smp_mflags} verbose=true target=examples CONFIG_SHARED=1
-make %{?_smp_mflags} verbose=true target=docs
+# make %{?_smp_mflags} verbose=true target=examples CONFIG_SHARED=1
+# make %{?_smp_mflags} verbose=true target=docs
 
 # Put them back so the install doesn't fail
-mv libNOTvpx.a libvpx.a
-mv libNOTvpx_g.a libvpx_g.a
+# mv libNOTvpx.a libvpx.a
+# mv libNOTvpx_g.a libvpx_g.a
 
 %install
 make DIST_DIR=%{buildroot}%{_prefix} dist
@@ -136,14 +134,18 @@ mv %{buildroot}/usr/docs doc/
 install -p libvpx.so.%{soversion} %{buildroot}%{_libdir}
 pushd %{buildroot}%{_libdir}
 ln -sf libvpx.so.%{soversion} libvpx.so
-ln -sf libvpx.so.%{soversion} libvpx.so.%{majorver}
-ln -sf libvpx.so.%{soversion} libvpx.so.%{majorver}.%{minorver}
+ln -sf libvpx.so.%{soversion} libvpx.so.%{somajor}
+ln -sf libvpx.so.%{soversion} libvpx.so.%{somajor}.%{sominor}
 popd
 %endif
 
 pushd %{buildroot}
 # Stuff we don't need.
 rm -rf usr/build/ usr/md5sums.txt usr/lib*/*.a usr/CHANGELOG usr/README
+# No, bad google. No treat.
+mv usr/bin/examples/* usr/bin/
+rm -rf usr/bin/examples
+
 # Rename a few examples
 mv usr/bin/postproc usr/bin/vp8_postproc
 mv usr/bin/simple_decoder usr/bin/vp8_simple_decoder
@@ -171,6 +173,9 @@ popd
 %{_bindir}/*
 
 %changelog
+* Mon Apr  6 2015 Tom Callaway <spot at fedoraproject.org> - 1.4.0-1
+- update to 1.4.0
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 7d4b23f..1ff5e71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14783a148872f2d08629ff7c694eb31f  libvpx-v1.3.0.tar.bz2
+3f80d2461b205c81c05ed1531d256c96  v1.4.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libvpx.git/commit/?h=master&id=f1e88794eaa2c4c72b0f8069f678f63855e47f29