summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-04-19 08:43:03 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-04-19 08:43:03 +0000
commitc9578b97e8c81a984f460f88e578642b71935f3f (patch)
tree5ddf19ce72a7bfcfcace3512252baac5c8a52f01 /packages
parent99fcfac46d2eda974beda27b6c8367a657d50c45 (diff)
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)
Diffstat (limited to 'packages')
-rw-r--r--packages/mplayer/files/makefile-nostrip-rc2.patch24
-rw-r--r--packages/mplayer/files/makefile-nostrip-svn.patch2
-rw-r--r--packages/mplayer/files/makefile-nostrip.patch2
-rw-r--r--packages/mplayer/mplayer_0.0+1.0rc2.bb2
4 files changed, 29 insertions, 1 deletions
diff --git a/packages/mplayer/files/makefile-nostrip-rc2.patch b/packages/mplayer/files/makefile-nostrip-rc2.patch
new file mode 100644
index 0000000000..d7c147565f
--- /dev/null
+++ b/packages/mplayer/files/makefile-nostrip-rc2.patch
@@ -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 ; \
diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch
index 96346a470c..b1a60af312 100644
--- a/packages/mplayer/files/makefile-nostrip-svn.patch
+++ b/packages/mplayer/files/makefile-nostrip-svn.patch
@@ -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 @@
diff --git a/packages/mplayer/files/makefile-nostrip.patch b/packages/mplayer/files/makefile-nostrip.patch
index 22e5c5ad61..604433938b 100644
--- a/packages/mplayer/files/makefile-nostrip.patch
+++ b/packages/mplayer/files/makefile-nostrip.patch
@@ -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
diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index c6e5ae4f2f..7588b7e2cb 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 \
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 \