[oe-commits] org.oe.dev mplayer: adapt makefile-nostrip.patch to actually apply to rc2.

[Laibsch commit]

mplayer: adapt makefile-nostrip.patch to actually apply to rc2.
* while we are at it, add an upstream line to all makefile-nostrip patch files 
  (I think they are not applicable to upstream, please correct me if I am wrong)

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: a467947bec8b3ab1483ef2ab6096afeda3a2c51c
ViewMTN: http://monotone.openembedded.org/revision/info/a467947bec8b3ab1483ef2ab6096afeda3a2c51c
Files:
1
packages/mplayer/files/makefile-nostrip-rc2.patch
packages/mplayer/files/makefile-nostrip-svn.patch
packages/mplayer/files/makefile-nostrip.patch
packages/mplayer/mplayer_0.0+1.0rc2.bb
Diffs:

#
# mt diff -r0c04f069c3dfb822402f2213614bec611a154d85 -ra467947bec8b3ab1483ef2ab6096afeda3a2c51c
#
#
#
# add_file "packages/mplayer/files/makefile-nostrip-rc2.patch"
#  content [27480b822f23de6329bce73b82753052593d18cf]
# 
# patch "packages/mplayer/files/makefile-nostrip-svn.patch"
#  from [183a1b568605abf4a0dbf75a383fe15163e0c857]
#    to [0dce2aa18439336671c9afb4c39655462221bae0]
# 
# patch "packages/mplayer/files/makefile-nostrip.patch"
#  from [7e191a9ab89499e122b1422609ec9e39f383f8b2]
#    to [010432de270d283b91a09ac69d633aefb06f199f]
# 
# patch "packages/mplayer/mplayer_0.0+1.0rc2.bb"
#  from [3420c1879e19fda18e7e246be96e261fec49e7c4]
#    to [488ab5aff4b9a476b3b70f39558307075c11db18]
#
============================================================
--- packages/mplayer/files/makefile-nostrip-rc2.patch	27480b822f23de6329bce73b82753052593d18cf
+++ packages/mplayer/files/makefile-nostrip-rc2.patch	27480b822f23de6329bce73b82753052593d18cf
@@ -0,0 +1,24 @@
+upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping)
+
+Index: MPlayer-1.0rc2/Makefile
+===================================================================
+--- MPlayer-1.0rc2.orig/Makefile	2008-04-19 10:31:18.000000000 +0200
++++ MPlayer-1.0rc2/Makefile	2008-04-19 10:31:55.000000000 +0200
+@@ -253,7 +253,7 @@
+ 	if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+ 
+ install-mplayer: mplayer$(EXESUF)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
++	$(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR)
+ 
+ install-mplayer-man:
+ 	for i in $(MAN_LANG); do \
+@@ -266,7 +266,7 @@
+ 	done
+ 
+ install-mencoder: mencoder$(EXESUF)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
++	$(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR)
+ 	for i in $(MAN_LANG); do \
+ 		if test "$$i" = en ; then \
+ 			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
============================================================
--- packages/mplayer/files/makefile-nostrip-svn.patch	183a1b568605abf4a0dbf75a383fe15163e0c857
+++ packages/mplayer/files/makefile-nostrip-svn.patch	0dce2aa18439336671c9afb4c39655462221bae0
@@ -1,3 +1,5 @@
+upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping)
+
 --- /tmp/Makefile	2008-04-17 21:48:32.987984542 +0200
 +++ trunk/Makefile	2008-04-17 21:48:52.042750779 +0200
 @@ -337,7 +337,7 @@
============================================================
--- packages/mplayer/files/makefile-nostrip.patch	7e191a9ab89499e122b1422609ec9e39f383f8b2
+++ packages/mplayer/files/makefile-nostrip.patch	010432de270d283b91a09ac69d633aefb06f199f
@@ -1,3 +1,5 @@
+upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping)
+
 Index: MPlayer-1.0rc1/Makefile
 ===================================================================
 --- MPlayer-1.0rc1.orig/Makefile
============================================================
--- packages/mplayer/mplayer_0.0+1.0rc2.bb	3420c1879e19fda18e7e246be96e261fec49e7c4
+++ packages/mplayer/mplayer_0.0+1.0rc2.bb	488ab5aff4b9a476b3b70f39558307075c11db18
@@ -22,7 +22,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPla
            file://w100-video_out.patch;patch=1 \
            file://w100-mplayer.patch;patch= \
            file://pld-onlyarm5.patch;patch=1 \
-           file://makefile-nostrip-svn.patch;patch=1 \
+           file://makefile-nostrip-rc2.patch;patch=1 \
            file://mplayer-imageon-svn.patch;patch=1 \
            file://imageon-video_out.patch;patch=1 \
            file://pxa_configure.patch;patch=1 \