cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for newer libmatroska

Browse Source 
from Brad (MAINTAINER)
This commit is contained in:
jakemsr 2011-03-12 21:19:13 +00:00
parent 48b6df0564
commit 9b54f5b172
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/vlc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.115 2011/02/02 09:34:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.116 2011/03/12 21:19:13 jakemsr Exp $
SHARED_ONLY= Yes
@ -7,7 +7,7 @@ COMMENT-main= VideoLAN client; multimedia player
V= 1.0.6
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
REVISION-main= 16
REVISION-main= 17
REVISION-jack= 3
REVISION-web= 5
CATEGORIES= x11

19
x11/vlc/patches/patch-modules_demux_mkv_matroska_segment_cpp Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-modules_demux_mkv_matroska_segment_cpp,v 1.1 2011/03/12 21:19:13 jakemsr Exp $
--- modules/demux/mkv/matroska_segment.cpp.orig Sun Feb 27 01:59:13 2011
+++ modules/demux/mkv/matroska_segment.cpp Sun Feb 27 02:05:29 2011
@@ -215,6 +215,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
}
ep->Up();
}
+#if 0 // not valid anymore
else if( MKV_IS_ID( el, KaxTagGeneral ) )
{
msg_Dbg( &sys.demuxer, "| + General" );
@@ -283,6 +284,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
{
msg_Dbg( &sys.demuxer, "| + Multi Title" );
}
+#endif
else
{
msg_Dbg( &sys.demuxer, "| + LoadTag Unknown (%s)", typeid( *el ).name() );

15
x11/vlc/patches/patch-modules_demux_mkv_mkv_hpp
View File

@ -1,9 +1,18 @@
$OpenBSD: patch-modules_demux_mkv_mkv_hpp,v 1.1 2011/02/02 09:34:23 ajacoutot Exp $
$OpenBSD: patch-modules_demux_mkv_mkv_hpp,v 1.2 2011/03/12 21:19:13 jakemsr Exp $
Insufficient input validation in MKV demuxer (VideoLAN-SA-1102).
--- modules/demux/mkv/mkv.hpp.orig Tue Feb 1 20:02:28 2011
+++ modules/demux/mkv/mkv.hpp Tue Feb 1 20:02:54 2011
--- modules/demux/mkv/mkv.hpp.orig Thu Apr 15 12:52:46 2010
+++ modules/demux/mkv/mkv.hpp Sun Feb 27 02:00:13 2011
@@ -93,7 +93,7 @@
#include "matroska/KaxSegment.h"
#include "matroska/KaxTag.h"
#include "matroska/KaxTags.h"
-#include "matroska/KaxTagMulti.h"
+//#include "matroska/KaxTagMulti.h"
#include "matroska/KaxTracks.h"
#include "matroska/KaxTrackAudio.h"
#include "matroska/KaxTrackVideo.h"
@@ -130,7 +130,7 @@ extern "C" {
#endif