[Pkg-gstreamer-commits] [libvpx] 01/01: Integrate 1.3.0-2.1 NMU

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository libvpx.

commit dd17cf9ba82c0ded73e3c70e441c5f6ae5ef518c
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Tue Oct 21 10:00:41 2014 +0200

    Integrate 1.3.0-2.1 NMU
---
 debian/changelog                                   | 10 +++++++
 debian/control                                     |  9 ++----
 .../Bug-fix-in-ssse3-quantize-function.patch       | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 23 +++++-----------
 5 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbae562..f69ac2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libvpx (1.3.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build using the default GCC. Closes: #751318.
+  * Move doxygen and php5-cli to B-D-I (Peter Pentchev). Closes: #726485.
+  * Build using hardening defaults. Closes: #674570.
+  * Apply bug fix for ssse3 quantize function.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 09 Aug 2014 14:38:23 +0200
+
 libvpx (1.3.0-2) unstable; urgency=medium
 
   * debian/control,
diff --git a/debian/control b/debian/control
index 050f37f..1efe477 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,9 @@ Section: video
 Priority: optional
 Maintainer: Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 8.1.3),
-               yasm (>= 0.7) [amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386],
-               doxygen,
-               gcc-4.8,
-               g++-4.8,
-               php5-cli
-Standards-Version: 3.8.4
+               yasm (>= 0.7) [amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386]
+Build-Depends-Indep: doxygen, php5-cli
+Standards-Version: 3.9.5
 Homepage: http://www.webmproject.org
 
 Package: libvpx-dev
diff --git a/debian/patches/Bug-fix-in-ssse3-quantize-function.patch b/debian/patches/Bug-fix-in-ssse3-quantize-function.patch
new file mode 100644
index 0000000..74138e8
--- /dev/null
+++ b/debian/patches/Bug-fix-in-ssse3-quantize-function.patch
@@ -0,0 +1,32 @@
+commit 0d43bd77e5f429467fbd280a7b8f7fbc0bfe1809
+Author: Yunqing Wang <yunqingwang at google.com>
+Date:   Fri Feb 7 14:27:07 2014 -0800
+
+    Bug fix in ssse3 quantize function
+    
+    A bug was reported in Issue 702: "SIGILL (Illegal instruction) when
+    transcoding with vp9 - using FFmpeg". It was reproduced and fixed.
+    
+    Change-Id: Ie32c149a89af02856084aeaf289e848a905c7700
+
+diff --git a/vp9/encoder/x86/vp9_quantize_ssse3.asm b/vp9/encoder/x86/vp9_quantize_ssse3.asm
+index db30660..48ccef8 100644
+--- a/vp9/encoder/x86/vp9_quantize_ssse3.asm
++++ b/vp9/encoder/x86/vp9_quantize_ssse3.asm
+@@ -188,7 +188,8 @@ cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \
+   pmaxsw                          m8, m7
+   pshuflw                         m7, m8, 0x1
+   pmaxsw                          m8, m7
+-  pextrw                        [r2], m8, 0
++  pextrw                          r6, m8, 0
++  mov                             [r2], r6
+   RET
+ 
+   ; skip-block, i.e. just write all zeroes
+@@ -214,5 +215,5 @@ cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \
+ %endmacro
+ 
+ INIT_XMM ssse3
+-QUANTIZE_FN b, 6
++QUANTIZE_FN b, 7
+ QUANTIZE_FN b_32x32, 7
diff --git a/debian/patches/series b/debian/patches/series
index 3fb3ca9..9553e9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-armhf-link.patch
+Bug-fix-in-ssse3-quantize-function.patch
diff --git a/debian/rules b/debian/rules
index e60a485..d35c1fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,20 +66,9 @@ CROSS=$(DEB_HOST_GNU_TYPE)-
 export CROSS
 endif
 
-CFLAGS += -Wall -g
-CXXFLAGS += -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-CXXFLAGS += -O0
-else
-CFLAGS += -O2
-CXXFLAGS += -O2
-endif
-
-export CC=gcc-4.8
-export CPP=cpp-4.8
-export CXX=g++-4.8
+CFLAGS += -Wall $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS)
+CXXFLAGS += -Wall $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CXXFLAGS)
+LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 
 builddir := $(CURDIR)/builddir
 
@@ -88,17 +77,19 @@ configure-stamp:
 	dh_testdir
 	mkdir -p $(builddir); \
 	cd $(builddir); \
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CURDIR)/configure \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$(configure_flags)
 	touch $@
 ifeq ($(BUILD_NEON), Yes)
 	mkdir -p $(builddir)-neon; \
 	cd $(builddir)-neon; \
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"  $(CURDIR)/configure \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$(configure_flags_neon)
 	touch $@
 endif
 
+build-arch: build
+build-indep: build
 build: build-stamp
 
 build-stamp: configure-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/libvpx.git