Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cf83d43e7a18c61a09ff6ea38a15b48367383298)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cf83d43e7a18c61a09ff6ea38a15b48367383298)
  • Date: Fri, 16 Nov 2007 19:23:55 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video/ffmpeg-svn/300_c++_compliant_headers.diff | 19 +++++++++++++++++++
video/ffmpeg-svn/HISTORY | 4 ++++
video/ffmpeg-svn/PRE_BUILD | 1 +
3 files changed, 24 insertions(+)

New commits:
commit 457fb8716c1a995d45e75f708f3238444ab7ebb9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg-svn: fixed a header file

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/HISTORY b/video/ffmpeg-svn/HISTORY
index c7e10a9..dec53b5 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+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
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
index 65ff957..2d99535 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -2,6 +2,7 @@ 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 &&



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cf83d43e7a18c61a09ff6ea38a15b48367383298), Florian Franzmann, 11/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page