diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-08-30 09:44:16 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-08-30 09:44:16 +0000 |
| commit | 9c0e0b8bb7b55ed7e035320a4ed0cf8bf09bcad1 (patch) | |
| tree | 127cdfc7ff3035d32f7c4bffb8de3573b34d01d0 /packages/ffmpeg | |
| parent | ee87f7928343e81d8c84591cbcf147a08085b796 (diff) | |
ffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat. Needed for ppc/glibc.
Diffstat (limited to 'packages/ffmpeg')
| -rw-r--r-- | packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch | 13 | ||||
| -rw-r--r-- | packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 3 |
2 files changed, 15 insertions, 1 deletions
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 index 0000000000..d78ada9b36 --- /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 5a2856aef5..c415ffa8bf 100644 --- 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 \ " |