[Frugalware-git] frugalware-current: vlc-1.1.8-1-i686 * version bump * removed matroska patch

Devil505 devil505linux at gmail.com
Sun Apr 3 11:07:41 CEST 2011


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb4fa6148319e43bf78b54426f499041fb18fd0d

commit bb4fa6148319e43bf78b54426f499041fb18fd0d
Author: Devil505 <devil505linux at gmail.com>
Date:   Sun Apr 3 12:04:49 2011 +0200

vlc-1.1.8-1-i686
* version bump
* removed matroska patch

diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild
index ec6fbd1..3dd78fb 100644
--- a/source/xmultimedia-extra/vlc/FrugalBuild
+++ b/source/xmultimedia-extra/vlc/FrugalBuild
@@ -3,9 +3,9 @@
# Contributor: VMiklos <vmiklos at frugalware.org>

pkgname=vlc
-pkgver=1.1.7
+pkgver=1.1.8
pkgextraver=
-pkgrel=2
+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.24' 'libdvdnav>=4.1.3' \
@@ -20,9 +20,8 @@ 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 \
-    fix_matroska.patch vlc-upnp.patch)
-sha1sums=('6bd559fe2bba51c5ed1ae71d18dc8ac611e72a04' \
-          '7939a5bf75e60a2fcfb41cd5b519274531a8b485' \
+    vlc-upnp.patch)
+sha1sums=('c4ac61e31fa287a0cb7744534a1abf49cf033776' \
'13e7ccc32f375650aec10b7c7431b01e547cfd59')

build()
diff --git a/source/xmultimedia-extra/vlc/fix_matroska.patch b/source/xmultimedia-extra/vlc/fix_matroska.patch
deleted file mode 100644
index 3ce3cb7..0000000
--- a/source/xmultimedia-extra/vlc/fix_matroska.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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"


More information about the Frugalware-git mailing list