Clifford Wolf:

package/public/ffmpeg/compile.patch

@@ -1,32 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/public/ffmpeg/compile.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -ruN ffmpeg-0.4.9-pre1/Makefile ffmpeg-0.4.9-pre1-new/Makefile
---- ffmpeg-0.4.9-pre1/Makefile	2004-07-08 13:02:04.000000000 +0200
-+++ ffmpeg-0.4.9-pre1-new/Makefile	2004-07-26 12:55:08.261050798 +0200
-@@ -14,6 +14,9 @@
- LDFLAGS+=-p
- endif
- 
-+# ReneR: well the maintainer could also test his ... without imlib2 support
-+EXTRALIBS+=-L/usr/X11/lib -lX11
-+
- MANPAGE=doc/ffmpeg.1
- PROG=ffmpeg$(EXESUF)
- PROGTEST=output_example$(EXESUF)

package/public/ffmpeg/ffmpeg.conf

@@ -20,18 +20,21 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+# remove all entries in extraconfopt (they cause problems with ffmpeg)
+extraconfopt=""
+
 # fill options the configure does not attempt to detect ...
-pkginstalled lame && var_append extraconfopt " " "--enable-mp3lame"
+pkginstalled lame && var_append extraconfopt " " "--enable-libmp3lame"
 pkginstalled libogg && var_append extraconfopt " " "--enable-libogg"
-pkginstalled libvorbis && var_append extraconfopt " " "--enable-vorbis"
-pkginstalled libtheora && var_append extraconfopt " " "--enable-theora"
+pkginstalled libvorbis && var_append extraconfopt " " "--enable-libvorbis"
+pkginstalled libtheora && var_append extraconfopt " " "--enable-libtheora"
 pkginstalled faad2 && var_append extraconfopt " " "--enable-faad --enable-faadbin"
-pkginstalled faac && var_append extraconfopt " " "--enable-faac"
+pkginstalled faac && var_append extraconfopt " " "--enable-libfaac"
 pkginstalled gsm && var_append extraconfopt " " "--enable-libgsm"
 pkginstalled xvid && var_append extraconfopt " " "--enable-xvid"
 pkginstalled x264 && var_append extraconfopt " " "--enable-x264"
-pkginstalled libdca && var_append extraconfopt " " "--enable-dts"
-pkginstalled a52dec && var_append extraconfopt " " "--enable-a52"
+pkginstalled libdca && var_append extraconfopt " " "--enable-libdts"
+pkginstalled a52dec && var_append extraconfopt " " "--enable-liba52"
 
 var_append confopt " " "--enable-shared --enable-pp --enable-gpl --enable-pthreads"
 

package/public/ffmpeg/ffmpeg.desc

@@ -36,9 +36,8 @@
 
 [L] LGPL
 [S] Beta
-[V] 2006-03-07
+[V] 2007-03-15
 [P] X -?---5---9 161.800
 
-[D] X ffmpeg-2006-03-07.tar.bz2 cvs://pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg::ffmpeg/!2006-03-07/
-
+[D] X ffmpeg-2007-03-15.tar.bz2 svn://svn:svn.mplayerhq.hu/ffmpeg/trunk::8408