Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d76490939c5f798092389473216b4cac3619518
commit 8d76490939c5f798092389473216b4cac3619518 Author: crazy <[EMAIL PROTECTED]> Date: Thu Feb 28 21:28:33 2008 +0100 vlc-0.8.6-11-i686 * Version bump to patchlevel 'e' * changed m8r to me , vmiklos should be happy now :) * while at it fixed broken ogg support * closes FS#2819 in current diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index 41ecf48..e5a40f1 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -1,16 +1,17 @@ # Compiling Time: 3.89 SBU -# Maintainer: VMiklos <[EMAIL PROTECTED]> +# Maintainer: crazy <[EMAIL PROTECTED]> +# Contributor: VMiklos <[EMAIL PROTECTED]> pkgname=vlc pkgver=0.8.6 -pkgextraver=d -pkgrel=10 +pkgextraver=e +pkgrel=11 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ 'mpeg2dec' 'ffmpeg>=20070422' 'fribidi' 'wxgtk-u8>=2.8.7' 'live' 'speex' 'libdca' \ 'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' \ - 'libid3tag' 'libtheora' 'faad2' 'xvidcore') + 'libid3tag' 'libtheora' 'faad2' 'xvidcore' 'libtheora') ## WARNING: do NOT add any VCD option to build its kill off the GUI makedepends=('firefox' 'samba' 'cvs') options=('scriptlet') @@ -18,14 +19,12 @@ 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 \ - $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch \ - SA28233.patch) -sha1sums=('63afd15cc782795c8d8f3de5edc614389465c577' \ + $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch) +sha1sums=('6b981ddbe7f6b95cd566ee195b4445b5773c21bd' \ '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \ '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \ - 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ - '86ece3df5bf479c2c74f4a24ac3746b1bd7ef49d') + 'edc3a14dfd9b022dca7593e006c324fa5cc17e48') build() { @@ -44,6 +43,7 @@ build() --enable-dvdnav \ --enable-madi \ --enable-ffmpeg \ + --enable-theora \ --disable-rpath \ --disable-nls \ --enable-alsa \ diff --git a/source/xmultimedia-extra/vlc/SA28233.patch b/source/xmultimedia-extra/vlc/SA28233.patch deleted file mode 100644 index 3909ea1..0000000 --- a/source/xmultimedia-extra/vlc/SA28233.patch +++ /dev/null @@ -1,59 +0,0 @@ -Timestamp: 12/24/07 17:42:08 -Author: courmisch -Message: [20715] is too large to be backported. Put buffer size limits instead. - -Timestamp: 06/30/07 00:41:49 -Author: fenrir -Message: - Fixed potential sscanf buffer overflow in : - * ParseMicroDvd? - * ParseSubRip? - * ParseSubViewer? - * ParseSSA - (Reported by Michal Luczaj) - - -Index: vlc-0.8.6d/modules/demux/subtitle.c -=================================================================== ---- vlc-0.8.6d.orig/modules/demux/subtitle.c -+++ vlc-0.8.6d/modules/demux/subtitle.c -@@ -723,8 +723,8 @@ next: - i_stop = 0; - - memset( buffer_text, '\0', MAX_LINE ); -- if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, buffer_text ) == 2 || -- sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) -+ if( sscanf( s, "{%d}{}%8192[^\r\n]", &i_start, buffer_text ) == 2 || -+ sscanf( s, "{%d}{%d}%8192[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) - { - break; - } -@@ -949,8 +949,8 @@ static int ParseSSA( demux_t *p_demux, - demux_sys_t *p_sys = p_demux->p_sys; - text_t *txt = &p_sys->txt; - -- char buffer_text[ 10 * MAX_LINE]; -- char buffer_text2[ 10 * MAX_LINE]; -+ char buffer_text[ 10 * MAX_LINE + 1]; -+ char buffer_text2[ 10 * MAX_LINE + 1]; - char *s; - int64_t i_start; - int64_t i_stop; -@@ -981,7 +981,7 @@ static int ParseSSA( demux_t *p_demux, - * Dialogue: Layer#,0:02:40.65,0:02:41.79,Wolf main,Cher,0000,0000,0000,,Et les enregistrements de ses ondes delta ? - */ - if( sscanf( s, -- "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%[^\r\n]", -+ "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%81920[^\r\n]", - buffer_text2, - &h1, &m1, &s1, &c1, - &h2, &m2, &s2, &c2, -@@ -1075,7 +1075,7 @@ static int ParseVplayer( demux_t *p_dem - i_start = 0; - - memset( buffer_text, '\0', MAX_LINE ); -- if( sscanf( p, "%d:%d:%d%[ :]%[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) -+ if( sscanf( p, "%d:%d:%d%[ :]%81920[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) - { - i_start = ( (int64_t)h * 3600*1000 + - (int64_t)m * 60*1000 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
