Skip to Content.
Sympa Menu

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

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 (997af49039707a7cd4ceb1f7aa21836de2affdab)
  • Date: Wed, 21 Nov 2007 18:17:10 -0600

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

video/dvbcut/DEPENDS | 2 +-
video/dvbcut/HISTORY | 5 +++++
video/ffmpeg/300_c++_compliant_headers.diff | 19 +++++++++++++++++++
video/ffmpeg/HISTORY | 5 +++++
video/ffmpeg/PRE_BUILD | 1 +
5 files changed, 31 insertions(+), 1 deletion(-)

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

video/dvbcut: depend on ffmpeg instead of ffmpeg-svn

commit 23cc60caeb4022d6df85e73d3b6448853e6eddc7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg: fixed header

diff --git a/video/dvbcut/DEPENDS b/video/dvbcut/DEPENDS
index fa600cb..a3b37c5 100755
--- a/video/dvbcut/DEPENDS
+++ b/video/dvbcut/DEPENDS
@@ -3,4 +3,4 @@ depends libao &&
depends scons &&
depends libmad &&
depends a52dec &&
-depends ffmpeg-svn
+depends ffmpeg
diff --git a/video/dvbcut/HISTORY b/video/dvbcut/HISTORY
index 724e518..c23d080 100644
--- a/video/dvbcut/HISTORY
+++ b/video/dvbcut/HISTORY
@@ -1,3 +1,8 @@
+2007-11-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: changed dependency to ffmpeg instead of ffmpeg-svn
+ since dvbcut is incompatible with the most recent version from
+ svn
+
2007-11-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated to 0.5.4
* DEPENDS, BUILD: added missing dependencies, use system ffmpeg
diff --git a/video/ffmpeg/300_c++_compliant_headers.diff
b/video/ffmpeg/300_c++_compliant_headers.diff
new file mode 100644
index 0000000..a209c4d
--- /dev/null
+++ b/video/ffmpeg/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/HISTORY b/video/ffmpeg/HISTORY
index 5981bc5..0938e33 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,5 +1,10 @@
+2007-11-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 300_c++_compliant_headers.diff, PRE_BUILD: added small patch
+ from Debian to make the headers C++ compliant
+
2007-11-06 Bearcat M. Sandor <sourcemage AT feline-soul.net>
* DEPENDS: Changed defunct libdts spell to libdca (it's drop-in
replacement)
+
2007-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: reverted the previous change since this seems to break
some compiles
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 133962c..9721c93 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/300_c++_compliant_headers.diff &&
sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
sedit 's:-Werror::' libavformat/Makefile &&




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

Archive powered by MHonArc 2.6.24.

Top of Page