Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.15 grimoire by Arwed von Merkatz (001c280ca13e8a497af42c56e53d4f99eacccfbb)

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 stable-0.15 grimoire by Arwed von Merkatz (001c280ca13e8a497af42c56e53d4f99eacccfbb)
  • Date: Sat, 24 Nov 2007 06:16:31 -0600

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

video/ffmpeg-svn/300_c++_compliant_headers.diff | 19 ++++++++++++++
video/ffmpeg-svn/BUILD | 8 +++---
video/ffmpeg-svn/DEPENDS | 2 -
video/ffmpeg-svn/DETAILS | 31
++++++++++--------------
video/ffmpeg-svn/HISTORY | 14 ++++++++++
video/ffmpeg-svn/PREPARE | 5 +++
video/ffmpeg-svn/PRE_BUILD | 28 ++++++++++-----------
7 files changed, 70 insertions(+), 37 deletions(-)

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

ffmpeg-svn: always pass swscale options

commit 9ffecc8f4d98a4f53f5478140d48b30c17aa4663
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

commit 32112ce3c54c8b5c4fd5252eb7f2d3b51523789c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

video/ffmpeg-svn: fixed a header file

commit 0867be2cc86dacf9305fec3b227d3ab65c8ba346
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: fixed libvorbis configure switch for latest version

diff --git a/video/ffmpeg-svn/300_c++_compliant_headers.diff
b/video/ffmpeg-svn/300_c++_compliant_headers.diff
new file mode 100644
index 0000000..a209c4d
--- /dev/null
+++ b/video/ffmpeg-svn/300_c++_compliant_headers.diff
@@ -0,0 +1,19 @@
+Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h 2007-03-29
22:22:06.000000000 +0200
++++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h 2007-03-29 22:23:03.000000000
+0200
+@@ -34,6 +34,14 @@
+ #include "avutil.h"
+ #include <sys/types.h> /* size_t */
+
++#if !defined INT64_C
++#if defined __WORDSIZE && __WORDSIZE == 64
++#define INT64_C(c) c ## L
++#else
++#define INT64_C(c) c ## LL
++#endif
++#endif
++
+ #define AV_STRINGIFY(s) AV_TOSTRING(s)
+ #define AV_TOSTRING(s) #s
+
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index e95970a..37facfd 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -1,9 +1,11 @@
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 &&
+
+OPTS="$FFMPEG_SWSCALE $OPTS" &&

./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index 5c66786..bc02b9e 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -8,7 +8,7 @@ optional_depends "lame" \
"" \
"for mp3 encoding via libmp3lame" &&
optional_depends "libvorbis" \
- "--enable-libogg --enable-libvorbis" \
+ "--enable-libvorbis" \
"" \
"for ogg/vorbis support" &&
optional_depends "faad2" \
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 5bd5c78..99cc8d1 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,17 @@
+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
+ * BUILD: always pass the swscale options, not only if amr is enabled
+
+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.
+
+2007-11-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed --enable-libogg switch from vorbis support,
+ it's not there anymore
+
2007-09-02 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: added a question for libswscale
* BUILD: added swscale option to OPTS
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 65ff957..1099b3a 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -2,22 +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

-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



  • [SM-Commit] GIT changes to stable-0.15 grimoire by Arwed von Merkatz (001c280ca13e8a497af42c56e53d4f99eacccfbb), Arwed von Merkatz, 11/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page