[SCM] VLC media player packaging branch, sid, updated. debian/1.1.0-4-8-g70106ea
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Wed Jul 21 22:45:52 UTC 2010
The following commit has been merged in the sid branch:
commit efaae60b3009ad7d0a346b2af7a02d178f90a222
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Tue Jul 20 23:39:14 2010 +0200
Remove patches merged upstream
diff --git a/debian/patches/503_mpeg2_arm.diff b/debian/patches/503_mpeg2_arm.diff
deleted file mode 100644
index f3246d5..0000000
--- a/debian/patches/503_mpeg2_arm.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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/504_fix_kfreebsd_ftbfs_access_file_module.diff b/debian/patches/504_fix_kfreebsd_ftbfs_access_file_module.diff
deleted file mode 100644
index bed9095..0000000
--- a/debian/patches/504_fix_kfreebsd_ftbfs_access_file_module.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Subject: fix kfreebsd ftbfs in access file module
-
-Found while testbuilding on asdfasdf.debian.net
-
-diff --git a/modules/access/file.c b/modules/access/file.c
-index 3531fa7..dfd435e 100644
---- a/modules/access/file.c
-+++ b/modules/access/file.c
-@@ -96,7 +96,7 @@ static bool IsRemote (int fd)
- if (fstatvfs (fd, &stf))
- return false;
- /* fstatvfs() is in POSIX, but MNT_LOCAL is not */
-- return !(s.f_flag & MNT_LOCAL);
-+ return !(stf.f_flag & MNT_LOCAL);
-
- #elif defined (HAVE_LINUX_MAGIC_H)
- struct statfs stf;
diff --git a/debian/patches/series b/debian/patches/series
index 374b818..b6bad6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@
200_osdmenu_paths.diff
501_decrease_alsa_buffer.diff
502_xulrunner_191.diff
-503_mpeg2_arm.diff
-504_fix_kfreebsd_ftbfs_access_file_module.diff
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list