ffmpeg-cvs: sync from svk

12 files changed, 50 insertions, 84 deletions

diff --git a/video/ffmpeg-cvs/BUILD b/video/ffmpeg-cvs/BUILD
index fc1d1ecf11..27ba77ddaf 100755
--- a/video/ffmpeg-cvs/BUILD
+++ b/video/ffmpeg-cvs/BUILD
@@ -1,14 +1 @@
-CFLAGS="${CFLAGS/-funroll-loops/} -O3"
-if [[ "$HOST" != x86_64-* ]]; then
-  CFLAGS="${CFLAGS/-DPIC -fPIC/}"
-fi
-
-sedit  's:-lpostproc:-Llibpostproc -lpostproc:'  libavcodec/Makefile  &&
-sedit  's:-Werror::'  libavformat/Makefile  &&
-./configure  --prefix=${INSTALL_ROOT}/usr            \
-             --mandir=${INSTALL_ROOT}/usr/share/man  \
-             --enable-shared                         \
-             --enable-pp                             \
-             --enable-gpl                            \
-             $OPTS                         &&
-make
+true
diff --git a/video/ffmpeg-cvs/DEPENDS b/video/ffmpeg-cvs/DEPENDS
index 99c7d4ca5b..c0d8d7b742 100755
--- a/video/ffmpeg-cvs/DEPENDS
+++ b/video/ffmpeg-cvs/DEPENDS
@@ -1,33 +1 @@
-depends  CVS      &&
-optional_depends  "nasm"             \
-                  ""                 \
-                  "--disable-mmx"    \
-                  "for MMX support"  &&
-optional_depends  "lame"              \
-                  "--enable-mp3lame"  \
-                  ""                  \
-                  "for mp3 encoding via libmp3lame"  &&
-optional_depends  "libvorbis"        \
-                  "--enable-libogg --enable-vorbis"  \
-                  ""                 \
-                  "for ogg/vorbis support"  &&
-optional_depends  "faad2"          \
-                  "--enable-faad"  \
-                  ""               \
-                  "for AAC audio support"  &&
-optional_depends  "imlib2"         \
-                  ""               \
-                  ""               \
-                  "for imlib2 support"  &&
-optional_depends  "freetype2"  \
-                  ""           \
-                  ""           \
-                  "for a text render plugin"  &&
-optional_depends  "libdts"        \
-                  "--enable-dts"  \
-                  ""              \
-                  "for DTS audio decoding"  &&
-optional_depends  "xvid"           \
-                  "--enable-xvid"  \
-                  ""               \
-                  "for xvid support"
+depends  ffmpeg-svn
diff --git a/video/ffmpeg-cvs/DETAILS b/video/ffmpeg-cvs/DETAILS
index d62c328334..5795f8c806 100755
--- a/video/ffmpeg-cvs/DETAILS
+++ b/video/ffmpeg-cvs/DETAILS
@@ -1,18 +1,26 @@
            SPELL=ffmpeg-cvs
 if test "$FFMPEG_CVS_AUTOUPDATE" = "y"; then
-         VERSION=$(date +%Y%m%d)
+#         VERSION=$(date +%Y%m%d)
+         VERSION=snapshot
 else
-         VERSION=cvs
+#         VERSION=cvs
+         VERSION=snapshot
 fi
-          SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-   SOURCE_URL[0]=cvs://:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+#          SOURCE=$SPELL.tar.bz2
+#          SOURCE=ffmpeg_20060519.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ffmpeg_20060519
+#   SOURCE_URL[0]=cvs://:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+#   SOURCE_URL[0]=http://www.mplayerhq.hu/~rtogni/snapshots/$SOURCE
         WEB_SITE=http://ffmpeg.sourceforge.net
          ENTERED=20030514
          UPDATED=20041205
-   SOURCE_IGNORE=volatile
+#      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+#   SOURCE_IGNORE=volatile
       LICENSE[0]=GPL
-  FORCE_DOWNLOAD=on
+#  FORCE_DOWNLOAD=on
+        KEYWORDS="video"
+      PATCHLEVEL=1
            SHORT="ffmpeg is complete video and audio broadcasting solution"
 cat << EOF
 FFMpeg is a complete and free Internet live audio and video
