Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3878
Modified Files:
ffmpeg.info
Added Files:
ffmpeg.patch
Log Message:
gcc 4 ok, also not a c++ package!
Index: ffmpeg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/ffmpeg.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ffmpeg.info 23 Jan 2006 05:07:14 -0000 1.2
+++ ffmpeg.info 27 Mar 2006 08:30:04 -0000 1.3
@@ -1,9 +1,9 @@
Package: ffmpeg
Version: 0.4.9-pre1
-Revision: 1011
-Architecture: powerpc
+Revision: 1012
###
-BuildDepends: a52dec-dev, imlib2, lame-dev, libfaad1-dev, libmp4v21-dev,
libogg, libpostproc1, libvorbis0, sdl (>= 1.2.9-1001), gcc3.3
+# No C++ symbols used
+BuildDepends: a52dec-dev, imlib2, lame-dev, libfaad1-dev, libmp4v21-dev,
libogg, libpostproc1, libvorbis0, sdl (>= 1.2.9-1001)
Depends: a52dec, faad, lame, a52dec-shlibs, imlib2-shlibs, lame-shlibs,
libavcodec1-shlibs, libavformat1-shlibs, libogg-shlibs, libvorbis0-shlibs,
sdl-shlibs (>= 1.2.9-1001)
###
Source: mirror:sourceforge:%n/%n-%v.tar.gz
@@ -66,12 +66,11 @@
### Fix for 10.4
perl -pi -e 's,APPLE,NOTAPPLE,g' libavformat/tcp.c
<<
-###
-GCC: 3.3
+Patch: %n.patch
###
DocFiles: COPYING CREDITS Changelog INSTALL README doc/*.html doc/*.txt
###
-ConfigureParams: --cc=gcc-3.3 --extra-libs="-L%p/lib -la52"
--extra-cflags="-force_cpusubtype_ALL -Wno-sign-compare -maltivec -fno-common"
--enable-gpl --enable-mp3lame --enable-vorbis --enable-pp --enable-shared-pp
--powerpc-perf-enable --disable-faac --enable-faad --enable-faadbin
--enable-a52 --enable-a52bin --enable-shared --mandir=%p/share/man
--disable-mmx --disable-audio-beos --disable-v4l --disable-dv1394
+ConfigureParams: --extra-libs="-L%p/lib -la52" (%m = powerpc)
--extra-cflags="-force_cpusubtype_ALL -Wno-sign-compare -maltivec -fno-common"
(%m = i386) --extra-cflags="-force_cpusubtype_ALL -Wno-sign-compare -fno-common
-DPIC" --enable-gpl --enable-mp3lame --enable-vorbis --enable-pp
--enable-shared-pp (%m = powerpc) --powerpc-perf-enable --disable-faac
--enable-faad --enable-faadbin --enable-a52 --enable-a52bin --enable-shared
--mandir=%p/share/man --disable-mmx --disable-audio-beos --disable-v4l
--disable-dv1394
###
InstallScript: <<
make install prefix=%i mandir=%i/share/man
@@ -99,7 +98,7 @@
<<
SplitOff2: <<
Package: libavcodec1-dev
- Depends: libavcodec1-shlibs
+ Depends: libavcodec1-shlibs (= %v-%r)
Conflicts: ffmpeg (<< 0.4.6-1)
Replaces: ffmpeg (<< 0.4.6-1)
BuildDependsOnly: true
@@ -124,7 +123,7 @@
<<
SplitOff4: <<
Package: libavformat1-dev
- Depends: libavformat1-shlibs
+ Depends: libavformat1-shlibs (= %v-%r)
BuildDependsOnly: true
Files: <<
include/ffmpeg/avformat.h
@@ -184,12 +183,6 @@
<<
###
Description: Tool to convert video file formats
-DescPackaging: <<
- This version is compiled with g++-3.3, even in the 10.4 tree. If it is
- ever updated to a more recent compiler, the group of packages avidemux,
- faad, and ffmpeg (and any packages which depend on any of them) must all
- be updated at the same time.
-<<
DescDetail: <<
FFMpeg is a complete and free Internet live audio and video broadcasting
solution for Linux/Unix. It also includes a digital VCR. It can encode in
--- NEW FILE: ffmpeg.patch ---
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/ac3tab.h
ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/ac3tab.h 2004-06-26 06:08:49.000000000
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h 2006-03-23 22:39:30.000000000
-0500
@@ -4,10 +4,10 @@
*/
/* possible frequencies */
-static const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
+const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
/* possible bitrates */
-static const uint16_t ac3_bitratetab[19] = {
+const uint16_t ac3_bitratetab[19] = {
32, 40, 48, 56, 64, 80, 96, 112, 128,
160, 192, 224, 256, 320, 384, 448, 512, 576, 640
};
@@ -15,7 +15,7 @@
/* AC3 MDCT window */
/* MDCT window */
-static const int16_t ac3_window[256] = {
+const int16_t ac3_window[256] = {
4, 7, 12, 16, 21, 28, 34, 42,
51, 61, 72, 84, 97, 111, 127, 145,
164, 184, 207, 231, 257, 285, 315, 347,
@@ -144,27 +144,27 @@
15, 15, 15, 15,
};
-static const uint8_t sdecaytab[4]={
+const uint8_t sdecaytab[4]={
0x0f, 0x11, 0x13, 0x15,
};
-static const uint8_t fdecaytab[4]={
+const uint8_t fdecaytab[4]={
0x3f, 0x53, 0x67, 0x7b,
};
-static const uint16_t sgaintab[4]= {
+const uint16_t sgaintab[4]= {
0x540, 0x4d8, 0x478, 0x410,
};
-static const uint16_t dbkneetab[4]= {
+const uint16_t dbkneetab[4]= {
0x000, 0x700, 0x900, 0xb00,
};
-static const uint16_t floortab[8]= {
+const uint16_t floortab[8]= {
0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800,
};
-static const uint16_t fgaintab[8]= {
+const uint16_t fgaintab[8]= {
0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
};
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/avcodec.h
ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/avcodec.h 2004-07-09 08:49:55.000000000
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h 2006-03-23 22:35:39.000000000
-0500
@@ -1657,6 +1657,13 @@
#define FF_OPT_MAX_DEPTH 10
} AVOption;
+#ifdef HAVE_MMX
+extern const struct AVOption avoptions_common[3 + 5];
+#else
+extern const struct AVOption avoptions_common[3];
+#endif
+extern const struct AVOption avoptions_workaround_bug[11];
+
/**
* Parse option(s) and sets fields in passed structure
* @param strct structure where the parsed results will be written
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/common.h
ffmpeg-0.4.9-pre1/libavcodec/common.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/common.h 2004-07-01 08:33:07.000000000
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2006-03-23 22:35:21.000000000
-0500
@@ -63,12 +63,6 @@
#define AVOPTION_END() AVOPTION_SUB(NULL)
struct AVOption;
-#ifdef HAVE_MMX
-extern const struct AVOption avoptions_common[3 + 5];
-#else
-extern const struct AVOption avoptions_common[3];
-#endif
-extern const struct AVOption avoptions_workaround_bug[11];
#endif /* HAVE_AV_CONFIG_H */
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
