diff options
| author | nox <nox@FreeBSD.org> | 2013-03-02 06:52:09 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2013-03-02 06:52:09 +0800 |
| commit | cb9571dadfa81b3f8ac87e5cd21e75cafcd7cb42 (patch) | |
| tree | a2ce75f923016a223ebba9bf570aef4a2e228c8b /multimedia | |
| parent | 2dd064bc0b5c62713b1c876723cc19a6ccf41503 (diff) | |
| download | freebsd-ports-gnome-cb9571dadfa81b3f8ac87e5cd21e75cafcd7cb42.tar.gz freebsd-ports-gnome-cb9571dadfa81b3f8ac87e5cd21e75cafcd7cb42.tar.zst freebsd-ports-gnome-cb9571dadfa81b3f8ac87e5cd21e75cafcd7cb42.zip | |
- Fix mkv playback when built with clang.
- Bump PORTREVISION.
Obtained from: debian
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-clang | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 8e4fcf161d96..00c04049b6a1 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -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/}/ \ diff --git a/multimedia/vlc/files/patch-clang b/multimedia/vlc/files/patch-clang index f845a1f8e592..37e72ce85a19 100644 --- a/multimedia/vlc/files/patch-clang +++ b/multimedia/vlc/files/patch-clang @@ -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@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; |