[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu14-16-gda51fea

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Apr 22 18:55:37 UTC 2010


The following commit has been merged in the master branch:
commit da51fea1a993fa96e2987b13720c00f1bdd15836
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Apr 22 20:49:24 2010 +0200

    disable vidix on kFreeBSD-amd64

diff --git a/debian/patches/62-disable-vidix-on-kfreebsd-amd64.patch b/debian/patches/62-disable-vidix-on-kfreebsd-amd64.patch
new file mode 100644
index 0000000..4d420cd
--- /dev/null
+++ b/debian/patches/62-disable-vidix-on-kfreebsd-amd64.patch
@@ -0,0 +1,33 @@
+From: diego <subversion at mplayerhq.hu>
+Subject: r31057 - trunk/configure
+Newsgroups: gmane.comp.video.mplayer.cvs
+To: mplayer-cvslog at mplayerhq.hu
+Date: Thu, 22 Apr 2010 16:02:20 +0200 (CEST)
+Reply-To: MPlayer CVS changelogs and discussion <mplayer-cvslog at mplayerhq.hu>
+
+Author: diego
+Date: Thu Apr 22 16:02:20 2010
+New Revision: 31057
+
+Log:
+VIDIX only works for Linux on the x86_64 architecture, not on other OSes.
+Fixes Debian bug #578622.
+
+Modified:
+   trunk/configure
+
+adapted for rc3 by siretart at tauware.de
+
+Modified: trunk/configure
+==============================================================================
+--- a/configure
++++ b/configure
+@@ -4537,7 +4537,7 @@ if test "$_vidix" = auto ; then
+   _vidix=no
+   x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \
+     && _vidix=yes
+-  (ppc || alpha) && linux && _vidix=yes
++  x86_64 && ! linux && _vidix=no
+ fi
+ echores "$_vidix"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a66b833..723685a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 50_fix_crashes_with_invalid_SDPs.patch
 60_backport_x264_wrapper.patch
 61-malloc-bsd.patch
+62-disable-vidix-on-kfreebsd-amd64.patch

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list