[Pkg-gstreamer-commits] [SCM] libvpx Debian packaging branch, master, updated. debian/1.1.0-1-3-g832dcd2

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 832dcd2a40084646c06002b94a6b91a0d8a5968e
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Sun May 26 10:39:39 2013 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 5f74a47..110d8a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvpx (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/*: Refreshed to apply cleanly again.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 26 May 2013 10:39:18 +0200
+
 libvpx (1.1.0-1) unstable; urgency=low
 
   * New upstream release, "Eider".
diff --git a/debian/patches/01_enable-shared.patch b/debian/patches/01_enable-shared.patch
deleted file mode 100644
index b06b625..0000000
--- a/debian/patches/01_enable-shared.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libvpx/configure
-===================================================================
---- libvpx.orig/configure	2012-05-14 10:09:49.725600345 +0200
-+++ libvpx/configure	2012-05-14 10:09:51.721600374 +0200
-@@ -449,12 +449,6 @@
- }
- 
- process_detect() {
--    if enabled shared; then
--        # Can only build shared libs on a subset of platforms. Doing this check
--        # here rather than at option parse time because the target auto-detect
--        # magic happens after the command line has been parsed.
--        enabled linux || die "--enable-shared only supported on ELF for now"
--    fi
-     if [ -z "$CC" ]; then
-         echo "Bypassing toolchain for environment detection."
-         enable external_build
diff --git a/debian/patches/fix-armhf-link.patch b/debian/patches/fix-armhf-link.patch
index de6a863..d170a0d 100644
--- a/debian/patches/fix-armhf-link.patch
+++ b/debian/patches/fix-armhf-link.patch
@@ -1,23 +1,15 @@
-Index: libvpx/build/make/configure.sh
-===================================================================
---- libvpx.orig/build/make/configure.sh	2012-05-14 10:02:11.000000000 +0200
-+++ libvpx/build/make/configure.sh	2012-05-14 10:07:58.957598682 +0200
-@@ -725,7 +725,6 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index c99a01c..c951900 100755
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -783,8 +783,8 @@ process_common_toolchain() {
+             check_add_asflags --defsym ARCHITECTURE=${arch_int}
+             tune_cflags="-mtune="
+             if [ ${tgt_isa} == "armv7" ]; then
+-                check_add_cflags  -march=armv7-a -mfloat-abi=softfp
+-                check_add_asflags -march=armv7-a -mfloat-abi=softfp
++                check_add_cflags  -march=armv7-a
++                check_add_asflags -march=armv7-a
  
-         case ${tgt_cc} in
-         gcc)
--            CROSS=${CROSS:-arm-none-linux-gnueabi-}
-             link_with_cc=gcc
-             setup_gnu_toolchain
-             arch_int=${tgt_isa##armv}
-@@ -738,8 +737,8 @@
-                     check_add_cflags -mfpu=neon #-ftree-vectorize
-                     check_add_asflags -mfpu=neon
-                 fi
--                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp
--                check_add_asflags -mcpu=cortex-a8 -mfloat-abi=softfp  #-march=armv7-a
-+                check_add_cflags -march=armv7-a -mcpu=cortex-a8
-+                check_add_asflags -mcpu=cortex-a8 #-march=armv7-a
-             else
-                 check_add_cflags -march=${tgt_isa}
-                 check_add_asflags -march=${tgt_isa}
+                 if enabled neon
+                 then
diff --git a/debian/patches/series b/debian/patches/series
index 1639d38..3fb3ca9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_enable-shared.patch
 fix-armhf-link.patch

-- 
libvpx Debian packaging