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

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 82d45d50915d35b0975666d039eaea8425796096
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon May 14 10:10:14 2012 +0200

    debian/patches/*: Refreshed to apply cleanly again.

diff --git a/debian/changelog b/debian/changelog
index b844977..fb10813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libvpx (1.1.0-1) unstable; urgency=low
 
   * New upstream release, "Eider".
+  * debian/patches/*: Refreshed to apply cleanly again.
 
  -- Sebastian Dröge <slomo at debian.org>  Mon, 14 May 2012 10:03:37 +0200
 
diff --git a/debian/patches/01_enable-shared.patch b/debian/patches/01_enable-shared.patch
index 307e350..b06b625 100644
--- a/debian/patches/01_enable-shared.patch
+++ b/debian/patches/01_enable-shared.patch
@@ -1,8 +1,8 @@
 Index: libvpx/configure
 ===================================================================
---- libvpx.orig/configure	2011-08-09 10:06:56.059395856 +0200
-+++ libvpx/configure	2011-08-09 10:09:23.928129091 +0200
-@@ -429,12 +429,6 @@
+--- 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() {
diff --git a/debian/patches/fix-armhf-link.patch b/debian/patches/fix-armhf-link.patch
index 3fd3aa8..de6a863 100644
--- a/debian/patches/fix-armhf-link.patch
+++ b/debian/patches/fix-armhf-link.patch
@@ -1,8 +1,8 @@
-Index: libvpx-1.0.0/build/make/configure.sh
+Index: libvpx/build/make/configure.sh
 ===================================================================
---- libvpx-1.0.0.orig/build/make/configure.sh	2012-02-20 15:33:19.699399094 +0200
-+++ libvpx-1.0.0/build/make/configure.sh	2012-02-20 16:46:12.863199409 +0200
-@@ -680,7 +680,6 @@
+--- 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 @@
  
          case ${tgt_cc} in
          gcc)
@@ -10,14 +10,14 @@ Index: libvpx-1.0.0/build/make/configure.sh
              link_with_cc=gcc
              setup_gnu_toolchain
              arch_int=${tgt_isa##armv}
-@@ -689,8 +688,8 @@
-             tune_cflags="-mtune="
-             if enabled armv7
-             then
--                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp  #-ftree-vectorize
--                check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp  #-march=armv7-a
-+                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon #-ftree-vectorize
-+                check_add_asflags -mcpu=cortex-a8 -mfpu=neon #-march=armv7-a
+@@ -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}

-- 
libvpx Debian packaging