Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d2c88ebceaeb666ff0e5209f5fcc56c3c4b21fd
commit 7d2c88ebceaeb666ff0e5209f5fcc56c3c4b21fd Author: voroskoi <[EMAIL PROTECTED]> Date: Mon Apr 28 21:36:49 2008 +0200 vlc-0.8.6-16-x86_64 rebuilt with ffmpeg>=20080427 updated vlc-ffmpeg.diff diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index 530a663..e195d71 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -5,11 +5,11 @@ pkgname=vlc pkgver=0.8.6 pkgextraver=f -pkgrel=15 +pkgrel=16 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>=1.2beta3.2' 'libdca' \ + '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 @@ -22,7 +22,7 @@ source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgna $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff \ libdca.patch CVE-2008-1686.patch) sha1sums=('9684bb7504636d3e3143734698c2bbac250f4a03' \ - '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \ + 'd95c19c510fc56d92ccd38df864f27f782565126' \ '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \ 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ diff --git a/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff b/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff index 0705968..ef215e4 100644 --- a/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff +++ b/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff @@ -1,48 +1,141 @@ -diff -Naur vlc-0.8.4.orig/configure.ac vlc-0.8.4/configure.ac ---- vlc-0.8.4.orig/configure.ac 2005-11-26 17:39:58.000000000 +0100 -+++ vlc-0.8.4/configure.ac 2006-02-25 18:41:17.000000000 +0100 -@@ -2204,7 +2204,7 @@ - fi]) +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_CHECK_HEADERS(postproc/postprocess.h) -diff -Naur vlc-0.8.4.orig/modules/codec/ffmpeg/ffmpeg.c vlc-0.8.4/modules/codec/ffmpeg/ffmpeg.c ---- vlc-0.8.4.orig/modules/codec/ffmpeg/ffmpeg.c 2005-11-26 17:39:53.000000000 +0100 -+++ vlc-0.8.4/modules/codec/ffmpeg/ffmpeg.c 2006-02-25 18:22:18.000000000 +0100 -@@ -46,7 +46,7 @@ - # ifdef HAVE_POSTPROC_POSTPROCESS_H - # include <postproc/postprocess.h> - # else --# include <libpostproc/postprocess.h> -+# include <ffmpeg/postprocess.h> - # endif - #endif - -diff -Naur vlc-0.8.4.orig/modules/codec/ffmpeg/postprocess.c vlc-0.8.4/modules/codec/ffmpeg/postprocess.c ---- vlc-0.8.4.orig/modules/codec/ffmpeg/postprocess.c 2005-11-26 17:39:53.000000000 +0100 -+++ vlc-0.8.4/modules/codec/ffmpeg/postprocess.c 2006-02-25 18:22:18.000000000 +0100 -@@ -40,7 +40,7 @@ - #ifdef HAVE_POSTPROC_POSTPROCESS_H - # include <postproc/postprocess.h> +- 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 <libpostproc/postprocess.h> -+# include <ffmpeg/postprocess.h> +-# include <avcodec.h> ++# include <libavcodec/avcodec.h> #endif - #ifndef PP_CPU_CAPS_ALTIVEC -diff -Naur vlc-0.8.4.orig/modules/stream_out/switcher.c vlc-0.8.4/modules/stream_out/switcher.c ---- vlc-0.8.4.orig/modules/stream_out/switcher.c 2005-11-26 17:39:51.000000000 +0100 -+++ vlc-0.8.4/modules/stream_out/switcher.c 2006-02-25 18:22:42.000000000 +0100 -@@ -44,7 +44,7 @@ - #ifdef HAVE_POSTPROC_POSTPROCESS_H - # include <postproc/postprocess.h> + #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 <libpostproc/postprocess.h> -+# include <ffmpeg/postprocess.h> +-# include <avformat.h> ++# include <libavformat/avformat.h> #endif - #define SOUT_CFG_PREFIX "sout-switcher-" + #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
