[oe-commits] org.oe.dev mplayer_0.0+1.0rc1.bb, mplayer_svn.bb : remove the -s from the install

[xora commit]

mplayer_0.0+1.0rc1.bb, mplayer_svn.bb : remove the -s from the install
command in the Makefile. Should fix #1669

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: bb035df7efb73705f61ef917e0a6160eb1f2dfdb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bb035df7efb73705f61ef917e0a6160eb1f2dfdb
Files:
1
packages/mplayer/files/makefile-nostrip-svn.patch
packages/mplayer/files/makefile-nostrip.patch
packages/mplayer/files/Makefile-codec-cfg.patch
packages/mplayer/mplayer_0.0+1.0rc1.bb
packages/mplayer/mplayer_svn.bb
Diffs:

#
# mt diff -r76f1fdf6dff425bfdddcd67c4430bf4bc23ab36c -rbb035df7efb73705f61ef917e0a6160eb1f2dfdb
#
# 
# 
# add_file "packages/mplayer/files/makefile-nostrip-svn.patch"
#  content [cdbc3dbb3847756d01c2efd4b30976a7a2720a02]
# 
# add_file "packages/mplayer/files/makefile-nostrip.patch"
#  content [09772fb42f8764aec6775b7e594138e6ead242f9]
# 
# patch "packages/mplayer/files/Makefile-codec-cfg.patch"
#  from [e5b1a909a2d60bb2548266223c7c76b27869933a]
#    to [677cd160c3b51042dd6f4eaae5395c76ff4d1426]
# 
# patch "packages/mplayer/mplayer_0.0+1.0rc1.bb"
#  from [7c0eaf68f4315345a9330f17072b1020788178d6]
#    to [46579913cb2cfe550472d53d4cf2ed98a3845b52]
# 
# patch "packages/mplayer/mplayer_svn.bb"
#  from [b43c8842bdfe0a8e5ee3da6b34083882c3777f85]
#    to [4076bd613702c4d9fb50544e202dd09b091e51e3]
# 
============================================================
--- packages/mplayer/files/makefile-nostrip-svn.patch	cdbc3dbb3847756d01c2efd4b30976a7a2720a02
+++ packages/mplayer/files/makefile-nostrip-svn.patch	cdbc3dbb3847756d01c2efd4b30976a7a2720a02
@@ -0,0 +1,26 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -253,10 +253,10 @@ install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)
+ 	$(MAKE) -C libdha install
+ 	mkdir -p $(LIBDIR)/mplayer/vidix
+-	-install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
++	-install -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
+ endif
+ 	$(INSTALL) -d $(BINDIR)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
++	$(INSTALL) -m 755 mplayer$(EXESUF) \
+ 		$(BINDIR)/mplayer$(EXESUF)
+ ifeq ($(GUI),yes)
+ 	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
+@@ -271,7 +271,7 @@ endif
+ 		fi ; \
+ 	done
+ ifeq ($(MENCODER),yes)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \
++	$(INSTALL) -m 755 mencoder$(EXESUF) \
+ 		$(BINDIR)/mencoder$(EXESUF)
+ 	for i in $(MAN_LANG); do \
+ 		if test "$$i" = en ; then \
============================================================
--- packages/mplayer/files/makefile-nostrip.patch	09772fb42f8764aec6775b7e594138e6ead242f9
+++ packages/mplayer/files/makefile-nostrip.patch	09772fb42f8764aec6775b7e594138e6ead242f9
@@ -0,0 +1,13 @@
+Index: MPlayer-1.0rc1/Makefile
+===================================================================
+--- MPlayer-1.0rc1.orig/Makefile
++++ MPlayer-1.0rc1/Makefile
+@@ -416,7 +416,7 @@ ifeq ($(VIDIX),yes)
+ 	$(MAKE) -C vidix install
+ endif
+ 	$(INSTALL) -d $(BINDIR)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
++	$(INSTALL) -m 755 $(PRG) $(BINDIR)/$(PRG)
+ ifeq ($(GUI),yes)
+ 	-ln -sf $(PRG) $(BINDIR)/gmplayer
+ endif
============================================================
--- packages/mplayer/files/Makefile-codec-cfg.patch	e5b1a909a2d60bb2548266223c7c76b27869933a
+++ packages/mplayer/files/Makefile-codec-cfg.patch	677cd160c3b51042dd6f4eaae5395c76ff4d1426
@@ -1,11 +1,13 @@
---- trunk/Makefile.orig	2006-07-24 09:55:12.000000000 +0100
-+++ trunk/Makefile	2006-07-24 09:56:18.000000000 +0100
-@@ -410,7 +410,7 @@
- endif
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
+ 	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
  
- codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
 -	$(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
-+	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@
++	$(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
  
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ 	./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
- codecs.conf.h: codec-cfg etc/codecs.conf
- 	./codec-cfg ./etc/codecs.conf > $@
============================================================
--- packages/mplayer/mplayer_0.0+1.0rc1.bb	7c0eaf68f4315345a9330f17072b1020788178d6
+++ packages/mplayer/mplayer_0.0+1.0rc1.bb	46579913cb2cfe550472d53d4cf2ed98a3845b52
@@ -15,6 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPla
            file://w100-video_out.patch;patch=1 \
            file://w100-mplayer.patch;patch=1 \
            file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip.patch;patch=1 \
            ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \
            file://imageon-video_out.patch;patch=1"
 
============================================================
--- packages/mplayer/mplayer_svn.bb	b43c8842bdfe0a8e5ee3da6b34083882c3777f85
+++ packages/mplayer/mplayer_svn.bb	4076bd613702c4d9fb50544e202dd09b091e51e3
@@ -12,8 +12,9 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplaye
            file://Makefile-codec-cfg.patch;patch=1 \
            file://w100-configure-svn.patch;patch=1 \
            file://w100-video_out.patch;patch=1 \
-	       file://w100-mplayer.patch;patch= \
-           file://pld-onlyarm5.patch;patch=1"
+           file://w100-mplayer.patch;patch= \
+           file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip-svn.patch;patch=1"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"