sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (843a6d8fdf0143d4fd0cc8690a1088e569eacce9)

From: Treeve Jelbert <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (843a6d8fdf0143d4fd0cc8690a1088e569eacce9)
Date: Fri, 2 Feb 2007 14:32:35 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

video/ffmpeg-svn/BUILD | 6 ++++--
video/ffmpeg-svn/DETAILS | 12 ++++++++++--
video/ffmpeg-svn/DOWNLOAD | 43 -------------------------------------------
video/ffmpeg-svn/HISTORY | 7 +++++++
video/ffmpeg-svn/INSTALL | 8 +++-----
video/ffmpeg-svn/PREPARE | 1 +
video/ffmpeg-svn/PRE_BUILD | 17 +++++++++++++++++
7 files changed, 42 insertions(+), 52 deletions(-)

New commits:
commit a65155220181ed26f2511187ae075e1e9195099f
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

ffmpeg-svn - add amr support

diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index 74315a8..5f5ff83 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -1,8 +1,10 @@
CFLAGS="${CFLAGS/-funroll-loops/} -O3"
disable_pic &&

-sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
-sedit 's:-Werror::' libavformat/Makefile &&
+if [ $FFAMR != none ];then
+ OPTS="--enable-$FFAMR $OPTS"
+fi &&
+
./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-shared \
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index e7c3a24..881fadd 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -7,12 +7,20 @@ fi
SOURCE=$SPELL.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
+ SOURCE_IGNORE=volatile
+case $FFAMR in
+ none);;
+ amr_nb)
+ VERSION2=26104-610
+ SOURCE2=$VERSION2.zip
+SOURCE2_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/$SOURCE2
+
SOURCE2_HASH=sha512:2ab3c1be43b17b655674b93a17b3ebcf3b95a6483bf9c2177dc00dd2a2f2802cb6685e679982cb0edefce90bb854c7842be324d5f1bd17cf0d349f9c737c2d68
+esac
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
- UPDATED=20041205
- SOURCE_IGNORE=volatile
LICENSE[0]=GPL
FORCE_DOWNLOAD=on
+ STAGED_INSTALL=off
KEYWORDS="video"
SHORT="ffmpeg is complete video and audio broadcasting solution"
cat << EOF
diff --git a/video/ffmpeg-svn/DOWNLOAD b/video/ffmpeg-svn/DOWNLOAD
deleted file mode 100755
index b21c982..0000000
--- a/video/ffmpeg-svn/DOWNLOAD
+++ /dev/null
@@ -1,43 +0,0 @@
-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
index d72d7f5..f4996fa 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,10 @@
+2007-02-02 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS, PREPARE, PRE_BUILD, BUILD:
+ add amr support
+ partially fixes bug #13138
+ STAGED_INSTALL=off
+ * INSTALL: use install_config_file
+
2007-01-08 Treeve Jelbert <treeve AT pi.be>
* BUILD: --enable-pthreads --disable-debug --disable-static

diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
index 1e537a5..d3f6c19 100755
--- a/video/ffmpeg-svn/INSTALL
+++ b/video/ffmpeg-svn/INSTALL
@@ -1,5 +1,3 @@
-make install &&
-
-if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
-then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
-fi
+make_single &&
+install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf &&
+make install
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index 6ae3af0..72d5325 100755
--- a/video/ffmpeg-svn/PREPARE
+++ b/video/ffmpeg-svn/PREPARE
@@ -1,2 +1,3 @@
persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
+config_query_list FFAMR "which AMR codec?" none amr_nb
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
new file mode 100755
index 0000000..570e3b4
--- /dev/null
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -0,0 +1,17 @@
+default_pre_build &&
+# mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
+sedit 's:-Werror::' libavformat/Makefile &&
+
+message amr=$FFAMR &&
+case $FFAMR in
+ none);;
+ amr_nb)
+ cd libavcodec &&
+ unpack_file 2 &&
+ unzip ${VERSION2}*.zip &&
+ ln -s c-code amr_float
+ ;;
+esac
+#patch -p0 < $SPELL_DIRECTORY/xxx.diff

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (843a6d8fdf0143d4fd0cc8690a1088e569eacce9), Treeve Jelbert, 02/02/2007