diff --git a/video/ffmpeg-cvs/EXPORTS b/video/ffmpeg-cvs/EXPORTS
new file mode 100644
index 0000000000..331ea6d6a0
--- /dev/null
+++ b/video/ffmpeg-cvs/EXPORTS
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE
diff --git a/video/ffmpeg-cvs/HISTORY b/video/ffmpeg-cvs/HISTORY
index 5247467b90..1cc6f114e0 100644
--- a/video/ffmpeg-cvs/HISTORY
+++ b/video/ffmpeg-cvs/HISTORY
@@ -1,3 +1,31 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* deprecated for ffmpeg-svn
+	* EXPORTS, REPAIR^none^EXPORTS: added so ffmpeg-svn can read our
+	  AUTOUPDATE variable and use that as its own default
+
+2006-05-24 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DETAILS: commented all cvs stuff, switch to a snapshot from
+	  http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+	  dead
+	* DEPENDS: commented dependency on CVS
+
+2006-05-19 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: added optional_depends on sdl
+	* BUILD: fix SDL_LIBS after running configure so it works with
+	  SDL 1.2.10
+
+2006-04-11 Andraž "ruskie" Levstik <ruskie@mages.ath.cx:
+	* BUILD: replaced fPIC and DPIC removal code with disable_pic
+
+2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2006-02-20 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* INSTALL: removed creation of /usr/include/postproc and copying
+	  of dsputil.h, both handled by the Makefiles now,
+	  removed installation of several headers that aren't necessary anymore
+	* bswap-fix.patch, PRE_BUILD: removed, bswap header isn't installed
+
 2006-02-17 Arwed v. Merkatz <v.merkatz@gmx.net>
 	* BUILD, INSTALL: removed old hacks for libpostproc build/install,
 	  create /usr/include/postproc before installing
diff --git a/video/ffmpeg-cvs/INSTALL b/video/ffmpeg-cvs/INSTALL
index 94e106110d..27ba77ddaf 100755
--- a/video/ffmpeg-cvs/INSTALL
+++ b/video/ffmpeg-cvs/INSTALL
@@ -1,15 +1 @@
-# make install fails to create that first (2006-02-17)
-install -d  /usr/include/postproc  &&
-make    install             &&
-install  -m  644 libavcodec/libpostproc/postprocess_internal.h  \
-                 ${INSTALL_ROOT}/usr/include/postproc           &&
-install  -m  644 libavutil/bswap.h                   \
-                 ${INSTALL_ROOT}/usr/include/ffmpeg  &&
-install  -m  644 libavcodec/dsputil.h                \
-                 ${INSTALL_ROOT}/usr/include/ffmpeg  &&
-install  -m  644 libavformat/os_support.h            \
-                 ${INSTALL_ROOT}/usr/include/ffmpeg  &&
-
-if    [  !  -f               ${INSTALL_ROOT}/etc/ffserver.conf  ]
-then  cp  doc/ffserver.conf  ${INSTALL_ROOT}/etc/ffserver.conf
-fi
+true
diff --git a/video/ffmpeg-cvs/PREPARE b/video/ffmpeg-cvs/PREPARE
deleted file mode 100755
index 11200ef858..0000000000
--- a/video/ffmpeg-cvs/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query FFMPEG_CVS_AUTOUPDATE "Update to the latest CVS on every cast?" n
diff --git a/video/ffmpeg-cvs/PRE_BUILD b/video/ffmpeg-cvs/PRE_BUILD
index c66fd3442b..27ba77ddaf 100755
--- a/video/ffmpeg-cvs/PRE_BUILD
+++ b/video/ffmpeg-cvs/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build      &&
-cd  $SOURCE_DIRECTORY  &&
-patch  -p0  <  $SCRIPT_DIRECTORY/bswap-fix.patch
+true
diff --git a/video/ffmpeg-cvs/PROVIDES b/video/ffmpeg-cvs/PROVIDES
deleted file mode 100755
index d50bfee5b9..0000000000
--- a/video/ffmpeg-cvs/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides  LIBAVCODEC
diff --git a/video/ffmpeg-cvs/REPAIR^none^EXPORTS b/video/ffmpeg-cvs/REPAIR^none^EXPORTS
new file mode 100644
index 0000000000..331ea6d6a0
--- /dev/null
+++ b/video/ffmpeg-cvs/REPAIR^none^EXPORTS
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE
diff --git a/video/ffmpeg-cvs/TRIGGERS b/video/ffmpeg-cvs/TRIGGERS
new file mode 100644
index 0000000000..d53b9bb287
--- /dev/null
+++ b/video/ffmpeg-cvs/TRIGGERS
@@ -0,0 +1 @@
+on_cast ffmpeg-cvs dispel_self
diff --git a/video/ffmpeg-cvs/bswap-fix.patch b/video/ffmpeg-cvs/bswap-fix.patch
deleted file mode 100644
index 4cc17ed6a8..0000000000
--- a/video/ffmpeg-cvs/bswap-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libavutil/bswap.h~	2005-12-20 21:10:50.000000000 +0100
-+++ libavutil/bswap.h	2005-12-21 00:26:57.000000000 +0100
-@@ -9,6 +9,7 @@
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
- #else
-+#include "common.h"
- 
- #ifdef ARCH_X86_64
- #  define LEGACY_REGS "=Q"