Patch to work with new matroska and png

3 files changed, 112 insertions, 1 deletions

diff --git a/multimedia/vlc08/distinfo b/multimedia/vlc08/distinfo
index 676d59ec6e8..16f2366d2d0 100644
--- a/multimedia/vlc08/distinfo
+++ b/multimedia/vlc08/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.9 2009/08/09 12:33:14 kefren Exp $
+$NetBSD: distinfo,v 1.10 2011/12/06 22:02:24 sborrill Exp $
 
 SHA1 (vlc-0.8.6i.tar.bz2) = 4c6f45dffe3a8309ce201897040dc1f82b9cde99
 RMD160 (vlc-0.8.6i.tar.bz2) = a5da4e1e0980594c678c04016491c8a373df4017
 Size (vlc-0.8.6i.tar.bz2) = 11786172 bytes
 SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c
 SHA1 (patch-ab) = df3a58d361ad0767dab78f7fae7891aee6143c6c
+SHA1 (patch-mkv.cpp) = 1fdc4dbfbc2e5c12c0c61d725d5b7baca1e4b107
 SHA1 (patch-mmstu.c) = ef4bed6fb5871790bb9198dad4961384f3e38d16
 SHA1 (patch-mmstu.h) = a11be24360948bcd8ca32bd7d01020e34c0801ad
+SHA1 (patch-png.c) = 8273fe59e44974bc5217d9d93bc634dae586d5e3
 SHA1 (patch-tta.c) = 923852b9aedeb75eed052e532ce5ddf50ab19951
 SHA1 (patch-x264.c) = 083ab4eeb48e01216cc0c4d62006a50bcd3ae421
diff --git a/multimedia/vlc08/patches/patch-mkv.cpp b/multimedia/vlc08/patches/patch-mkv.cpp
new file mode 100644
index 00000000000..a498ada2c26
--- /dev/null
+++ b/multimedia/vlc08/patches/patch-mkv.cpp
@@ -0,0 +1,87 @@
+$NetBSD: patch-mkv.cpp,v 1.1 2011/12/06 22:02:24 sborrill Exp $
+
+--- modules/demux/mkv.cpp.orig	2011-12-06 21:42:19.000000000 +0000
++++ modules/demux/mkv.cpp	2011-12-06 21:43:41.000000000 +0000
+@@ -75,7 +75,6 @@
+ #include "matroska/KaxSegment.h"
+ #include "matroska/KaxTag.h"
+ #include "matroska/KaxTags.h"
+-#include "matroska/KaxTagMulti.h"
+ #include "matroska/KaxTracks.h"
+ #include "matroska/KaxTrackAudio.h"
+ #include "matroska/KaxTrackVideo.h"
+@@ -3871,74 +3870,6 @@
+                     }
+                     ep->Up();
+                 }
+-                else if( MKV_IS_ID( el, KaxTagGeneral ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + General" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagGenres ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Genres" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagAudioSpecific ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Audio Specific" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagImageSpecific ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Images Specific" );
+-                    ep->Down();
+-                    while( ( el = ep->Get() ) != NULL )
+-                    {
+-                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
+-                    }
+-                    ep->Up();
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiComment ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Comment" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiCommercial ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Commercial" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiDate ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Date" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiEntity ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Entity" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Identifier" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiLegal ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Legal" );
+-                }
+-                else if( MKV_IS_ID( el, KaxTagMultiTitle ) )
+-                {
+-                    msg_Dbg( &sys.demuxer, "|   + Multi Title" );
+-                }
+                 else
+                 {
+                     msg_Dbg( &sys.demuxer, "|   + Unknown (%s)", typeid( *el ).name() );
diff --git a/multimedia/vlc08/patches/patch-png.c b/multimedia/vlc08/patches/patch-png.c
new file mode 100644
index 00000000000..6fa80c4a5f3
--- /dev/null
+++ b/multimedia/vlc08/patches/patch-png.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-png.c,v 1.1 2011/12/06 22:02:24 sborrill Exp $
+
+--- modules/codec/png.c.orig	2011-12-06 21:04:12.000000000 +0000
++++ modules/codec/png.c	2011-12-06 21:04:39.000000000 +0000
+@@ -147,7 +147,7 @@
+     p_info = png_create_info_struct( p_png );
+     if( p_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, NULL, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }
+@@ -155,7 +155,7 @@
+     p_end_info = png_create_info_struct( p_png );
+     if( p_end_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, &p_info, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }