Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2d71530411f92b1d53b1134713dab940d41a920d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (2d71530411f92b1d53b1134713dab940d41a920d)
  • Date: Sat, 3 Feb 2007 02:44:14 -0600

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

video/ffmpeg-svn/DETAILS | 16 ++++++++++++++--
video/ffmpeg-svn/HISTORY | 4 ++++
video/ffmpeg-svn/PREPARE | 2 +-
video/ffmpeg-svn/PRE_BUILD | 18 ++++++++++++------
4 files changed, 31 insertions(+), 9 deletions(-)

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

ffmpeg-svn - more amr support

diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index 881fadd..d4495c8 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -1,6 +1,7 @@
SPELL=ffmpeg-svn
if test "$FFMPEG_SVN_AUTOUPDATE" = "y"; then
VERSION=$(date +%Y%m%d)
+ FORCE_DOWNLOAD=on
else
VERSION=svn
fi
@@ -10,16 +11,27 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_IGNORE=volatile
case $FFAMR in
none);;
- amr_nb)
+ *)
+# 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
+# amr_nb-fixed)
+ VERSION3=26073-600
+ SOURCE3=$VERSION3.zip
+SOURCE3_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/$SOURCE3
+
SOURCE3_HASH=sha512:db9a7f5514d1a4a27062720f8ba5357f89cc6953c81b5b09defb37469e9a0b1195e9722d7b415152ad9642e1b1d7dddfd4e739bfc42b0c2fa6094d44faa50cde
+# amr_wb)
+ VERSION4=26204-600
+ SOURCE4=$VERSION4.zip
+SOURCE4_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/$SOURCE4
+
SOURCE4_HASH=sha512:fe7c4a6cc669345d2857df7a056dc62b28d076afb06f3184f26deb2ebc6da5222be38e532b0cb5493b33b387bda39348f532fd02f16387ccd8564ea0e3f2c948
+ ;;
esac
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
LICENSE[0]=GPL
- FORCE_DOWNLOAD=on
STAGED_INSTALL=off
KEYWORDS="video"
SHORT="ffmpeg is complete video and audio broadcasting solution"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index f4996fa..66798d3 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2007-02-03 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS, PREPARE, PRE_BUILD, BUILD:
+ add amr_nb-fixed, amr_wb support
+
2007-02-02 Treeve Jelbert <treeve AT pi.be>
* DETAILS, PREPARE, PRE_BUILD, BUILD:
add amr support
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index 72d5325..7a16e1a 100755
--- a/video/ffmpeg-svn/PREPARE
+++ b/video/ffmpeg-svn/PREPARE
@@ -1,3 +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
+config_query_list FFAMR "which AMR codec?" none amr_nb amr_nb-fixed amr_wb
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
index 570e3b4..133962c 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -1,17 +1,23 @@
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 &&
+cd libavcodec &&
case $FFAMR in
none);;
- amr_nb)
- cd libavcodec &&
+ *)
+message amr_nb=$VERSION2 &&
unpack_file 2 &&
unzip ${VERSION2}*.zip &&
- ln -s c-code amr_float
- ;;
+ mv c-code amr_float &&
+message amr_nb-fixed=$VERSION3 &&
+ unpack_file 3 &&
+ unzip ${VERSION3}*.zip &&
+ mv c-code amr &&
+message amr_wb=$VERSION4 &&
+ unpack_file 4 &&
+ unzip ${VERSION4}*.zip &&
+ mv c-code amrwb_float
esac
-#patch -p0 < $SPELL_DIRECTORY/xxx.diff



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2d71530411f92b1d53b1134713dab940d41a920d), Treeve Jelbert, 02/03/2007

Archive powered by MHonArc 2.6.24.

Top of Page