Skip to Content.
Sympa Menu

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

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 (51e668b794d8ec4a758fcc454a074b73d6c1681d)
  • Date: Mon, 5 Jan 2009 15:05:12 -0600

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

audio-players/cmus/HISTORY | 3
audio-players/cmus/PRE_BUILD | 5
video-libs/unicap/HISTORY | 3
video-libs/unicap/PRE_BUILD | 6
video/dvbcut/BUILD | 3
video/dvbcut/DEPENDS | 3
video/dvbcut/HISTORY | 7
video/dvbcut/PRE_BUILD | 3
video/dvbcut/dvbcut-0.5.3-ffmpeg-compat.patch | 38 ----
video/dvbcut/dvbcut-0.5.4-ffmpeg-compat2.patch | 129 ----------------
video/dvbcut/dvbcut-0.5.4-ffmpeg-compat3.patch | 199
-------------------------
video/ffmpeg/300_c++_compliant_headers.diff | 19 --
video/ffmpeg/BUILD | 11 -
video/ffmpeg/CONFIGURE | 3
video/ffmpeg/CONFLICTS | 1
video/ffmpeg/DEPENDS | 29 +--
video/ffmpeg/DETAILS | 38 ++--
video/ffmpeg/HISTORY | 12 +
video/ffmpeg/INSTALL | 4
video/ffmpeg/PREPARE | 2
video/ffmpeg/PRE_BUILD | 45 +++--
video/gpac/DEPENDS | 4
video/gpac/HISTORY | 6
23 files changed, 109 insertions(+), 464 deletions(-)

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

gpac: use internal ffmpeg instead of system one

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

dvbcut: removed system ffmpeg use

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

unicap: fixed for new ffmpeg header locations

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

cmus: fixed compile with new ffmpeg version

commit 788819ba0e9b8df6664fd585fa17b2bde0b094f6
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg: updated to 20090104 snapshot

diff --git a/audio-players/cmus/HISTORY b/audio-players/cmus/HISTORY
index f4fe2c1..f23b9bd 100644
--- a/audio-players/cmus/HISTORY
+++ b/audio-players/cmus/HISTORY
@@ -1,3 +1,6 @@
+2009-01-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: added to support new header locations of ffmpeg
+
2008-01-30 Justin Boffemmyer <flux AT sourcemage.org>
* DETAILS: 2.2.0, updated SOURCE_URL[0], SOURCE_HASH, and WEB_SITE
* CONFIGURE: Added to handle the OSS option
diff --git a/audio-players/cmus/PRE_BUILD b/audio-players/cmus/PRE_BUILD
new file mode 100755
index 0000000..b718deb
--- /dev/null
+++ b/audio-players/cmus/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit 's:ffmpeg/avcodec.h:libavcodec/avcodec.h:' ffmpeg.c &&
+sedit 's:ffmpeg/avformat.h:libavformat/avformat.h:' ffmpeg.c &&
+sedit 's:ffmpeg/avio.h:libavformat/avio.h:' ffmpeg.c
diff --git a/video-libs/unicap/HISTORY b/video-libs/unicap/HISTORY
index 834085c..33fe392 100644
--- a/video-libs/unicap/HISTORY
+++ b/video-libs/unicap/HISTORY
@@ -1,3 +1,6 @@
+2009-01-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: added to support new ffmpeg header locations
+
2008-10-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.3

