From e556b041eaff72519107df11b72d63a98d2c7a8b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 11 Apr 2011 15:05:52 +0200 Subject: [PATCH] vlc: update to 1.1.8. --- .../patches/vlc-1.1.7-libmatroska-1.1.0.patch | 89 ------------------- .../vlc/patches/vlc-1.1.7-libnotify-0.7.patch | 11 --- srcpkgs/vlc/template | 5 +- 3 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 srcpkgs/vlc/patches/vlc-1.1.7-libmatroska-1.1.0.patch delete mode 100644 srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch diff --git a/srcpkgs/vlc/patches/vlc-1.1.7-libmatroska-1.1.0.patch b/srcpkgs/vlc/patches/vlc-1.1.7-libmatroska-1.1.0.patch deleted file mode 100644 index 41f6d656aa5..00000000000 --- a/srcpkgs/vlc/patches/vlc-1.1.7-libmatroska-1.1.0.patch +++ /dev/null @@ -1,89 +0,0 @@ -Fix build libmatroska-1.1.0, from Gentoo. - ---- modules/demux/mkv/matroska_segment.cpp 2011-02-02 13:45:56.115863316 +0100 -+++ 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() ); ---- modules/demux/mkv/mkv.hpp 2011-02-02 13:45:56.114863318 +0100 -+++ 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/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch b/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch deleted file mode 100644 index 93b62d85131..00000000000 --- a/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/misc/notify/notify.c.orig 2011-02-28 23:54:18.794722978 +0100 -+++ modules/misc/notify/notify.c 2011-02-28 23:54:49.425738093 +0100 -@@ -312,7 +312,7 @@ static int Notify( vlc_object_t *p_this, - } - - notification = notify_notification_new( _("Now Playing"), -- psz_temp, NULL, NULL ); -+ psz_temp, NULL ); - notify_notification_set_timeout( notification, - var_InheritInteger(p_this, "notify-timeout") ); - notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW ); diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index b2cb000db53..8bb8cb557f3 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,6 @@ # Template file for 'vlc' pkgname=vlc -version=1.1.7 -revision=3 +version=1.1.8 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-gme --disable-libtar --enable-snapshot @@ -9,7 +8,7 @@ configure_args="--disable-gme --disable-libtar --enable-snapshot --enable-dvdread --enable-flac --disable-gnomevfs" short_desc="VideoLan Client" maintainer="Juan RP " -checksum=28059ef17d0866c3d9d5808fb6bf56783f72486b1b80f7ea8f6106612db0c1d5 +checksum=fb1ff7ed861a67510cdf91e8f3c1d23687a0db3ede78bf2baf292417aedabfb4 long_desc=" VLC media player is a highly portable multimedia player supporting most audio and video formats (H.264, Ogg, DivX, MKV, TS, MPEG-2, mp3, MPEG-4,