[oe-commits] org.oe.dev ffmpeg: Revert DEPENDS on coreutils-native. Instead, remove -s (strip) argument to install.

[likewise commit]

ffmpeg: Revert DEPENDS on coreutils-native. Instead, remove -s (strip) argument to install.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 70b20e8a8b8f153dcef48800cdfbe132ba0dd76c
ViewMTN: http://monotone.openembedded.org/revision/info/70b20e8a8b8f153dcef48800cdfbe132ba0dd76c
Files:
1
packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch
packages/ffmpeg/ffmpeg.inc
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
packages/gnash/gnash-minimal.inc
packages/mplayer/mplayer_0.0+1.0rc2.bb
Diffs:

#
# mt diff -r966174d79928218545c2f2584afcdc59e1a67af7 -r70b20e8a8b8f153dcef48800cdfbe132ba0dd76c
#
#
#
# add_file "packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch"
#  content [6382abb03c681e1a8e9f89144e9e14aef8b71a1e]
# 
# patch "packages/ffmpeg/ffmpeg.inc"
#  from [c6e3badee49ab92a1ac83c026a501bacadd0f110]
#    to [84044f7d06812f97708d5aaf10e1e260f0a1dda0]
# 
# patch "packages/ffmpeg/ffmpeg_0.4.9-pre1.bb"
#  from [40b96d52de26942502cc371e72ef50a37e82c8e5]
#    to [f0c6e1447b2bd4aa79ceb94740a47a0a67e35635]
# 
# patch "packages/gnash/gnash-minimal.inc"
#  from [14a531d2eda49fe983be58f1c1b58cd2efe86307]
#    to [18f1cab966a482d9996417291c578d5d82ce2bcb]
# 
# patch "packages/mplayer/mplayer_0.0+1.0rc2.bb"
#  from [ef118ba0f4b65161c8a5cca272d3003f8aa3ce93]
#    to [45665b6f120f1cf1bd02eb43a71c0765b67b20f0]
#
============================================================
--- packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch	6382abb03c681e1a8e9f89144e9e14aef8b71a1e
+++ packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch	6382abb03c681e1a8e9f89144e9e14aef8b71a1e
@@ -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
============================================================
--- packages/ffmpeg/ffmpeg.inc	c6e3badee49ab92a1ac83c026a501bacadd0f110
+++ packages/ffmpeg/ffmpeg.inc	84044f7d06812f97708d5aaf10e1e260f0a1dda0
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 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
============================================================
--- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb	40b96d52de26942502cc371e72ef50a37e82c8e5
+++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb	f0c6e1447b2bd4aa79ceb94740a47a0a67e35635
@@ -1,13 +1,12 @@ require ffmpeg.inc
 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 += " \
============================================================
--- packages/gnash/gnash-minimal.inc	14a531d2eda49fe983be58f1c1b58cd2efe86307
+++ packages/gnash/gnash-minimal.inc	18f1cab966a482d9996417291c578d5d82ce2bcb
@@ -28,7 +28,7 @@ EXTRA_OECONF="--enable-gui=gtk \
                 --disable-glext \
                 --disable-Xft \
                 --disable-expat \
-                --disable-mad \
+                --enable-mad \
                 --disable-gstreamer \
                 --disable-cairo \
                 --disable-plugin \
============================================================
--- packages/mplayer/mplayer_0.0+1.0rc2.bb	ef118ba0f4b65161c8a5cca272d3003f8aa3ce93
+++ packages/mplayer/mplayer_0.0+1.0rc2.bb	45665b6f120f1cf1bd02eb43a71c0765b67b20f0
@@ -6,7 +6,7 @@ DEPENDS_append_hx4700 = " libw100 "
 DEPENDS_append_c7x0 = " libw100 "
 DEPENDS_append_hx4700 = " libw100 "
 
-DEFAULT_PREFERENCE_avr32 = "-1"
+DEFAULT_PREFERENCE_avr32 = "1"
 
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"