Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (778baed24c625dbe1ef683d01e6632392daf7ec4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (778baed24c625dbe1ef683d01e6632392daf7ec4)
  • Date: Fri, 19 Oct 2007 09:26:35 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

video/ffmpeg-svn/BUILD | 2 +-
video/ffmpeg-svn/DETAILS | 1 +
video/ffmpeg-svn/HISTORY | 5 +++++
video/ffmpeg-svn/PREPARE | 2 +-
video/ffmpeg-svn/PRE_BUILD | 12 ++++++------
5 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 778baed24c625dbe1ef683d01e6632392daf7ec4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

ffmpeg-svn: added swscale option

diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index 5f5ff83..e95970a 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -2,7 +2,7 @@ CFLAGS="${CFLAGS/-funroll-loops/} -O3"
disable_pic &&

if [ $FFAMR != none ];then
- OPTS="--enable-$FFAMR $OPTS"
+ OPTS="--enable-lib$FFAMR $FFMPEG_SWSCALE $OPTS"
fi &&

./configure --prefix=${INSTALL_ROOT}/usr \
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index e469bef..dd4bf0e 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -32,6 +32,7 @@ esac
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
LICENSE[0]=GPL
+ PATCHLEVEL=1
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 e4de220..5bd5c78 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,8 @@
+2007-09-02 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: added a question for libswscale
+ * BUILD: added swscale option to OPTS
+ * DETAILS: patchlevel++
+
2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: sync options with normal ffmpeg spell
forgot to recheck some stuff
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index 7a16e1a..f5c13e0 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 amr_nb-fixed amr_wb
+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 133962c..65ff957 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -8,15 +8,15 @@ cd libavcodec &&
case $FFAMR in
none);;
*)
-message amr_nb=$VERSION2 &&
+message amr-nb=$VERSION2 &&
unpack_file 2 &&
unzip ${VERSION2}*.zip &&
mv c-code amr_float &&
-message amr_nb-fixed=$VERSION3 &&
- unpack_file 3 &&
- unzip ${VERSION3}*.zip &&
- mv c-code amr &&
-message amr_wb=$VERSION4 &&
+#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




Archive powered by MHonArc 2.6.24.

Top of Page