Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6ea810391c19c31b64422447e77583ef44ca453c
commit 6ea810391c19c31b64422447e77583ef44ca453c Author: Devil505 <devil505li...@gmail.com> Date: Fri Feb 18 09:45:42 2011 +0100 vlc-1.1.7-1-i686 * version bump * added patch to fix build problem with libmatroska * added patch to fix assert problem with upnp diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index da4101f..ecd1592 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -3,9 +3,9 @@ # Contributor: VMiklos <vmik...@frugalware.org> pkgname=vlc -pkgver=1.1.4 +pkgver=1.1.7 pkgextraver= -pkgrel=3 +pkgrel=1 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; depends=('hal' 'e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' 'libdvbpsi>=0.1.7' 'libsmbclient' 'vcdimager>=0.7.23-4' 'libdvdnav>=4.1.3' \ @@ -19,8 +19,11 @@ Finclude gnome-scriptlet groups=('xmultimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" -source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2) -sha1sums=('2c4f85fbccbd11946cb4b2cf94464e5db38db78a') +source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ + fix_matroska.patch vlc-upnp.patch) +sha1sums=('6bd559fe2bba51c5ed1ae71d18dc8ac611e72a04' \ + '7939a5bf75e60a2fcfb41cd5b519274531a8b485' \ + '13e7ccc32f375650aec10b7c7431b01e547cfd59') build() { diff --git a/source/xmultimedia-extra/vlc/fix_matroska.patch b/source/xmultimedia-extra/vlc/fix_matroska.patch new file mode 100644 index 0000000..3ce3cb7 --- /dev/null +++ b/source/xmultimedia-extra/vlc/fix_matroska.patch @@ -0,0 +1,89 @@ +diff -urN vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp +--- vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp 2011-02-02 13:45:56.115863316 +0100 ++++ vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp 2011-02-02 13:55:23.957416146 +0100 +@@ -220,74 +220,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, "| + LoadTag Unknown (%s)", typeid( *el ).name() ); +diff -urN vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp vlc-1.1.7/modules/demux/mkv/mkv.hpp +--- vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp 2011-02-02 13:45:56.114863318 +0100 ++++ vlc-1.1.7/modules/demux/mkv/mkv.hpp 2011-02-02 13:46:08.647832555 +0100 +@@ -92,7 +92,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" diff --git a/source/xmultimedia-extra/vlc/vlc-upnp.patch b/source/xmultimedia-extra/vlc/vlc-upnp.patch new file mode 100644 index 0000000..35c86b83 --- /dev/null +++ b/source/xmultimedia-extra/vlc/vlc-upnp.patch @@ -0,0 +1,10 @@ +--- vlc-1.1.5/modules/services_discovery/upnp_intel.cpp~ 2010-05-04 21:20:21.000000000 +0200 ++++ vlc-1.1.5/modules/services_discovery/upnp_intel.cpp 2010-11-14 23:28:25.885408960 +0100 +@@ -813,7 +813,6 @@ + input_item_t* p_input_item = input_item_New( _p_sd, + item->getResource(), + item->getTitle() ); +- assert( p_input_item ); + input_item_node_AppendItem( p_input_node, p_input_item ); + item->setInputItem( p_input_item ); + } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
