Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK change 9187 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK change 9187 to grimoire.svk
  • Date: Sun, 11 Jun 2006 11:44:54 -0500

Group: defaults
Subject: r9187 - in stable-rc/0.4: . video/ffmpeg-cvs video/ffmpeg-svn
video/mlt video/mplayer video/tcvp

Author: arwed
Date: Sun Jun 11 11:44:52 2006
New Revision: 9187

Added:
stable-rc/0.4/video/ffmpeg-cvs/EXPORTS
stable-rc/0.4/video/ffmpeg-cvs/REPAIR^none^EXPORTS
stable-rc/0.4/video/ffmpeg-svn/
stable-rc/0.4/video/ffmpeg-svn/BUILD (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/CONFLICTS (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/DEPENDS (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/DETAILS (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/DOWNLOAD (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/HISTORY
stable-rc/0.4/video/ffmpeg-svn/INSTALL (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/PREPARE (contents, props changed)
stable-rc/0.4/video/ffmpeg-svn/PROVIDES (contents, props changed)
stable-rc/0.4/video/mplayer/DOWNLOAD (contents, props changed)
stable-rc/0.4/video/mplayer/mplayer_20060519.tar.bz2.sig (contents,
props changed)
Removed:
stable-rc/0.4/video/ffmpeg-cvs/PREPARE
stable-rc/0.4/video/ffmpeg-cvs/PROVIDES
stable-rc/0.4/video/ffmpeg-cvs/bswap-fix.patch
Modified:
stable-rc/0.4/ (props changed)
stable-rc/0.4/video/ffmpeg-cvs/BUILD
stable-rc/0.4/video/ffmpeg-cvs/DEPENDS
stable-rc/0.4/video/ffmpeg-cvs/DETAILS
stable-rc/0.4/video/ffmpeg-cvs/HISTORY
stable-rc/0.4/video/ffmpeg-cvs/INSTALL
stable-rc/0.4/video/ffmpeg-cvs/PRE_BUILD
stable-rc/0.4/video/mlt/DEPENDS
stable-rc/0.4/video/mlt/HISTORY
stable-rc/0.4/video/mplayer/BUILD
stable-rc/0.4/video/mplayer/CONFIGURE
stable-rc/0.4/video/mplayer/DEPENDS
stable-rc/0.4/video/mplayer/DETAILS
stable-rc/0.4/video/mplayer/HISTORY
stable-rc/0.4/video/mplayer/PREPARE
stable-rc/0.4/video/mplayer/PRE_BUILD
stable-rc/0.4/video/tcvp/DEPENDS
stable-rc/0.4/video/tcvp/HISTORY

Log:
r9230@Otherland: arwed | 1970-01-01 01:00:00 +0200
integrating ffmpeg-svn rename, mplayer svn change and related, bug 12010


Modified: stable-rc/0.4/video/ffmpeg-cvs/BUILD
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/BUILD (original)
+++ stable-rc/0.4/video/ffmpeg-cvs/BUILD Sun Jun 11 11:44:52 2006
@@ -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

Modified: stable-rc/0.4/video/ffmpeg-cvs/DEPENDS
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/DEPENDS (original)
+++ stable-rc/0.4/video/ffmpeg-cvs/DEPENDS Sun Jun 11 11:44:52 2006
@@ -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

Modified: stable-rc/0.4/video/ffmpeg-cvs/DETAILS
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/DETAILS (original)
+++ stable-rc/0.4/video/ffmpeg-cvs/DETAILS Sun Jun 11 11:44:52 2006
@@ -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 AT 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 AT 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

Added: stable-rc/0.4/video/ffmpeg-cvs/EXPORTS
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-cvs/EXPORTS Sun Jun 11 11:44:52 2006
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE

Modified: stable-rc/0.4/video/ffmpeg-cvs/HISTORY
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/HISTORY (original)
+++ stable-rc/0.4/video/ffmpeg-cvs/HISTORY Sun Jun 11 11:44:52 2006
@@ -1,3 +1,31 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz AT 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 AT 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 AT 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 AT mages.ath.cx:
+ * BUILD: replaced fPIC and DPIC removal code with disable_pic
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-20 Arwed v. Merkatz <v.merkatz AT 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 AT gmx.net>
* BUILD, INSTALL: removed old hacks for libpostproc build/install,
create /usr/include/postproc before installing

Modified: stable-rc/0.4/video/ffmpeg-cvs/INSTALL
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/INSTALL (original)
+++ stable-rc/0.4/video/ffmpeg-cvs/INSTALL Sun Jun 11 11:44:52 2006
@@ -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

Deleted: stable-rc/0.4/video/ffmpeg-cvs/PREPARE
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/PREPARE Sun Jun 11 11:44:52 2006
+++ (empty file)
@@ -1 +0,0 @@
-config_query FFMPEG_CVS_AUTOUPDATE "Update to the latest CVS on every cast?"
n

Modified: stable-rc/0.4/video/ffmpeg-cvs/PRE_BUILD
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/PRE_BUILD (original)
+++ stable-rc/0.4/video/ffmpeg-cvs/PRE_BUILD Sun Jun 11 11:44:52 2006
@@ -1,3 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/bswap-fix.patch
+true

Deleted: stable-rc/0.4/video/ffmpeg-cvs/PROVIDES
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/PROVIDES Sun Jun 11 11:44:52 2006
+++ (empty file)
@@ -1 +0,0 @@
-provides LIBAVCODEC

Added: stable-rc/0.4/video/ffmpeg-cvs/REPAIR^none^EXPORTS
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-cvs/REPAIR^none^EXPORTS Sun Jun 11 11:44:52
2006
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE

Deleted: stable-rc/0.4/video/ffmpeg-cvs/bswap-fix.patch
==============================================================================
--- stable-rc/0.4/video/ffmpeg-cvs/bswap-fix.patch Sun Jun 11 11:44:52
2006
+++ (empty file)
@@ -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"

Added: stable-rc/0.4/video/ffmpeg-svn/BUILD
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/BUILD Sun Jun 11 11:44:52 2006
@@ -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

Added: stable-rc/0.4/video/ffmpeg-svn/CONFLICTS
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/CONFLICTS Sun Jun 11 11:44:52 2006
@@ -0,0 +1,2 @@
+conflicts ffmpeg
+conflicts ffmpeg-cvs y

Added: stable-rc/0.4/video/ffmpeg-svn/DEPENDS
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/DEPENDS Sun Jun 11 11:44:52 2006
@@ -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"

Added: stable-rc/0.4/video/ffmpeg-svn/DETAILS
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/DETAILS Sun Jun 11 11:44:52 2006
@@ -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

Added: stable-rc/0.4/video/ffmpeg-svn/DOWNLOAD
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/DOWNLOAD Sun Jun 11 11:44:52 2006
@@ -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}"

Added: stable-rc/0.4/video/ffmpeg-svn/HISTORY
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/HISTORY Sun Jun 11 11:44:52 2006
@@ -0,0 +1,182 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz AT 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 AT 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 AT 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 AT mages.ath.cx:
+ * BUILD: replaced fPIC and DPIC removal code with disable_pic
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-20 Arwed v. Merkatz <v.merkatz AT 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 AT 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 AT gmx.net>
+ * PREPARE, DETAILS: added autoupdate query
+
+2006-01-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed --enable-shared-pp, not used anymore and breaks the
+ compile
+
+2005-12-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, bswap-fix.patch: fix the bswap.h header
+
+2005-09-06 Arwed v. Merkatz <v.merkatz AT 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 AT gmx.net>
+ * INSTALL: copy bswap.h from libavutil instead of libavcodec
+
+2005-05-12 Arwed v. Merkatz <v.merkatz AT 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 AT gmx.net>
+ * BUILD, DEPENDS, DETAILS: remove the gcc 3.4 stuff, compiles with 4.0
+ now
+
+2005-04-23 Arwed v. Merkatz <v.merkatz AT 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 AT 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 AT gmx.net>
+ * DEPENDS: add --enable-ogg to vorbis OPTS flags
+
+2005-03-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: replace pentium4 with pentium3 in CFLAGS, fixes bug #8362
+
+2004-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed the --enable-liba52, breaks dvd playback in mplayer
+
+2004-11-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, gcc-3.4.patch, ffmpeg.patch: removed patches
+
+2004-07-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on xvid
+
+2004-07-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on libdts
+
+2004-07-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, INSTALL: converted to build_api 2
+ * DETAILS: use $(date +%Y%m%d) as VERSION
+
+2004-07-07 Eric Sandall <eric AT sandall.us>
+ * BUILD: Remove "-DPIC -fPIC" from C{XX}FLAGS as ffmpeg fails
+ to compile with PIC
+
+2004-05-14 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Depends on any provider of CVS (Bug #6396)
+
+2004-05-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, gcc-3.4.patch: patch to compile with gcc 3.4
+
+2004-04-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --enable-gpl
+ * BUILD, faad2.patch: removed patch
+
+2004-02-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, linux-2.6.patch: removed patch
+
+2003-12-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, linux-2.6.patch: support building with 2.6 kernel headers
+
+2003-12-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, faad2.patch: support faad2 2.0
+
+2003-12-05 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: add cvs
+
+2003-12-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: use FORCE_DOWNLOAD=on
+
+2003-10-27 Arwed v. Merkatz <v.merkatz AT 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 AT gmx.net>
+ * BUILD: install libavcodec/rational.h, used by avcodec.h
+
+2003-10-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, ffmpeg.patch: patch avcodec.h, otherwise MPlayer(-cvs) can
not
+ use it
+
+2003-10-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed SOURCE_URL to
+ cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+ changed VERSION from 'head' to 'current' to force redownload
+
+2003-10-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: BUILD: install libavcodec/bswap.h and
libavformat/os_support.h
+
+2003-08-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on freetype2
+
+2003-08-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on imlib2
+
+2003-07-20 Arwed v. Merkatz <v.merkatz AT 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 AT gmx.net>
+ * BUILD: make the shared libpostproc work
+
+2003-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: use $INSTALL_ROOT in BUILD
+
+2003-05-12 Arwed v. Merkatz <v.merkatz AT 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 AT gmx.net>
+ * BUILD: enabled building of shared libavcodec
+ * DEPENDS: added lame and libvorbis as optional_depends
+
+2003-02-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.4.6
+
+2002-10-30 Seth Woolley <seth AT tautology.org>
+ * BUILD: fixed BUILD/CONFIGURE issue with MMX
+ deleted CONFIGURE bug 1525
+
+2002-10-23 Seth Woolley <seth AT tautology.org>
+ * BUILD: added -O3 hack
+ * HISTORY: cleaned history
+
+2002-06-12 Unet <unet AT sourcemage.org>
+ * Created this.
+

Added: stable-rc/0.4/video/ffmpeg-svn/INSTALL
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/INSTALL Sun Jun 11 11:44:52 2006
@@ -0,0 +1,5 @@
+make install &&
+
+if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
+then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
+fi

Added: stable-rc/0.4/video/ffmpeg-svn/PREPARE
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/PREPARE Sun Jun 11 11:44:52 2006
@@ -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}

Added: stable-rc/0.4/video/ffmpeg-svn/PROVIDES
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/ffmpeg-svn/PROVIDES Sun Jun 11 11:44:52 2006
@@ -0,0 +1 @@
+provides LIBAVCODEC

Modified: stable-rc/0.4/video/mlt/DEPENDS
==============================================================================
--- stable-rc/0.4/video/mlt/DEPENDS (original)
+++ stable-rc/0.4/video/mlt/DEPENDS Sun Jun 11 11:44:52 2006
@@ -1,6 +1,6 @@
depends CVS &&

-optional_depends ffmpeg-cvs \
+optional_depends ffmpeg-svn \
"--avformat-shared --avformat-ldextra" \
"--disable-avformat" \
"Enable avformat module" &&

Modified: stable-rc/0.4/video/mlt/HISTORY
==============================================================================
--- stable-rc/0.4/video/mlt/HISTORY (original)
+++ stable-rc/0.4/video/mlt/HISTORY Sun Jun 11 11:44:52 2006
@@ -1,3 +1,6 @@
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile


Modified: stable-rc/0.4/video/mplayer/BUILD
==============================================================================
--- stable-rc/0.4/video/mplayer/BUILD (original)
+++ stable-rc/0.4/video/mplayer/BUILD Sun Jun 11 11:44:52 2006
@@ -1,15 +1,14 @@
-invoke_gcc
# needed so it actually uses gcc 3.4
OPTS="$OPTS --cc=gcc" &&

-if [ "$MPLAYER_CVS" != "y" ]; then
+if [[ $MPLAYER_SVN = n ]]; then
OPTS="$OPTS --enable-libavcodec"
else
OPTS="$OPTS --with-extraincdir=/usr/include/ffmpeg"
fi &&

# remove --enable-old-gtk for 1.0pre7try2 as it doesn't know that option
-if [ "$MPLAYER_GUI" = "gtk+" -a "$MPLAYER_CVS" = "n" ]; then
+if [[ $MPLAYER_GUI = gtk+ && $MPLAYER_SVN = n ]]; then
OPTS="${OPTS/--enable-old-gtk/}"
fi &&
if [ "$MPLAYER_JOYSTICK" = "y" ]; then

Modified: stable-rc/0.4/video/mplayer/CONFIGURE
==============================================================================
Binary files. No diff available.

Modified: stable-rc/0.4/video/mplayer/DEPENDS
==============================================================================
Binary files. No diff available.

Modified: stable-rc/0.4/video/mplayer/DETAILS
==============================================================================
--- stable-rc/0.4/video/mplayer/DETAILS (original)
+++ stable-rc/0.4/video/mplayer/DETAILS Sun Jun 11 11:44:52 2006
@@ -1,15 +1,15 @@
SPELL=mplayer
-if [ "$MPLAYER_CVS" == "y" ]; then
- if [ "$MPLAYER_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
+ if [[ $MPLAYER_SVN_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=svn
fi
- SOURCE=$SPELL-cvs.tar.bz2
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/mplayer:main
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/mplayer/trunk/:$SPELL-svn
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
VERSION=1.0pre7try2
SOURCE=MPlayer-$VERSION.tar.bz2

Added: stable-rc/0.4/video/mplayer/DOWNLOAD
==============================================================================
--- (empty file)
+++ stable-rc/0.4/video/mplayer/DOWNLOAD Sun Jun 11 11:44:52 2006
@@ -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}"

Modified: stable-rc/0.4/video/mplayer/HISTORY
==============================================================================
--- stable-rc/0.4/video/mplayer/HISTORY (original)
+++ stable-rc/0.4/video/mplayer/HISTORY Sun Jun 11 11:44:52 2006
@@ -1,3 +1,23 @@
+2006-06-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: switched from snapshot to new svn checkout for the scm
+ version
+ * DOWNLOAD: added for svn download
+ * BUILD, CONFIGURE, DEPENDS, PREPARE, PRE_BUILD: changed variables
+ from MPLAYER_CVS* to MPLAYER_SVN*
+ * BUILD, PRE_BUILD: moved invoke_gcc call to PRE_BUILD
+ * DEPENDS: changed switches for ffmpeg-svn optional_depends, this is
+ required because the svn checkout includes a full copy of ffmpeg
+ svn
+
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT 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-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* cvs.Makefile.patch: updated


Modified: stable-rc/0.4/video/mplayer/PREPARE
==============================================================================
--- stable-rc/0.4/video/mplayer/PREPARE (original)
+++ stable-rc/0.4/video/mplayer/PREPARE Sun Jun 11 11:44:52 2006
@@ -1,9 +1,9 @@
-config_query MPLAYER_CVS "Build CVS version?" ${CVS:-n}
-# remove this and the above $CVS check from devel/test once this is in stable
-# 2005-09-29 Arwed v. Merkatz
-persistent_remove CVS
-if [ "$MPLAYER_CVS" == "y" ]; then
- config_query MPLAYER_CVS_AUTOUPDATE \
- "Update to the latest CVS on every cast?" \
- n
+# changed CVS -> SVN, remove from test when it's in stable
+# 2006-06-05 Arwed v. Merkatz
+config_query MPLAYER_SVN "Build SVN version?" ${MPLAYER_CVS:-n}
+if [[ $MPLAYER_SVN = y ]]; then
+ config_query MPLAYER_SVN_AUTOUPDATE \
+ "Update to the latest SVN on every system-update?" \
+ ${MPLAYER_CVS_AUTOUPDATE:-n}
fi
+persistent_remove MPLAYER_CVS MPLAYER_CVS_AUTOUPDATE

Modified: stable-rc/0.4/video/mplayer/PRE_BUILD
==============================================================================
--- stable-rc/0.4/video/mplayer/PRE_BUILD (original)
+++ stable-rc/0.4/video/mplayer/PRE_BUILD Sun Jun 11 11:44:52 2006
@@ -1,6 +1,7 @@
default_pre_build &&
+invoke_gcc &&
cd $SOURCE_DIRECTORY &&
-if [ "$MPLAYER_CVS" = "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
patch Makefile $SCRIPT_DIRECTORY/cvs.Makefile.patch &&
if [ "$MPLAYER_GUI" == "gtk+" ]; then
sedit "s|_gui=no|_gui=yes|" configure &&

Added: stable-rc/0.4/video/mplayer/mplayer_20060519.tar.bz2.sig
==============================================================================
Binary file. No diff available.

Modified: stable-rc/0.4/video/tcvp/DEPENDS
==============================================================================
--- stable-rc/0.4/video/tcvp/DEPENDS (original)
+++ stable-rc/0.4/video/tcvp/DEPENDS Sun Jun 11 11:44:52 2006
@@ -1,5 +1,5 @@
depends tc2-modules &&
-optional_depends "ffmpeg-cvs" \
+optional_depends "ffmpeg-svn" \
"--enable-avformat --enable-avcodec" \
"--disable-avformat --disable-avcodec" \
"for lots of video formats/codecs" &&

Modified: stable-rc/0.4/video/tcvp/HISTORY
==============================================================================
--- stable-rc/0.4/video/tcvp/HISTORY (original)
+++ stable-rc/0.4/video/tcvp/HISTORY Sun Jun 11 11:44:52 2006
@@ -1,3 +1,6 @@
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512




  • [SM-Commit] SVK change 9187 to grimoire.svk, Arwed von Merkatz, 06/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page