diff --git a/video-libs/unicap/PRE_BUILD b/video-libs/unicap/PRE_BUILD
new file mode 100755
index 0000000..0076336
--- /dev/null
+++ b/video-libs/unicap/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit 's:avcodec.h:libavcodec/avcodec.h:' libucil/ucil_avc_avi.c &&
+sedit 's:avcodec.h:libavcodec/avcodec.h:' libucil/colorspace.c &&
+sedit 's:avutil.h:libavutil/avutil.h:' libucil/colorspace.c &&
+sedit 's:UCIL_FOURC(:UCIL_FOURCC(:' libucil/ucil_avc_avi.c
diff --git a/video/dvbcut/BUILD b/video/dvbcut/BUILD
index abc1fff..82e4110 100755
--- a/video/dvbcut/BUILD
+++ b/video/dvbcut/BUILD
@@ -1,3 +1,2 @@
make PREFIX=$INSTALL_ROOT/usr \
- MANPATH=$INSTALL_ROOT/usr/share/man \
- FFMPEG=$INSTALL_ROOT/usr
+ MANPATH=$INSTALL_ROOT/usr/share/man
diff --git a/video/dvbcut/DEPENDS b/video/dvbcut/DEPENDS
index a3b37c5..da4cddc 100755
--- a/video/dvbcut/DEPENDS
+++ b/video/dvbcut/DEPENDS
@@ -2,5 +2,4 @@ depends qt-x11 &&
depends libao &&
depends scons &&
depends libmad &&
-depends a52dec &&
-depends ffmpeg
+depends a52dec
diff --git a/video/dvbcut/HISTORY b/video/dvbcut/HISTORY
index c23d080..d51df27 100644
--- a/video/dvbcut/HISTORY
+++ b/video/dvbcut/HISTORY
@@ -1,3 +1,10 @@
+2009-01-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, DEPENDS, PRE_BUILD: removed usage of system ffmpeg as it's
+ incompatible
+ * dvbcut-0.5.3-ffmpeg-compat.patch,
+ dvbcut-0.5.4-ffmpeg-compat2.patch,
+ dvbcut-0.5.4-ffmpeg-compat3.patch: removed
+
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
diff --git a/video/dvbcut/PRE_BUILD b/video/dvbcut/PRE_BUILD
index 1e365fc..033a47d 100755
--- a/video/dvbcut/PRE_BUILD
+++ b/video/dvbcut/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < ${SCRIPT_DIRECTORY}/dvbcut-0.5.3-ffmpeg-compat.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/dvbcut-0.5.4-ffmpeg-compat2.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/dvbcut-0.5.4-ffmpeg-compat3.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/dvbcut-0.5.4-gcc42.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/dvbcut-SConstruct.diff
diff --git a/video/dvbcut/dvbcut-0.5.3-ffmpeg-compat.patch
b/video/dvbcut/dvbcut-0.5.3-ffmpeg-compat.patch
deleted file mode 100644
index fdb8a4e..0000000
--- a/video/dvbcut/dvbcut-0.5.3-ffmpeg-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: dvbcut-0.5.3/SConstruct
-===================================================================
---- dvbcut-0.5.3.orig/SConstruct
-+++ dvbcut-0.5.3/SConstruct
-@@ -101,6 +101,7 @@ if (ffmpegpath!='/usr'):
- env.Append(LIBPATH=os.path.join(str(ffmpegpath),'lib'))
- env.Append(LIBS=['avformat','avcodec','avutil'])
-
-+env.Append(CPPDEFINES="__STDC_CONSTANT_MACROS")
- ###### WORK
-
- env.bin_targets=[]
-Index: dvbcut-0.5.3/src/psfile.cpp
-===================================================================
---- dvbcut-0.5.3.orig/src/psfile.cpp
-+++ dvbcut-0.5.3/src/psfile.cpp
-@@ -100,7 +100,7 @@ psfile::psfile(const std::string &filena
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&ac3_decoder;
-+ S->dec=&liba52_decoder;
- S->type=streamtype::ac3audio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-Index: dvbcut-0.5.3/src/tsfile.cpp
-===================================================================
---- dvbcut-0.5.3.orig/src/tsfile.cpp
-+++ dvbcut-0.5.3/src/tsfile.cpp
-@@ -73,7 +73,7 @@ tsfile::tsfile(const std::string &filena
- stream *S=&s[audiostream(audiostreams++)];
- S->id=it->second;
- if (it->first==0xbd) {
-- S->dec=&ac3_decoder;
-+ S->dec=&liba52_decoder;
- S->enc=&ac3_encoder;
- S->type=streamtype::ac3audio;
- } else {
diff --git a/video/dvbcut/dvbcut-0.5.4-ffmpeg-compat2.patch
b/video/dvbcut/dvbcut-0.5.4-ffmpeg-compat2.patch
deleted file mode 100644
index b582286..0000000
--- a/video/dvbcut/dvbcut-0.5.4-ffmpeg-compat2.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: dvbcut-0.5.4/src/avframe.h
-===================================================================
---- dvbcut-0.5.4.orig/src/avframe.h
-+++ dvbcut-0.5.4/src/avframe.h
-@@ -19,7 +19,9 @@
- #ifndef _DVBCUT_AVFRAME_H
- #define _DVBCUT_AVFRAME_H
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- class QImage;
-
-Index: dvbcut-0.5.4/src/lavfmuxer.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/lavfmuxer.cpp
-+++ dvbcut-0.5.4/src/lavfmuxer.cpp
-@@ -16,7 +16,9 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include <string.h>
- #include <utility>
- #include <list>
-Index: dvbcut-0.5.4/src/lavfmuxer.h
-===================================================================
---- dvbcut-0.5.4.orig/src/lavfmuxer.h
-+++ dvbcut-0.5.4/src/lavfmuxer.h
-@@ -19,7 +19,9 @@
- #ifndef _DVBCUT_LAVFMUXER_H
- #define _DVBCUT_LAVFMUXER_H
-
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include "mpgfile.h"
- #include "muxer.h"
-
-Index: dvbcut-0.5.4/src/main.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/main.cpp
-+++ dvbcut-0.5.4/src/main.cpp
-@@ -27,7 +27,9 @@
- #endif // HAVE_LIB_AO
-
- #include <qapplication.h>
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include <qimage.h>
- #include <qsettings.h>
- #include "dvbcut.h"
-Index: dvbcut-0.5.4/src/mpgfile.h
-===================================================================
---- dvbcut-0.5.4.orig/src/mpgfile.h
-+++ dvbcut-0.5.4/src/mpgfile.h
-@@ -19,7 +19,10 @@
- #ifndef _DVBCUT_MPGFILE_H
- #define _DVBCUT_MPGFILE_H
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-+
- #include <string>
- #include <vector>
- #include <list>
-Index: dvbcut-0.5.4/src/playaudio.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/playaudio.cpp
-+++ dvbcut-0.5.4/src/playaudio.cpp
-@@ -19,7 +19,10 @@
- #ifdef HAVE_LIB_AO
- #include <stdio.h>
- #include <ao/ao.h>
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-+
- #include "playaudio.h"
-
- #define MIN_BUFFER_SAMPLES (1536*6)
-Index: dvbcut-0.5.4/src/psfile.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/psfile.cpp
-+++ dvbcut-0.5.4/src/psfile.cpp
-@@ -19,7 +19,10 @@
- #include "psfile.h"
- #include "streamhandle.h"
- #include "stream.h"
-+
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
- : mpgfile(filename, b, initial_offset)
-Index: dvbcut-0.5.4/src/streamdata.h
-===================================================================
---- dvbcut-0.5.4.orig/src/streamdata.h
-+++ dvbcut-0.5.4/src/streamdata.h
-@@ -21,7 +21,9 @@
-
- #include <string>
- #include <list>
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
-
- #include "port.h"
- #include "tsfile.h"
-Index: dvbcut-0.5.4/src/tsfile.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/tsfile.cpp
-+++ dvbcut-0.5.4/src/tsfile.cpp
-@@ -22,7 +22,9 @@
- #include <list>
- #include <utility>
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
- : mpgfile(filename, b, initial_offset)
diff --git a/video/dvbcut/dvbcut-0.5.4-ffmpeg-compat3.patch
b/video/dvbcut/dvbcut-0.5.4-ffmpeg-compat3.patch
deleted file mode 100644
index 53e762a..0000000
--- a/video/dvbcut/dvbcut-0.5.4-ffmpeg-compat3.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Index: dvbcut-svn/src/psfile.cpp
-===================================================================
---- dvbcut-svn.orig/src/psfile.cpp
-+++ dvbcut-svn/src/psfile.cpp
-@@ -90,7 +90,7 @@ psfile::psfile(const std::string &filena
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&mp2_decoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MP2);
- S->type=streamtype::mpegaudio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-@@ -100,7 +100,7 @@ psfile::psfile(const std::string &filena
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&liba52_decoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_AC3);
- S->type=streamtype::ac3audio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-@@ -114,8 +114,8 @@ psfile::psfile(const std::string &filena
- S->allocavcc();
- S->avcc->codec_type=CODEC_TYPE_VIDEO;
- S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
-- S->dec=&mpeg2video_decoder;
-- S->enc=&mpeg2video_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
- S->type=streamtype::mpeg2video;
- }
-
-Index: dvbcut-svn/src/tsfile.cpp
-===================================================================
---- dvbcut-svn.orig/src/tsfile.cpp
-+++ dvbcut-svn/src/tsfile.cpp
-@@ -78,12 +78,12 @@ tsfile::tsfile(const std::string &filena
- stream *S=&s[audiostream(audiostreams++)];
- S->id=it->second;
- if (it->first==0xbd) {
-- S->dec=&liba52_decoder;
-- S->enc=&ac3_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_AC3);
-+ S->enc=avcodec_find_encoder(CODEC_ID_AC3);
- S->type=streamtype::ac3audio;
- } else {
-- S->dec=&mp2_decoder;
-- S->enc=&mp2_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MP2);
-+ S->enc=avcodec_find_decoder(CODEC_ID_MP2);
- S->type=streamtype::mpegaudio;
- }
- if (audiostreams>=MAXAUDIOSTREAMS)
-@@ -98,8 +98,8 @@ tsfile::tsfile(const std::string &filena
- S->allocavcc();
- S->avcc->codec_type=CODEC_TYPE_VIDEO;
- S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
-- S->dec=&mpeg2video_decoder;
-- S->enc=&mpeg2video_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
- S->type=streamtype::mpeg2video;
- }
-
-Index: dvbcut-svn/src/avframe.cpp
-===================================================================
---- dvbcut-svn.orig/src/avframe.cpp
-+++ dvbcut-svn/src/avframe.cpp
-@@ -23,7 +23,11 @@
- #include <stdio.h>
- #include "avframe.h"
-
-+#ifdef HAVE_LIB_SWSCALE
-+avframe::avframe() :
tobefreed(0),w(0),h(0),dw(0),pix_fmt(),img_convert_ctx(0)
-+#else
- avframe::avframe() : tobefreed(0),w(0),h(0),dw(0),pix_fmt()
-+#endif
- {
- f=avcodec_alloc_frame();
- }
-@@ -54,7 +58,11 @@ avframe::avframe(AVFrame *src, AVCodecCo
- h=ctx->height;
- pix_fmt=ctx->pix_fmt;
- dw=w*ctx->sample_aspect_ratio.num/ctx->sample_aspect_ratio.den;
--
-+#ifdef HAVE_LIB_SWSCALE
-+ img_convert_ctx=sws_getContext(w, h, pix_fmt,
-+ w, h, PIX_FMT_BGR24, SWS_BICUBIC,
-+ NULL, NULL, NULL);
-+#endif
- }
-
- avframe::~avframe()
-@@ -63,11 +71,19 @@ avframe::~avframe()
- free(tobefreed);
- if (f)
- av_free(f);
-+#ifdef HAVE_LIB_SWSCALE
-+ if (img_convert_ctx)
-+ sws_freeContext(img_convert_ctx);
-+#endif
- }
-
- QImage avframe::getqimage(bool scaled, int viewscalefactor)
- {
-+#ifdef HAVE_LIB_SWSCALE
-+ if (w<=0 || h<=0 || img_convert_ctx==NULL)
-+#else
- if (w<=0 || h<=0)
-+#endif
- return QImage();
-
- uint8_t *rgbbuffer=(uint8_t*)malloc(avpicture_get_size(PIX_FMT_RGB24, w,
h)+64);
-@@ -79,11 +95,20 @@ QImage avframe::getqimage(bool scaled, i
- rgbbuffer+headerlen,
- PIX_FMT_RGB24,w,h);
-
-+#ifdef HAVE_LIB_SWSCALE
-+ sws_scale(img_convert_ctx, f->data, f->linesize, 0, h,
-+ avframergb->data, avframergb->linesize);
-+#else
- img_convert((AVPicture *)avframergb, PIX_FMT_RGB24, (AVPicture*)f,
pix_fmt, w, h);
-+#endif
-
- QImage im;
- im.loadFromData(rgbbuffer, headerlen+w*h*3, "PPM");
-
-+#ifdef HAVE_LIB_SWSCALE
-+ im = im.swapRGB();
-+#endif
-+
- if ((scaled && w!=dw)||(viewscalefactor!=1)) {
- #ifdef SMOOTHSCALE
- im = im.smoothScale((scaled?dw:w)/viewscalefactor, h/viewscalefactor);
-Index: dvbcut-svn/src/avframe.h
-===================================================================
---- dvbcut-svn.orig/src/avframe.h
-+++ dvbcut-svn/src/avframe.h
-@@ -23,6 +23,9 @@
-
- extern "C" {
- #include <ffmpeg/avcodec.h>
-+#ifdef HAVE_LIB_SWSCALE
-+#include <ffmpeg/swscale.h>
-+#endif
- }
-
- class QImage;
-@@ -37,6 +40,9 @@ protected:
- void *tobefreed;
- int w,h,dw;
- enum PixelFormat pix_fmt;
-+#ifdef HAVE_LIB_SWSCALE
-+ struct SwsContext *img_convert_ctx;
-+#endif
-
- public:
- avframe();
-Index: dvbcut-svn/SConstruct
-===================================================================
---- dvbcut-svn.orig/SConstruct
-+++ dvbcut-svn/SConstruct
-@@ -88,10 +88,6 @@ if (not env.GetOption('clean')):
- print "Checking for libao... found"
- else:
- print "Checking for libao... not found"
--
--### FINISH
--
--env=conf.Finish()
-
- ###### BUILD ENVIRONMENT (pt2)
-
-@@ -117,8 +113,23 @@ if (ffmpegpath!='/usr'):
- env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include'))
- env.Append(LIBPATH=os.path.join(str(ffmpegpath),'lib'))
- env.Append(LIBS=['avformat','avcodec','avutil'])
-+if (localffmpeg==False):
-+ env.Append(CPPDEFINES=["__STDC_CONSTANT_MACROS", "__STDC_LIMIT_MACROS"])
-+
-+
-+### LIBSWSCALE
-+if (not env.GetOption('clean') and not localffmpeg):
-+ if (conf.TryAction('pkg-config --exists libswscale')[0]):
-+ conf.env.Append(CPPDEFINES="HAVE_LIB_SWSCALE")
-+ conf.env.ParseConfig('pkg-config --cflags --libs libswscale')
-+ print "Checking for C library swscale... yes"
-+ elif (conf.CheckLibWithHeader('swscale', 'ffmpeg/swscale.h', 'C')):
-+ conf.env.Append(CPPDEFINES="HAVE_LIB_SWSCALE")
-+
-+### FINISH
-+
-+env=conf.Finish()
-
--env.Append(CPPDEFINES="__STDC_CONSTANT_MACROS")
- ###### WORK
-
- env.bin_targets=[]
diff --git a/video/ffmpeg/300_c++_compliant_headers.diff
b/video/ffmpeg/300_c++_compliant_headers.diff
deleted file mode 100644
index a209c4d..0000000
--- a/video/ffmpeg/300_c++_compliant_headers.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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/BUILD b/video/ffmpeg/BUILD
index e06d354..865ef4f 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -1,9 +1,10 @@
-CFLAGS="${CFLAGS/-funroll-loops/} -O3"
disable_pic &&

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

./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
@@ -11,7 +12,7 @@ fi &&
--enable-pthreads \
--disable-static \
--disable-debug \
- --enable-pp \
+ --enable-postproc \
--enable-gpl \
$OPTS &&
make
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
new file mode 100755
index 0000000..a6b5a4a
--- /dev/null
+++ b/video/ffmpeg/CONFIGURE
@@ -0,0 +1,3 @@
+default_configure &&
+config_query_option FFMPEG_SWSCALE 'enable software scaler support?' y \
+ '--enable-swscale' '--disable-swscale'
diff --git a/video/ffmpeg/CONFLICTS b/video/ffmpeg/CONFLICTS
index 4178d22..f44a624 100755
--- a/video/ffmpeg/CONFLICTS
+++ b/video/ffmpeg/CONFLICTS
@@ -1,2 +1 @@
-conflicts ffmpeg-cvs
conflicts ffmpeg-svn
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index cfcedac..13bfc81 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -1,13 +1,18 @@
-optional_depends "nasm" \
- "" \
- "--disable-mmx" \
- "for MMX support" &&
+optional_depends yasm "" "" "for some assembler optimizations" &&
+optional_depends dirac \
+ "--enable-libdirac" \
+ "" \
+ "for dirac encoder support via libdirac" &&
+optional_depends schroedinger \
+ "--enable-libschroedinger" \
+ "" \
+ "for dirac encoder/decoder support via libschroedinger" &&
optional_depends "lame" \
"--enable-libmp3lame" \
"" \
"for mp3 encoding via libmp3lame" &&
optional_depends "libvorbis" \
- "--enable-libogg --enable-libvorbis" \
+ "--enable-libvorbis" \
"" \
"for ogg/vorbis support" &&
optional_depends "faad2" \
@@ -22,22 +27,14 @@ optional_depends "freetype2" \
"" \
"" \
"for a text render plugin" &&
-optional_depends "libdts" \
- "--enable-libdts" \
- "" \
- "for DTS audio decoding" &&
optional_depends "xvid" \
- "--enable-xvid" \
+ "--enable-libxvid" \
"" \
"for xvid support" &&
optional_depends sdl \
"" \
"--disable-ffplay" \
"for ffplay video player" &&
-optional_depends a52dec \
- "--enable-liba52" \
- "" \
- "for a52dec support" &&
optional_depends faac \
"--enable-libfaac" \
"" \
@@ -47,7 +44,7 @@ optional_depends libtheora \
"" \
"theora codec" &&
optional_depends x264 \
- "--enable-x264" \
+ "--enable-libx264" \
"" \
- "h.264"
+ "h.264 encoder"

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 504f34b..2d9dd79 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,29 +1,29 @@
SPELL=ffmpeg
- VERSION=20070219
+ VERSION=20090104
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.sourcemage.org/distro/$SOURCE
-
SOURCE_HASH=sha512:8280b9b2f263912c9b68aea101929f59d3ad85edea76fda877c8e3d4f84b0768864d9f41e5a2cebf2efde5198ca69a4fd04db93927ce3fd4e3bb5100e5294ca2
-case $FFAMR in
- none);;
- *)
+
SOURCE_HASH=sha512:e6d4923026dfaf5e4a7b5194083588cd1f53cd48e34a87445c261d4e27bf5cabb862f86162df8a0dedd9c7559ee8c5f04cbeabfd6f1e312191cc1b8cd237d8a9
+#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
+# 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
+# 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
# 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
+# 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
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
PATCHLEVEL=1
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 3419f8f..3185ecc 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,13 @@
+2009-01-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 20090104 snapshot
+ * CONFIGURE: added for swscaler support
+ * CONFLICTS: removed old ffmpeg-cvs conflict
+ * DEPENDS: removed nasm, libdts, a52dec, added yasm, dirac and
+ schroedinger, changed some configure flags
+ * DETAILS, BUILD, PRE_BUILD, PREPARE: removed defunct amr options
+ * INSTALL: removed copying of header files, not needed anymore
+ * 300_c++_compliant_headers.diff: removed
+
2008-11-18 George Sherwood <gsherwood AT sourcemage.org>
* DEPENDS: optional_depends libdts vice libdca
Bug #14881
@@ -14,7 +24,7 @@

2007-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: reverted the previous change since this seems to break
- some compiles
+ some compiles
* DETAILS: added PATCHLEVEL

2007-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
diff --git a/video/ffmpeg/INSTALL b/video/ffmpeg/INSTALL
index ba4fac5..d3f6c19 100755
--- a/video/ffmpeg/INSTALL
+++ b/video/ffmpeg/INSTALL
@@ -1,5 +1,3 @@
make_single &&
install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf &&
-make install &&
-cp libavutil/bswap.h $INSTALL_ROOT/usr/include/ffmpeg &&
-cp libavformat/riff.h $INSTALL_ROOT/usr/include/ffmpeg
+make install
diff --git a/video/ffmpeg/PREPARE b/video/ffmpeg/PREPARE
index 872a96e..6867783 100755
--- a/video/ffmpeg/PREPARE
+++ b/video/ffmpeg/PREPARE
@@ -1 +1 @@
-config_query_list FFAMR "Include an AMR codec?" none amr_nb amr_nb-fixed
amr_wb
+#config_query_list FFAMR "Include an AMR codec?" none amr_nb amr_nb-fixed
amr_wb
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 9721c93..0de9ae5 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -1,24 +1,27 @@
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 &&
+#fix bad pkg-config files
+sed -i \
+-e '/^pkg.*{/,/^}/
s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
+ configure &&
+#s|\\\$|\$|;
+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

-message amr=$FFAMR &&
-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=$FFAMR &&
+#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
diff --git a/video/gpac/DEPENDS b/video/gpac/DEPENDS
index a761a21..286e772 100755
--- a/video/gpac/DEPENDS
+++ b/video/gpac/DEPENDS
@@ -39,10 +39,6 @@ optional_depends "xvid" \
"" \
"--use-xvid=no" \
"enable xvid?" &&
-optional_depends "ffmpeg" \
- "" \
- "--use-ffmpeg=no" \
- "enable ffmpeg?" &&
optional_depends "openjpeg" \
"" \
"--use-openjpeg=no" \
diff --git a/video/gpac/HISTORY b/video/gpac/HISTORY
index a83c824..dc47181 100644
--- a/video/gpac/HISTORY
+++ b/video/gpac/HISTORY
@@ -1,3 +1,7 @@
+2009-01-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed ffmpeg as gpac includes its own and doesn't work
+ with the current snapshot version
+
2007-08-21 Mathieu Lonjaret <lejatorn AT sourcemage.org>
- * DETAILS, DEPENDS, HISTORY, PRE_BUILD: spell created
+ * DETAILS, DEPENDS, HISTORY, PRE_BUILD: spell created




  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (51e668b794d8ec4a758fcc454a074b73d6c1681d), Arwed von Merkatz, 01/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page