Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5154684899f8fd137f5bf18c350089749aa0b8b2
commit 5154684899f8fd137f5bf18c350089749aa0b8b2
Author: crazy <[EMAIL PROTECTED]>
Date: Mon Jun 2 13:39:42 2008 +0200
vlc-0.8.6-17-x86_64
* Version bump
* removed patches are merged upstream already
* live gone from depends , seems to be badly broken.
* we get a lot 'errors in ...libliveMedia.a(.eh_frame).. '
* and the fmp size grows from 3MB to 67MB with live enabled , heh.
diff --git a/source/xmultimedia-extra/vlc/CVE-2008-1686.patch
b/source/xmultimedia-extra/vlc/CVE-2008-1686.patch
deleted file mode 100644
index ca68a39..0000000
--- a/source/xmultimedia-extra/vlc/CVE-2008-1686.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: THANKS
-===================================================================
---- THANKS (revision aba5ca0b02bd17740f11ef993c1d8003b453a288)
-+++ THANKS (revision 8060b3457e20e6223b70927693f8da8f547b8fef)
-@@ -79,4 +79,5 @@
- Enrico Gueli <e_gueli at yahoo.it> - Brightness threshold in adjust video
filter
- Enrique Osuna <enrique.osuna at gmail.com> - Various bug fixes in libvlc.
Major Mac OS X Framework improvements.
-+Eren Türkay <turkay dot eren \a/ gmail point com> - Speex boundary checks and
security fix
- Espen Skoglund <esk at ira.uka.de> - FreeBSD autoconf and Makefile patches
- Ethan C. Baldridge <BaldridgeE at cadmus.com> - directory browsing code
-Index: modules/codec/speex.c
-===================================================================
---- modules/codec/speex.c (revision 449fd28aaf007c6411251dae9d0dbfdc65b135d1)
-+++ modules/codec/speex.c (revision 8060b3457e20e6223b70927693f8da8f547b8fef)
-@@ -358,5 +358,5 @@
- return VLC_EGENERIC;
- }
-- if( p_header->mode >= SPEEX_NB_MODES )
-+ if( p_header->mode >= SPEEX_NB_MODES || p_header->mode < 0 )
- {
- msg_Err( p_dec, "mode number %d does not (yet/any longer) exist in "
diff --git a/source/xmultimedia-extra/vlc/FrugalBuild
b/source/xmultimedia-extra/vlc/FrugalBuild
index e195d71..134b393 100644
--- a/source/xmultimedia-extra/vlc/FrugalBuild
+++ b/source/xmultimedia-extra/vlc/FrugalBuild
@@ -4,42 +4,39 @@
pkgname=vlc
pkgver=0.8.6
-pkgextraver=f
-pkgrel=16
+pkgextraver=g
+pkgrel=17
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>=20080427' 'fribidi' 'wxgtk-u8>=2.8.7' 'live'
'speex>=1.2beta3.2' 'libdca' \
'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' \
- 'libid3tag' 'libtheora' 'faad2' 'xvidcore' 'libtheora'
'libebml>=0.7.8')
-## WARNING: do NOT add any VCD option to build its kill off the GUI
+ 'libid3tag' 'libtheora' 'faad2' 'xvidcore' 'libtheora'
'libebml>=0.7.8' \
+ 'libtar')
makedepends=('firefox' 'samba' 'cvs')
options=('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
\
- $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff \
- libdca.patch CVE-2008-1686.patch)
-sha1sums=('9684bb7504636d3e3143734698c2bbac250f4a03' \
- 'd95c19c510fc56d92ccd38df864f27f782565126' \
+ $pkgname.desktop vlc-0.8.5-libintl.diff \
+ libdca.patch)
+sha1sums=('6dab0e1593607d3a1ee585ba009b99627477f467' \
'0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \
'50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \
- 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \
- 'e8d8887fe34e6214f16214dca3e509ec842be04c')
+ 'edc3a14dfd9b022dca7593e006c324fa5cc17e48')
build()
{
Fpatchall
- export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
Fsed 'mozilla-config' 'firefox-config' configure.ac
Fsed 'firefox-config\.h' 'mozilla-config\.h' configure.ac
Fsed '/usr/lib/mozilla' '/usr/lib/firefox' configure.ac
Fsed '/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf' \
'/usr/lib/X11/fonts/TTF/VeraBd.ttf' \
modules/misc/freetype.c
- #./bootstrap || return 1
- autoconf || Fdie
+ ./bootstrap || return 1
+ #autoconf || Fdie
Fconf \
--enable-faad \
--enable-dvdread \
@@ -63,6 +60,7 @@ build()
--with-gnu-ld \
--enable-dvbpsi \
--with-dvbpsi=/usr/include/dvbpsi \
+ --enable-libtool \
--with-ffmpeg-{mp3lame,faac,faad,dts,vorbis,theora,ogg}
Fsed '%{idldir}' '/usr/share/idl/firefox' mozilla/Makefile
make || return 1
diff --git a/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff
b/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff
deleted file mode 100644
index ef215e4..0000000
--- a/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -aur vlc-0.8.6f/configure.ac fw_vlc-0.8.6f/configure.ac
---- vlc-0.8.6f/configure.ac 2008-03-23 23:41:48.000000000 +0100
-+++ fw_vlc-0.8.6f/configure.ac 2008-04-28 16:45:57.000000000 +0200
-@@ -2694,12 +2694,12 @@
- else
-
- dnl Trying with pkg-config
-- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
-+ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc],
- [
-- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header
file ffmpeg/avcodec.h.])] )
-- AC_CHECK_HEADERS(ffmpeg/avformat.h)
-- AC_CHECK_HEADERS(ffmpeg/avutil.h)
-- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing
header file postproc/postprocess.h.])] )
-+ AC_CHECK_HEADERS(libavcodec/avcodec.h, [], [AC_MSG_ERROR([Missing header
file libavcodec/avcodec.h.])] )
-+ AC_CHECK_HEADERS(libavformat/avformat.h)
-+ AC_CHECK_HEADERS(libavutil/avutil.h)
-+ AC_CHECK_HEADERS(libpostproc/postprocess.h, [], [AC_MSG_ERROR([Missing
header file libpostproc/postprocess.h.])] )
- if test "${SYS}" = "darwin"; then
- VLC_ADD_BUILTINS([ffmpeg])
- else
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/audio.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/audio.c
---- vlc-0.8.6f/modules/codec/ffmpeg/audio.c 2008-03-23 23:41:48.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/audio.c 2008-04-28 17:16:47.000000000
+0200
-@@ -32,7 +32,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/chroma.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/chroma.c
---- vlc-0.8.6f/modules/codec/ffmpeg/chroma.c 2008-03-23 23:41:48.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/chroma.c 2008-04-28
17:18:30.000000000 +0200
-@@ -31,7 +31,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/demux.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/demux.c
---- vlc-0.8.6f/modules/codec/ffmpeg/demux.c 2008-03-31 21:07:51.000000000
+0200
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/demux.c 2008-04-28 17:31:52.000000000
+0200
-@@ -35,7 +35,7 @@
- #ifdef HAVE_FFMPEG_AVFORMAT_H
- # include <ffmpeg/avformat.h>
- #else
--# include <avformat.h>
-+# include <libavformat/avformat.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/encoder.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/encoder.c
---- vlc-0.8.6f/modules/codec/ffmpeg/encoder.c 2008-03-23 23:41:48.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/encoder.c 2008-04-28
17:32:19.000000000 +0200
-@@ -39,7 +39,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #if LIBAVCODEC_BUILD < 4704
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c
---- vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c 2008-03-23 23:41:48.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c 2008-04-28
17:32:40.000000000 +0200
-@@ -33,7 +33,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #if LIBAVCODEC_BUILD < 4680
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/mux.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/mux.c
---- vlc-0.8.6f/modules/codec/ffmpeg/mux.c 2008-03-23 23:41:48.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/mux.c 2008-04-28 17:33:16.000000000
+0200
-@@ -34,7 +34,7 @@
- #ifdef HAVE_FFMPEG_AVFORMAT_H
- # include <ffmpeg/avformat.h>
- #else
--# include <avformat.h>
-+# include <libavformat/avformat.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c
---- vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c 2008-03-23
23:41:48.000000000 +0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c 2008-04-28
17:33:28.000000000 +0200
-@@ -30,7 +30,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/video.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/video.c
---- vlc-0.8.6f/modules/codec/ffmpeg/video.c 2008-03-23 23:41:48.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/video.c 2008-04-28 17:07:14.000000000
+0200
-@@ -33,7 +33,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c
fw_vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c
---- vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c 2008-03-23
23:41:48.000000000 +0100
-+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c 2008-04-28
17:33:59.000000000 +0200
-@@ -33,7 +33,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #include "ffmpeg.h"
-diff -aur vlc-0.8.6f/modules/stream_out/switcher.c
fw_vlc-0.8.6f/modules/stream_out/switcher.c
---- vlc-0.8.6f/modules/stream_out/switcher.c 2008-03-23 23:41:49.000000000
+0100
-+++ fw_vlc-0.8.6f/modules/stream_out/switcher.c 2008-04-28
18:28:31.000000000 +0200
-@@ -39,7 +39,7 @@
- #ifdef HAVE_FFMPEG_AVCODEC_H
- # include <ffmpeg/avcodec.h>
- #else
--# include <avcodec.h>
-+# include <libavcodec/avcodec.h>
- #endif
-
- #ifdef HAVE_POSTPROC_POSTPROCESS_H
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
