[SCM] VLC media player packaging branch, sid, updated. debian/1.1.0-1-2-gb2f5298

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit b2f529831d1b3c5cd9741575b52c8daa0c270cd5
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed Jun 30 23:18:26 2010 +0100

    Fix FTBFS on arm with patch cherry-picked from upstream

diff --git a/debian/patches/503_mpeg2_arm.diff b/debian/patches/503_mpeg2_arm.diff
new file mode 100644
index 0000000..f3246d5
--- /dev/null
+++ b/debian/patches/503_mpeg2_arm.diff
@@ -0,0 +1,21 @@
+Subject: Fix FTBFS on arm with old libmpeg2
+
+commit 8940931e6375cce95b08079342c7bb8f25788e0a
+Author: Christophe Mutricy <xtophe at videolan.org>
+Date:   Mon Jun 28 18:59:42 2010 +0100
+
+    Fix build of mpeg2 module with old libmpeg2 on arm
+
+diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
+index 1189ee9..62d359c 100644
+--- a/modules/codec/libmpeg2.c
++++ b/modules/codec/libmpeg2.c
+@@ -213,7 +213,7 @@ static int OpenDecoder( vlc_object_t *p_this )
+         i_accel |= MPEG2_ACCEL_PPC_ALTIVEC;
+     }
+ 
+-#elif defined(__arm__)
++#elif defined(__arm__) && defined(MPEG2_ACCEL_ARM)
+     i_accel |= MPEG2_ACCEL_ARM;
+ 
+ # ifdef MPEG2_ACCEL_ARM_NEON
diff --git a/debian/patches/series b/debian/patches/series
index b6bad6f..9c8fb9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 200_osdmenu_paths.diff
 501_decrease_alsa_buffer.diff
 502_xulrunner_191.diff
+503_mpeg2_arm.diff

-- 
VLC media player packaging