[SCM] vlc/squeeze-backports: Add debian/patches/unbreak-with-gcc-4.4.patch to fix mkv playback with gcc-4.4

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Aug 10 11:37:09 UTC 2012


The following commit has been merged in the squeeze-backports branch:
commit e41bca1530c1ed993121213418fb2774a6c12f1a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 10 13:17:48 2012 +0200

    Add debian/patches/unbreak-with-gcc-4.4.patch to fix mkv playback with gcc-4.4

diff --git a/debian/patches/series b/debian/patches/series
index 5703d5d..8c33a45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 v4l-kfreebsd.patch
 link-vlc-cache-gen-with-c++.patch
 link-vlc-with-c++.patch
+unbreak-with-gcc-4.4.patch
diff --git a/debian/patches/unbreak-with-gcc-4.4.patch b/debian/patches/unbreak-with-gcc-4.4.patch
new file mode 100644
index 0000000..7e12525
--- /dev/null
+++ b/debian/patches/unbreak-with-gcc-4.4.patch
@@ -0,0 +1,24 @@
+From: Reinhard Tartler
+Subject: Fixes mkv playback with gcc-4.4 as found in debian/squeeze
+
+This effectively reverts this upstream commit:
+http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=59491dcedffbf97612d2c572943b56ee4289dd07
+
+Suggested by:
+http://forum.videolan.org/viewtopic.php?f=13&t=98175&p=327945&hilit=KaxSegment#p327945
+
+Thanks to Artyom Kazak <artyom.kazak at gmail.com> for pointing this out
+
+Index: vlc/modules/demux/mkv/mkv.hpp
+===================================================================
+--- vlc.orig/modules/demux/mkv/mkv.hpp	2012-08-10 13:14:35.284287024 +0200
++++ vlc/modules/demux/mkv/mkv.hpp	2012-08-10 13:15:13.839249260 +0200
+@@ -115,7 +115,7 @@
+ 
+ #define MKVD_TIMECODESCALE 1000000
+ 
+-#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) )
++#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
+ 
+ 
+ using namespace LIBMATROSKA_NAMESPACE;

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list