gstreamer: properly fix gettext problems once and for all

* also remove doc hack

Signed-off-by: Koen Kooi <koen@openembedded.org>

diff --git a/recipes/gstreamer/gst-common.inc b/recipes/gstreamer/gst-common.inc
index 6384ca5..4ab689f 100644 (file)
--- a/recipes/gstreamer/gst-common.inc
+++ b/recipes/gstreamer/gst-common.inc
@@ -5,7 +5,12 @@ HOMEPAGE = "http://www.gstreamer.net/"
 
 DEFAULT_PREFERENCE = "-1"
 
-inherit autotools pkgconfig
+inherit autotools gettext pkgconfig
+
+# gstreamer uses AG_GST_GETTEXT which autotools.bbclass doesn't grep for
+do_configure_prepend() {
+       glib-gettextize --force --copy || true
+}
 
 OE_LT_RPATH_ALLOW = "any"
 OE_LT_RPATH_ALLOW[export]="1"

diff --git a/recipes/gstreamer/gstreamer.inc b/recipes/gstreamer/gstreamer.inc
index a821d46..4dfe2a0 100644 (file)
--- a/recipes/gstreamer/gstreamer.inc
+++ b/recipes/gstreamer/gstreamer.inc
@@ -3,10 +3,10 @@ require gst-common.inc
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
 
-DEPENDS = "libxml2 glib-2.0 gettext-native popt"
+DEPENDS += "libxml2 glib-2.0 popt"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2;name=archive"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --enable-introspection=no"
+EXTRA_OECONF += "--disable-docs-build --disable-dependency-tracking --with-check=no --enable-introspection=no"
 
 FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"

diff --git a/recipes/gstreamer/gstreamer_0.10.25.bb b/recipes/gstreamer/gstreamer_0.10.25.bb
index 08ec872..6ba8a6d 100644 (file)
--- a/recipes/gstreamer/gstreamer_0.10.25.bb
+++ b/recipes/gstreamer/gstreamer_0.10.25.bb
@@ -2,10 +2,5 @@ require gstreamer.inc
 
 EXTRA_OECONF += "ac_cv_func_register_printf_function=no"
 
-do_configure_prepend() {
-       sed -i -e s:docs::g Makefile.am
-}
-
-
 SRC_URI[archive.md5sum] = "88544e034a051baf472983791d233076"
 SRC_URI[archive.sha256sum] = "39b2ba7b3bfa8df6d998a9461e7091c27757e36a53e93969d7d9982a56526578"