[Lunar-commits] <moonbase> ffmpeg, vlc: Minor fixes.

[Moritz Heiber]

commit f89a320f9103a0c9756f9e28d02d001881133a40
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Sun Apr 20 18:43:41 2008 +0200

    ffmpeg, vlc: Minor fixes.
    
    ffmpeg: Needed to enable postproc in order to get vlc to work
    vlc: Make sure it compiles with the latest ffmpeg.
---
 video/ffmpeg/BUILD     |    2 +-
 video/ffmpeg/CONFIGURE |    1 +
 video/vlc/BUILD        |    3 +++
 video/vlc/DETAILS      |    6 ++++++
 4 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index d47b9cf..e551d08 100644
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -1,7 +1,7 @@
 (
 
   OPTS+=" --enable-gpl --enable-nonfree --enable-shared --enable-pthreads \
-          --enable-swscale"
+          --enable-swscale --enable-postproc"
 
   ./configure --prefix=/usr $OPTS &&              
 
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
new file mode 100644
index 0000000..ea3b8b1
--- /dev/null
+++ b/video/ffmpeg/CONFIGURE
@@ -0,0 +1 @@
+mquery NONFREE "Compile non-free codecs?" y --enable-nonfree --disable-nonfree
diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index fbcb0b9..35ec8db 100644
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -1,5 +1,8 @@
 (
 
+  patch_it $SOURCE2 0 &&
+  patch_it $SOURCE3 0 &&
+
   OPTS="$OPTS --enable-release"
 
   default_build
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index fe9c71d..399973b 100644
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,8 +1,14 @@
           MODULE=vlc
          VERSION=0.8.6f
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=$MODULE-$VERSION-ffmpeg-headers.patch
+         SOURCE3=$MODULE-$VERSION-ffmpeg-includepaths.patch
       SOURCE_URL=http://www.videolan.org/pub/videolan/$MODULE/$VERSION
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE3_URL=$PATCH_URL/
       SOURCE_VFY=sha1:5a61d9da2deb984171f2ee9ba5dd74f8d7694089
+     SOURCE2_VFY=sha1:e6a96e5dd49dd57c6d5218d186297da05683fb87
+     SOURCE3_VFY=sha1:83aa8f8390b076d8bfdc94a7336f6e22c71f11ca
         WEB_SITE=http://www.videolan.org
          ENTERED=20011113
          UPDATED=20080402