diff options
| author | drochner <drochner> | 2011-02-14 19:05:52 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2011-02-14 19:05:52 +0000 |
| commit | dfa66f3a6259f181da3eb361be6a4d01354970e4 (patch) | |
| tree | 04a9b78b19cf63f5b4d70ee62f4cba087974f1ba /multimedia/vlc10 | |
| parent | f41f2e88ba14f94ba7cfeb11b858222bdfb16286 (diff) | |
| download | pkgsrc-dfa66f3a6259f181da3eb361be6a4d01354970e4.tar.gz | |
add patches from current vlc to build with libmatroska-1.1
bump PKGREV
Diffstat (limited to 'multimedia/vlc10')
| -rw-r--r-- | multimedia/vlc10/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/vlc10/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc10/patches/patch-au | 16 | ||||
| -rw-r--r-- | multimedia/vlc10/patches/patch-av | 22 |
4 files changed, 43 insertions, 3 deletions
diff --git a/multimedia/vlc10/Makefile b/multimedia/vlc10/Makefile index 64bb850ba6a..cb89aa5105a 100644 --- a/multimedia/vlc10/Makefile +++ b/multimedia/vlc10/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2011/01/26 19:34:49 abs Exp $ +# $NetBSD: Makefile,v 1.3 2011/02/14 19:05:52 drochner Exp $ # DISTNAME= vlc-${VLC_VERSION} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/vlc10/distinfo b/multimedia/vlc10/distinfo index bc5ca6b19df..01cdf2528fb 100644 --- a/multimedia/vlc10/distinfo +++ b/multimedia/vlc10/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/01/24 18:45:53 drochner Exp $ +$NetBSD: distinfo,v 1.2 2011/02/14 19:05:52 drochner Exp $ SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786 RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 Size (vlc-1.0.6.tar.bz2) = 22149704 bytes SHA1 (patch-aa) = 7e3939a647f04661a2eba4fdbb720637dd267334 SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271 +SHA1 (patch-au) = 7318b1d40246d5540a67c22565ebd439d5fe069d +SHA1 (patch-av) = 2d876c99a4bfe2cd964a78fe19dd108d1cb5f550 SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09 SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407 diff --git a/multimedia/vlc10/patches/patch-au b/multimedia/vlc10/patches/patch-au new file mode 100644 index 00000000000..267c3f2171b --- /dev/null +++ b/multimedia/vlc10/patches/patch-au @@ -0,0 +1,16 @@ +$NetBSD: patch-au,v 1.1 2011/02/14 19:05:52 drochner Exp $ + +fix build with libmatroska-1.1 + +--- modules/demux/mkv/mkv.hpp.orig 2011-01-30 14:45:14.000000000 +0000 ++++ modules/demux/mkv/mkv.hpp +@@ -92,7 +92,8 @@ + #include "matroska/KaxSegment.h" + #include "matroska/KaxTag.h" + #include "matroska/KaxTags.h" +-#include "matroska/KaxTagMulti.h" ++//missing in libmatroska-1.1 ++//#include "matroska/KaxTagMulti.h" + #include "matroska/KaxTracks.h" + #include "matroska/KaxTrackAudio.h" + #include "matroska/KaxTrackVideo.h" diff --git a/multimedia/vlc10/patches/patch-av b/multimedia/vlc10/patches/patch-av new file mode 100644 index 00000000000..49d7a1ca3dd --- /dev/null +++ b/multimedia/vlc10/patches/patch-av @@ -0,0 +1,22 @@ +$NetBSD: patch-av,v 1.1 2011/02/14 19:05:52 drochner Exp $ + +fix build with libmatroska-1.1 + +--- modules/demux/mkv/matroska_segment.cpp.orig 2010-09-27 14:38:23.000000000 +0000 ++++ modules/demux/mkv/matroska_segment.cpp +@@ -220,6 +220,7 @@ void matroska_segment_c::LoadTags( KaxTa + } + ep->Up(); + } ++#if 0 //not valid anymore + else if( MKV_IS_ID( el, KaxTagGeneral ) ) + { + msg_Dbg( &sys.demuxer, "| + General" ); +@@ -288,6 +289,7 @@ void matroska_segment_c::LoadTags( KaxTa + { + msg_Dbg( &sys.demuxer, "| + Multi Title" ); + } ++#endif + else + { + msg_Dbg( &sys.demuxer, "| + LoadTag Unknown (%s)", typeid( *el ).name() ); |