[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-6-3-g611118d

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Feb 1 22:11:05 UTC 2010


The following commit has been merged in the master branch:
commit 611118dc1b9729b63daa856928d96c7674ef7a8f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 23:09:11 2010 +0100

    drop debian/patches/ffmpeg-debian_hurd.patch
    
    dv1394 is disabled by default, and the switch gets set on architectures
    running linux kernels only. See upstream thread for a discussion of this
    patch: http://permalink.gmane.org/gmane.comp.video.ffmpeg.devel/103700

diff --git a/debian/patches/ffmpeg-debian_hurd.patch b/debian/patches/ffmpeg-debian_hurd.patch
deleted file mode 100644
index c256d24..0000000
--- a/debian/patches/ffmpeg-debian_hurd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Andres Mejia <mcitadel at gmail.com>
-
-Fix build failures for the GNU Hurd OS
-===================================================================
---- a/configure
-+++ b/configure
-@@ -1651,6 +1651,9 @@ case $target_os in
-         ;;
-     gnu/kfreebsd)
-         ;;
-+    gnu)
-+        disable dv1394
-+        ;;
- 
-     *)
-         die "Unknown OS '$target_os'."
diff --git a/debian/patches/series b/debian/patches/series
index ca46316..f225941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 100_kfreebsd
-ffmpeg-debian_hurd.patch
 fix-qtrle-encoding-when-previous-frame-linesize.patch
 aac-regression.patch
 fix-dv-seeking.patch

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list