r101 - in unstable/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2006-09-25 12:12:37 +0000 (Mon, 25 Sep 2006)
New Revision: 101

Added:
   unstable/ffmpeg/debian/patches/030_arm_cpu_detect.diff
   unstable/ffmpeg/debian/patches/030_arm_workaround.diff
Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
   unstable/ffmpeg/debian/rules
Log:
ffmpeg (0.cvs20060823-4) unstable; urgency=high

  * Maintainer upload.
  * Acknowledging NMU (Closes: #386458).

  * High urgency because of FTBFS fix.

  * debian/patches/030_arm_workaround.diff:
    + New patch courtesy of Aur?\195?\169lien Jarno: disable the broken ARM assembly
      code in libavcodec/mpegaudiodec.c.

  * debian/patches/030_arm_cpu_detect.diff:
    + New patch courtesy of Aur?\195?\169lien Jarno: correctly detect the newer ARM
      CPUs.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 24 Sep 2006 23:38:29 +0200


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2006-09-25 12:04:49 UTC (rev 100)
+++ unstable/ffmpeg/debian/changelog	2006-09-25 12:12:37 UTC (rev 101)
@@ -1,3 +1,27 @@
+ffmpeg (0.cvs20060823-4) unstable; urgency=high
+
+  * Maintainer upload.
+  * Acknowledging NMU (Closes: #386458).
+
+  * High urgency because of FTBFS fix.
+
+  * debian/patches/030_arm_workaround.diff:
+    + New patch courtesy of Aurélien Jarno: disable the broken ARM assembly
+      code in libavcodec/mpegaudiodec.c.
+
+  * debian/patches/030_arm_cpu_detect.diff:
+    + New patch courtesy of Aurélien Jarno: correctly detect the newer ARM
+      CPUs.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 24 Sep 2006 23:38:29 +0200
+
+ffmpeg (0.cvs20060823-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix variable substitution trick in debian/rules (Closes: #386458).
+
+ -- Luk Claes <luk at debian.org>  Fri, 15 Sep 2006 21:29:07 +0200
+
 ffmpeg (0.cvs20060823-3) unstable; urgency=low
 
   * debian/rules:

Added: unstable/ffmpeg/debian/patches/030_arm_cpu_detect.diff
===================================================================
--- unstable/ffmpeg/debian/patches/030_arm_cpu_detect.diff	2006-09-25 12:04:49 UTC (rev 100)
+++ unstable/ffmpeg/debian/patches/030_arm_cpu_detect.diff	2006-09-25 12:12:37 UTC (rev 101)
@@ -0,0 +1,13 @@
+--- ffmpeg-0.cvs20060823.orig/configure
++++ ffmpeg-0.cvs20060823/configure
+@@ -360,8 +360,8 @@
+       fi
+     fi
+   ;;
+-  # armv4l is a subset of armv5tel
+-  armv4l|armv5tel)
++  # armv4l is a subset of armv[567]*l
++  armv[4567]*l)
+     cpu="armv4l"
+   ;;
+   alpha)

Added: unstable/ffmpeg/debian/patches/030_arm_workaround.diff
===================================================================
--- unstable/ffmpeg/debian/patches/030_arm_workaround.diff	2006-09-25 12:04:49 UTC (rev 100)
+++ unstable/ffmpeg/debian/patches/030_arm_workaround.diff	2006-09-25 12:12:37 UTC (rev 101)
@@ -0,0 +1,11 @@
+--- ffmpeg-0.cvs20060823.orig/libavcodec/mpegaudiodec.c
++++ ffmpeg-0.cvs20060823/libavcodec/mpegaudiodec.c
+@@ -55,7 +55,7 @@
+         ({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; })
+ #   define MULH(ra, rb) \
+         ({ int rt, dummy; asm ("imull %3\n\t" : "=d"(rt), "=a"(dummy): "a" (ra), "rm" (rb)); rt; })
+-#elif defined(ARCH_ARMV4L)
++#elif defined(ARCH_ARMV4L_BROKEN)
+ #   define MULL(a, b) \
+         ({  int lo, hi;\
+             asm("smull %0, %1, %2, %3     \n\t"\

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2006-09-25 12:04:49 UTC (rev 100)
+++ unstable/ffmpeg/debian/patches/series	2006-09-25 12:12:37 UTC (rev 101)
@@ -9,3 +9,5 @@
 020_mmx_pic_code.diff 
 020_disable_snow_mmx_in_pic.diff 
 020_really_use_liba52.diff
+030_arm_cpu_detect.diff
+030_arm_workaround.diff

Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules	2006-09-25 12:04:49 UTC (rev 100)
+++ unstable/ffmpeg/debian/rules	2006-09-25 12:12:37 UTC (rev 101)
@@ -9,7 +9,7 @@
 
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-dc1394
-  lib1394-dev = libraw1394-dev libdc1394-13-dev
+  lib1394-dev = libraw1394-dev, libdc1394-13-dev
 else
   lib1394-dev =
 endif
@@ -177,7 +177,7 @@
 	dh_makeshlibs -p libpostproc0d -V 'libpostproc0d (>= 0.cvs20060823)'
 	dh_installdeb
 	dh_shlibdeps -L libavcodec0d -L libpostproc0d -L libavformat0d -l debian/libavcodec0d/usr/lib:debian/libavformat0d/usr/lib:debian/libpostproc0d/usr/lib
-	dh_gencontrol -Vlib1394-dev=$(lib1394-dev)
+	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums
 	dh_builddeb