Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (07cce274b7998e12604ff193e5b6ef69bfc4f884)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (07cce274b7998e12604ff193e5b6ef69bfc4f884)
  • Date: Mon, 19 Nov 2007 11:57:59 -0600

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video/ffmpeg-svn/BUILD | 6 +++---
video/ffmpeg-svn/DETAILS | 31 +++++++++++++------------------
video/ffmpeg-svn/HISTORY | 5 +++++
video/ffmpeg-svn/PREPARE | 5 ++++-
video/ffmpeg-svn/PRE_BUILD | 29 ++++++++++++++---------------
5 files changed, 39 insertions(+), 37 deletions(-)

New commits:
commit 07cce274b7998e12604ff193e5b6ef69bfc4f884
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: removed arm support as it's broken

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

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

./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index dd4bf0e..b8fcd6a 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -9,26 +9,21 @@ fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
SOURCE_IGNORE=volatile
-case $FFAMR in
- none);;
- *)
+#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
-# 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
+# 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_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
+# VERSION3=26204-600
+# SOURCE3=$VERSION4.zip
+#SOURCE3_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/$SOURCE4
+#
SOURCE3_HASH=sha512:fe7c4a6cc669345d2857df7a056dc62b28d076afb06f3184f26deb2ebc6da5222be38e532b0cb5493b33b387bda39348f532fd02f16387ccd8564ea0e3f2c948
+# ;;
+#esac
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
LICENSE[0]=GPL
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index dec53b5..c9591ee 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,8 @@
+2007-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE, DETAILS: removed amr-nb-fixed, not supported anymore
+ * BUILD, DETAILS, PREPARE, PRE_BUILD: commented out the whole amr
+ stuff as it requires the real libs now which we don't have
+
2007-11-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 300_c++_compliant_headers.diff: added small patch
from debian to make the headers C++ compliant.
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index f5c13e0..91728c5 100755
--- a/video/ffmpeg-svn/PREPARE
+++ b/video/ffmpeg-svn/PREPARE
@@ -1,3 +1,6 @@
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
+#if [[ $FFAMR == amr-nb-fixed ]]; then
+# FFAMR=amr-nb
+#fi &&
+#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 2d99535..1099b3a 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -2,23 +2,22 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
sedit 's:-Werror::' libavformat/Makefile &&
-patch -p1 < ${SCRIPT_DIRECTORY}/300_c++_compliant_headers.diff &&
+patch -p1 < ${SCRIPT_DIRECTORY}/300_c++_compliant_headers.diff

-message amr=$FFAMR &&
-cd libavcodec &&
-case $FFAMR in
- none);;
- *)
-message amr-nb=$VERSION2 &&
- unpack_file 2 &&
- unzip ${VERSION2}*.zip &&
- mv c-code amr_float &&
+#cd libavcodec &&
+#case $FFAMR in
+# none);;
+# *)
+#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 &&
- unpack_file 4 &&
- unzip ${VERSION4}*.zip &&
- mv c-code amrwb_float
-esac
+#message amr-wb=$VERSION4 &&
+# unpack_file 4 &&
+# unzip ${VERSION4}*.zip &&
+# mv c-code amrwb_float
+#esac




Archive powered by MHonArc 2.6.24.

Top of Page