summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed v. Merkatz2006-06-17 15:56:26 +0200
committerArwed v. Merkatz2006-06-17 15:56:26 +0200
commite430236e7938f74d5c0369504e7f5dbbf33eaeab (patch)
tree13086c611af20dbb66ab6ae1df5eabdec6546321
parentc631fab6eb468ef3c05a3105e5acf844624c381c (diff)
ffmpeg-svn: sync from svk
-rw-r--r--video/ffmpeg-svn/BUILD13
-rw-r--r--video/ffmpeg-svn/CONFLICTS2
-rw-r--r--video/ffmpeg-svn/DEPENDS37
-rw-r--r--video/ffmpeg-svn/DETAILS23
-rw-r--r--video/ffmpeg-svn/DOWNLOAD43
-rw-r--r--video/ffmpeg-svn/HISTORY182
-rw-r--r--video/ffmpeg-svn/INSTALL5
-rw-r--r--video/ffmpeg-svn/PREPARE2
-rw-r--r--video/ffmpeg-svn/PROVIDES1
9 files changed, 308 insertions, 0 deletions
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
new file mode 100644
index 0000000000..abeb30b6ee
--- /dev/null
+++ b/video/ffmpeg-svn/BUILD
@@ -0,0 +1,13 @@
+CFLAGS="${CFLAGS/-funroll-loops/} -O3"
+disable_pic &&
+
+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 &&
+sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
+make
diff --git a/video/ffmpeg-svn/CONFLICTS b/video/ffmpeg-svn/CONFLICTS
new file mode 100644
index 0000000000..767f932d45
--- /dev/null
+++ b/video/ffmpeg-svn/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts ffmpeg
+conflicts ffmpeg-cvs y
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
new file mode 100644
index 0000000000..a54f50c5b8
--- /dev/null
+++ b/video/ffmpeg-svn/DEPENDS
@@ -0,0 +1,37 @@
+depends subversion &&
+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" &&
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player"
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
new file mode 100644
index 0000000000..e7c3a2475e
--- /dev/null
+++ b/video/ffmpeg-svn/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=ffmpeg-svn
+if test "$FFMPEG_SVN_AUTOUPDATE" = "y"; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
+ WEB_SITE=http://ffmpeg.sourceforge.net
+ ENTERED=20030514
+ UPDATED=20041205
+ SOURCE_IGNORE=volatile
+ LICENSE[0]=GPL
+ FORCE_DOWNLOAD=on
+ KEYWORDS="video"
+ SHORT="ffmpeg is complete video and audio broadcasting solution"
+cat << EOF
+FFMpeg is a complete and free Internet live audio and video
+broadcasting solution for Linux/Unix. It also includes a digital VCR.
+It can encode in real time in many formats including MPEG1 audio and
+video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
+EOF
diff --git a/video/ffmpeg-svn/DOWNLOAD b/video/ffmpeg-svn/DOWNLOAD
new file mode 100644
index 0000000000..b21c9822f6
--- /dev/null
+++ b/video/ffmpeg-svn/DOWNLOAD
@@ -0,0 +1,43 @@
+function url_r_svn_crack() {
+
+ URL=`url_strip_prefix "$1" svn`
+ R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
+ R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
+ local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
+ R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
+
+}
+
+url_r_svn_crack ${SOURCE_URL} &&
+message "${MESSAGE_COLOR}Starting SVN checkout of" \
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+ message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/${SOURCE} &&
+ cd $R_SVN_MODULE &&
+ message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}" &&
+ svn \
+ --non-interactive \
+ update \
+ -r${R_SVN_TAG} &&
+ cd .. &&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+ message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}" &&
+ svn \
+ --non-interactive \
+ checkout \
+ -r${R_SVN_TAG} \
+ svn://${R_SVN_ROOT} \
+ ${R_SVN_MODULE} &&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf \
+ ${SOURCE} \
+ ${R_SVN_MODULE} &&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} &&
+rm ${SOURCE} &&
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
new file mode 100644
index 0000000000..4ebffc8a97
--- /dev/null
+++ b/video/ffmpeg-svn/HISTORY
@@ -0,0 +1,182 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * renamed from ffmpeg-cvs
+ * DETAILS: renamed to ffmpeg-svn, changed SOURCE_URL to use new
+ svn server, removed the whole snapshot stuff again
+ * DEPENDS: depends on subversion instead of CVS now
+ * CONFLICTS: added conflicts ffmpeg-cvs y
+ * DOWNLOAD: added to handle svn:// url for stable sorcery
+ * PREPARE: persistent_read the old value of AUTOUPDATE from ffmpeg-cvs
+ and use that as default for our own
+
+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
+
+2006-02-11 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * PREPARE, DETAILS: added autoupdate query
+
+2006-01-17 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: removed --enable-shared-pp, not used anymore and breaks the
+ compile
+
+2005-12-20 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * PRE_BUILD, bswap-fix.patch: fix the bswap.h header
+
+2005-09-06 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: add --mandir switch to configure so man pages go to
+ /usr/share/man instead of /usr/man
+
+2005-08-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * INSTALL: copy bswap.h from libavutil instead of libavcodec
+
+2005-05-12 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: don't fiddle with CXXFLAGS, they're unused anyway,
+ don't remove -DPIC -fPIC on x86_64, fixes bug #8851
+
+2005-05-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, DEPENDS, DETAILS: remove the gcc 3.4 stuff, compiles with 4.0
+ now
+
+2005-04-23 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: call invoke_gcc at the beginning
+ * DETAILS: add GCC_VERSION=3.4
+ * DEPENDS: added dependency on gcc34, changed configure switch for
+ vorbis to '--enable-libogg --enable-vorbis'
+
+2005-04-07 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: don't replace pentium4 with pentium3, that's only needed for
+ the ffmpeg release, ffmpeg-cvs actually breaks due to it
+
+2005-03-15 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: add --enable-ogg to vorbis OPTS flags
+
+2005-03-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: replace pentium4 with pentium3 in CFLAGS, fixes bug #8362
+
+2004-12-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: removed the --enable-liba52, breaks dvd playback in mplayer
+
+2004-11-16 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, gcc-3.4.patch, ffmpeg.patch: removed patches
+
+2004-07-21 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: added optional_depends on xvid
+
+2004-07-14 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: added optional_depends on libdts
+
+2004-07-08 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, INSTALL: converted to build_api 2
+ * DETAILS: use $(date +%Y%m%d) as VERSION
+
+2004-07-07 Eric Sandall <eric@sandall.us>
+ * BUILD: Remove "-DPIC -fPIC" from C{XX}FLAGS as ffmpeg fails
+ to compile with PIC
+
+2004-05-14 Eric Sandall <eric@sandall.us>
+ * DEPENDS: Depends on any provider of CVS (Bug #6396)
+
+2004-05-08 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, gcc-3.4.patch: patch to compile with gcc 3.4
+
+2004-04-15 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: add --enable-gpl
+ * BUILD, faad2.patch: removed patch
+
+2004-02-11 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, linux-2.6.patch: removed patch
+
+2003-12-15 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, linux-2.6.patch: support building with 2.6 kernel headers
+
+2003-12-07 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, faad2.patch: support faad2 2.0
+
+2003-12-05 hgg <hgreig@bigpond.net.au>
+ * DETAILS: add cvs
+
+2003-12-04 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DETAILS: use FORCE_DOWNLOAD=on
+
+2003-10-27 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: rational.h is now installed automatically, but MPlayer-cvs also
+ needs dsputil.h, installing that
+
+2003-10-23 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: install libavcodec/rational.h, used by avcodec.h
+
+2003-10-17 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD, ffmpeg.patch: patch avcodec.h, otherwise MPlayer(-cvs) can not
+ use it
+
+2003-10-11 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DETAILS: changed SOURCE_URL to
+ cvs://:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+ changed VERSION from 'head' to 'current' to force redownload
+
+2003-10-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: BUILD: install libavcodec/bswap.h and libavformat/os_support.h
+
+2003-08-30 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: added optional_depends on freetype2
+
+2003-08-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: added optional_depends on imlib2
+
+2003-07-20 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: added sedit to BUILD to remove the crappy -Werror flag
+ * DEPENDS: added faad2 as optional_depends
+
+2003-06-29 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: make the shared libpostproc work
+
+2003-05-19 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: use $INSTALL_ROOT in BUILD
+
+2003-05-12 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DETAILS: first cvs version of the spell
+ * BUILD: added the libpostproc header installation to BUILD,
+ so mplayer-cvs compiles
+ * PROVIDES: added PROVIDES libavcodec
+
+2003-02-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: enabled building of shared libavcodec
+ * DEPENDS: added lame and libvorbis as optional_depends
+
+2003-02-03 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DETAILS: updated to 0.4.6
+
+2002-10-30 Seth Woolley <seth@tautology.org>
+ * BUILD: fixed BUILD/CONFIGURE issue with MMX
+ deleted CONFIGURE bug 1525
+
+2002-10-23 Seth Woolley <seth@tautology.org>
+ * BUILD: added -O3 hack
+ * HISTORY: cleaned history
+
+2002-06-12 Unet <unet@sourcemage.org>
+ * Created this.
+
diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
new file mode 100644
index 0000000000..1e537a5b13
--- /dev/null
+++ b/video/ffmpeg-svn/INSTALL
@@ -0,0 +1,5 @@
+make install &&
+
+if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
+then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
+fi
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
new file mode 100644
index 0000000000..6ae3af07a7
--- /dev/null
+++ b/video/ffmpeg-svn/PREPARE
@@ -0,0 +1,2 @@
+persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
+config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?" ${DEFAULT:-n}
diff --git a/video/ffmpeg-svn/PROVIDES b/video/ffmpeg-svn/PROVIDES
new file mode 100644
index 0000000000..d50bfee5b9
--- /dev/null
+++ b/video/ffmpeg-svn/PROVIDES
@@ -0,0 +1 @@
+provides LIBAVCODEC