gstreamer: adapt po-makefile-fix patch a bit

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4154 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 15 insertions, 7 deletions

diff --git a/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch b/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch
index 774c21c189..9efc09be6d 100644
--- a/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch
+++ b/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch
@@ -1,13 +1,21 @@
-Index: gstreamer-0.10.17/po/Makefile.in.in
-===================================================================
---- gstreamer-0.10.17.orig/po/Makefile.in.in    2008-01-25 23:21:31.000000000 +0800
-+++ gstreamer-0.10.17/po/Makefile.in.in 2008-03-20 19:10:54.000000000 +0800
-@@ -30,7 +30,7 @@
+---
+ po/Makefile.in.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- gstreamer-0.10.17.orig/po/Makefile.in.in
++++ gstreamer-0.10.17/po/Makefile.in.in
+@@ -27,12 +27,12 @@ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
 -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++MKINSTALLDIRS = $(top_builddir)/mkinstalldirs
 +mkinstalldirs = $(MKINSTALLDIRS)
  
  GMSGFMT = @GMSGFMT@
  MSGFMT = @MSGFMT@
+ XGETTEXT = @XGETTEXT@
+ MSGMERGE = msgmerge
diff --git a/meta/packages/gstreamer/gstreamer_0.10.17.bb b/meta/packages/gstreamer/gstreamer_0.10.17.bb
index 87a1ba8431..80becb1a40 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.17.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.17.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native"
-PR = "r5"
+PR = "r6"
 
 inherit autotools pkgconfig