ffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat...

diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch
new file mode 100644 (file)
index 0000000..d78ada9
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch
@@ -0,0 +1,13 @@
+Index: ffmpeg-0.4.9-pre1/libavformat/Makefile
+===================================================================
+--- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile        2008-08-30 11:35:09.000000000 +0200
++++ ffmpeg-0.4.9-pre1/libavformat/Makefile     2008-08-30 11:35:34.000000000 +0200
+@@ -94,7 +94,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) -Wl,-soname -Wl,libavformat.so.0
++      $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavformat.so.0
+ endif
+ 
+ depend: $(SRCS)

diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 5a2856a..c415ffa 100644 (file)
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -1,11 +1,12 @@
 require ffmpeg.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
            file://configure.patch;patch=0 \
            file://gcc4.patch;patch=1 \
            file://soname.patch;patch=1 \
+          file://Makefile-avformat-use-LDFLAGS.patch;patch=1 \
            file://install-must-not-strip.patch;patch=1 \
           "