[oe-commits] org.oe.dev ffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat. Needed for ppc/glibc.

[likewise commit]

ffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat. Needed for ppc/glibc.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 10a60564b90fbf16c06a883e42049d7d705eba7d
ViewMTN: http://monotone.openembedded.org/revision/info/10a60564b90fbf16c06a883e42049d7d705eba7d
Files:
1
packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
Diffs:

#
# mt diff -r70b20e8a8b8f153dcef48800cdfbe132ba0dd76c -r10a60564b90fbf16c06a883e42049d7d705eba7d
#
#
#
# add_file "packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch"
#  content [fffc449916ce72fee1a6ec73c1953132065f2b41]
# 
# patch "packages/ffmpeg/ffmpeg_0.4.9-pre1.bb"
#  from [f0c6e1447b2bd4aa79ceb94740a47a0a67e35635]
#    to [a3b5820c8e65ed14f16b44cf4f173b63fbfde490]
#
============================================================
--- packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch	fffc449916ce72fee1a6ec73c1953132065f2b41
+++ packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch	fffc449916ce72fee1a6ec73c1953132065f2b41
@@ -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)
============================================================
--- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb	f0c6e1447b2bd4aa79ceb94740a47a0a67e35635
+++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb	a3b5820c8e65ed14f16b44cf4f173b63fbfde490
@@ -1,11 +1,12 @@ require ffmpeg.inc
 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 \
           "