svn commit: r313172 - in head/multimedia/vlc: . files

[Juergen Lock]

Author: nox
Date: Fri Mar  1 22:52:09 2013
New Revision: 313172
URL: http://svnweb.freebsd.org/changeset/ports/313172

Log:
  - Fix mkv playback when built with clang.
  - Bump PORTREVISION.
  
  Obtained from:	debian

Modified:
  head/multimedia/vlc/Makefile
  head/multimedia/vlc/files/patch-clang

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Fri Mar  1 22:41:58 2013	(r313171)
+++ head/multimedia/vlc/Makefile	Fri Mar  1 22:52:09 2013	(r313172)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \

Modified: head/multimedia/vlc/files/patch-clang
==============================================================================
--- head/multimedia/vlc/files/patch-clang	Fri Mar  1 22:41:58 2013	(r313171)
+++ head/multimedia/vlc/files/patch-clang	Fri Mar  1 22:52:09 2013	(r313172)
@@ -94,3 +94,27 @@ index a2fccac..233504e 100644
 -- 
 1.7.10.4
 
+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: modules/demux/mkv/mkv.hpp
+===================================================================
+--- modules/demux/mkv/mkv.hpp	2012-08-10 13:14:35.284287024 +0200
++++ 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;