diff options
| author |   Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-08-30 09:28:09 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-08-30 09:28:09 +0000 |
| commit | ee87f7928343e81d8c84591cbcf147a08085b796 (patch) | |
| tree | 2dda3b084511f093e9c1b9e0a1e905837d49d144 /packages/ffmpeg | |
| parent | 90f208ced132a4e8fd84b5624b012e6b1a1500e1 (diff) | |
| download | openembedded-ee87f7928343e81d8c84591cbcf147a08085b796.tar.gz | |
ffmpeg: Revert DEPENDS on coreutils-native. Instead, remove -s (strip) argument to install.
Diffstat (limited to 'packages/ffmpeg')
| -rw-r--r-- | packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch | 47 | ||||
| -rw-r--r-- | packages/ffmpeg/ffmpeg.inc | 2 | ||||
| -rw-r--r-- | packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 5 |
3 files changed, 50 insertions, 4 deletions
diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch new file mode 100644 index 0000000000..6fbeb3eb88 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch @@ -0,0 +1,47 @@ +Index: ffmpeg-0.4.9-pre1/libavcodec/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2008-08-30 11:13:34.000000000 +0200 +@@ -267,10 +267,10 @@ + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +- install -s -m 755 $(SLIB) "$(prefix)" ++ install -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 ++ 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 +Index: ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavcodec/libpostproc/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile 2008-08-30 11:13:40.000000000 +0200 +@@ -50,7 +50,7 @@ + install: all + ifeq ($(SHARED_PP),yes) + install -d $(prefix)/lib +- install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) ++ install -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) + ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB) + ldconfig || true + mkdir -p $(prefix)/include/postproc +Index: ffmpeg-0.4.9-pre1/libavformat/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-08-30 11:13:46.000000000 +0200 +@@ -103,10 +103,10 @@ + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +- install -s -m 755 $(SLIB) "$(prefix)" ++ install -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 ++ 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 diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc index 6316b4e26e..aab2c62fa9 100644 --- a/packages/ffmpeg/ffmpeg.inc +++ b/packages/ffmpeg/ffmpeg.inc @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "coreutils-native zlib libogg libvorbis faac faad2 liba52 lame" +DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame" RSUGGESTS = "mplayer" inherit autotools pkgconfig diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index f2d5a928aa..5a2856aef5 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,13 +1,12 @@ require ffmpeg.inc -PR = "r5" +PR = "r6" 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://libavformat-makefile.patch;patch=1 \ - file://Makefile-lame.patch;patch=1 \ + file://install-must-not-strip.patch;patch=1 \ " EXTRA_OECONF += " \ |