diff options
Diffstat (limited to 'packages/ffmpeg/ffmpeg')
-rw-r--r-- | packages/ffmpeg/ffmpeg/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/ffmpeg/ffmpeg/common.patch | 13 | ||||
-rw-r--r-- | packages/ffmpeg/ffmpeg/configure.patch | 87 | ||||
-rw-r--r-- | packages/ffmpeg/ffmpeg/soname.patch | 65 |
4 files changed, 165 insertions, 0 deletions
diff --git a/packages/ffmpeg/ffmpeg/.mtn2git_empty b/packages/ffmpeg/ffmpeg/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ffmpeg/ffmpeg/.mtn2git_empty diff --git a/packages/ffmpeg/ffmpeg/common.patch b/packages/ffmpeg/ffmpeg/common.patch index e69de29bb2..233a454a48 100644 --- a/packages/ffmpeg/ffmpeg/common.patch +++ b/packages/ffmpeg/ffmpeg/common.patch @@ -0,0 +1,13 @@ +--- ffmpeg/libavcodec/common.h.orig 2005-02-10 15:10:34.000000000 +0100 ++++ ffmpeg/libavcodec/common.h 2005-02-10 15:11:28.000000000 +0100 +@@ -501,10 +501,6 @@ + #define srand srand_is_forbidden_due_to_state_trashing + #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf + #define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat +-#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H)) +-#define printf please_use_av_log +-#define fprintf please_use_av_log +-#endif + + #define CHECKED_ALLOCZ(p, size)\ + {\ diff --git a/packages/ffmpeg/ffmpeg/configure.patch b/packages/ffmpeg/ffmpeg/configure.patch index e69de29bb2..ae13b861b0 100644 --- a/packages/ffmpeg/ffmpeg/configure.patch +++ b/packages/ffmpeg/ffmpeg/configure.patch @@ -0,0 +1,87 @@ +--- ./configure~configure.patch 2004-07-06 03:36:16.000000000 +0930 ++++ ./configure 2004-09-27 00:07:23.000000000 +0930 +@@ -88,7 +88,7 @@ + mandir="" + bindir="" + cross_prefix="" +-cc="gcc" ++cc="$CC" + ar="ar" + ranlib="ranlib" + make="make" +@@ -104,7 +104,7 @@ + cpu="x86" + ;; + # armv4l is a subset of armv5tel +- armv4l|armv5tel) ++ armv4l|armv5tel|arm|xscale) + cpu="armv4l" + ;; + alpha) +@@ -434,6 +434,37 @@ + esac + done + ++case "$cpu" in ++ i386|i486|i586|i686|i86pc|BePC) ++ cpu="x86" ++ ;; ++ # armv4l is a subset of armv5tel ++ armv4l|armv5tel|arm|xscale) ++ cpu="armv4l" ++ ;; ++ alpha) ++ cpu="alpha" ++ ;; ++ "Power Macintosh"|ppc) ++ cpu="powerpc" ++ ;; ++ mips) ++ cpu="mips" ++ ;; ++ sun4u|sparc64) ++ cpu="sparc64" ++ ;; ++ sparc) ++ cpu="sparc" ++ ;; ++ sh4) ++ cpu="sh4" ++ ;; ++ *) ++ cpu="unknown" ++ ;; ++esac ++ + if test "$gpl" != "yes"; then + if test "$pp" != "no" -o "$shared_pp" != "no"; then + echo "The Postprocessing code is under GPL and --enable-gpl is not specified" +@@ -662,7 +693,6 @@ + bindir="$prefix" + fi + +-cc="${cross_prefix}${cc}" + ar="${cross_prefix}${ar}" + ranlib="${cross_prefix}${ranlib}" + strip="${cross_prefix}${strip}" +@@ -753,21 +783,6 @@ + fi + + if test "$zlib" = "yes"; then +-# check for zlib - mmu_man +-cat > $TMPC << EOF +-#include <zlib.h> +-int main ( void ) { +-if (zlibVersion() != ZLIB_VERSION) +- puts("zlib version differs !!!"); +- return 1; +-return 0; +-} +-EOF +-$cc $CFLAGS -o $TMPE $TMPC -lz 2> /dev/null || zlib="no" +-# $TMPE 2> /dev/null > /dev/null || zlib="no" +-# XXX: more tests needed - runtime test +-fi +-if test "$zlib" = "yes"; then + extralibs="$extralibs -lz" + fi diff --git a/packages/ffmpeg/ffmpeg/soname.patch b/packages/ffmpeg/ffmpeg/soname.patch index e69de29bb2..6d01f922af 100644 --- a/packages/ffmpeg/ffmpeg/soname.patch +++ b/packages/ffmpeg/ffmpeg/soname.patch @@ -0,0 +1,65 @@ +--- ffmpeg/libavcodec/Makefile.orig 2005-02-10 18:11:57.000000000 +0100 ++++ ffmpeg/libavcodec/Makefile 2005-02-10 18:15:36.000000000 +0100 +@@ -7,7 +7,7 @@ + VPATH=$(SRC_PATH)/libavcodec + + # NOTE: -I.. is needed to include config.h +-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ++CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC + + OBJS= bitstream.o utils.o mem.o allcodecs.o \ + mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ +@@ -222,7 +222,7 @@ + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) + -lib /machine:i386 /def:$(@:.dll=.def) + else +- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) ++ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavcodec.so.0 + endif + + dsputil.o: dsputil.c dsputil.h +@@ -294,8 +294,9 @@ + install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so +- ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so ++ install -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 ++ ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so.0 ++ ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so + ldconfig || true + endif + ifeq ($(CONFIG_PP),yes) + +--- ffmpeg/libavformat/Makefile.orig 2005-02-10 18:15:50.000000000 +0100 ++++ ffmpeg/libavformat/Makefile 2005-02-10 18:18:23.000000000 +0100 +@@ -6,7 +6,7 @@ + + VPATH=$(SRC_PATH)/libavformat + +-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ++CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC + + OBJS= utils.o cutils.o os_support.o allformats.o + PPOBJS= +@@ -104,7 +104,7 @@ + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll + -lib /machine:i386 /def:$(@:.dll=.def) + else +- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) ++ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) -Wl,-soname -Wl,libavformat.so.0 + endif + + depend: $(SRCS) +@@ -116,8 +116,9 @@ + install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so +- ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so ++ install -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 ++ ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so.0 ++ ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so + ldconfig || true + endif + else |