Skip to Content.
Sympa Menu

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

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 (b64f5f7f1b1540619c569326514c95fe7cf6e097)
  • Date: Thu, 21 Feb 2008 13:36:53 -0600

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

video/ffmpeg-svn/300_c++_compliant_headers.diff | 18 ------------------
video/ffmpeg-svn/HISTORY | 4 ++++
video/ffmpeg-svn/PRE_BUILD | 2 +-
3 files changed, 5 insertions(+), 19 deletions(-)

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

ffmpeg-svn: updated patch

diff --git a/video/ffmpeg-svn/300_c++_compliant_headers.diff
b/video/ffmpeg-svn/300_c++_compliant_headers.diff
deleted file mode 100644
index f1548f0..0000000
--- a/video/ffmpeg-svn/300_c++_compliant_headers.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ffmpeg-svn/libavcodec/avcodec.h.orig 2008-02-18
17:25:06.000000000 +0000
-+++ ffmpeg-svn/libavcodec/avcodec.h 2008-02-18 17:27:07.000000000 +0000
-@@ -30,6 +30,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 LIBAVCODEC_VERSION_INT ((51<<16)+(50<<8)+1)
- #define LIBAVCODEC_VERSION 51.50.1
- #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
-
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index cee0a64..4b82a9e 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2008-02-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * 300_c++_compliant_headers.diff, PRE_BUILD: removed patch, replaced
+ by a rather ugly sedit that hopefully breaks less
+
2008-02-18 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* 300_c++_compliant_headers.diff: regenerated for todays svn.
May I note that I think maintaining a patch against an scm-based
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
index 1099b3a..7ebefb2 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -2,7 +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
+sedit '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined
__WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define
INT64_C(c) c ## LL\n#endif\n#endif' libavcodec/avcodec.h

#cd libavcodec &&
#case $FFAMR in



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (b64f5f7f1b1540619c569326514c95fe7cf6e097), Arwed von Merkatz, 02/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page