gstreamer 0.10 : Fixed QA staging issues

* New gst-common.inc file to keep commont gstreamer/gst-plugin-*
configuration
* Overload do_stage function specialized for gstreamer
* Bumped up individual package versions

diff --git a/packages/gstreamer/gst-common.inc b/packages/gstreamer/gst-common.inc
new file mode 100644 (file)
index 0000000..31629d7
--- /dev/null
+++ b/packages/gstreamer/gst-common.inc
@@ -0,0 +1,32 @@
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.gstreamer.net/"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools pkgconfig
+
+do_stage() {
+    rm -rf ${STAGE_TEMP}
+    mkdir -p ${STAGE_TEMP}
+    oe_runmake DESTDIR="${STAGE_TEMP}" install
+    if [ -d ${STAGE_TEMP}/${includedir} ]; then
+        cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+    fi
+    for i in $(find ${STAGE_TEMP}/${libdir} -name "*.la")
+    do
+
+        destdir=$(dirname $(echo $i | sed -e s,${STAGE_TEMP}/${libdir},${STAGING_LIBDIR},g))
+        oenote "Installing library $i to $destdir"
+        oe_libinstall -s -so $(basename $i .la) $destdir
+    done
+
+    if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+               install -d ${STAGING_DATADIR}/aclocal
+               cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+       fi
+       rm -rf ${STAGE_TEMP}
+}
+
+

diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
index d890673..51ce56d 100644 (file)
--- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -2,4 +2,4 @@ require gst-plugins.inc
 
 DEPENDS += "gst-plugins-base"
 SRC_URI += "file://cross-compile.patch;patch=1"
-PR = "r3"
+PR = "r4"

diff --git a/packages/gstreamer/gst-plugins-base_0.10.12.bb b/packages/gstreamer/gst-plugins-base_0.10.12.bb
index cb6b524..69a9a6e 100644 (file)
--- a/packages/gstreamer/gst-plugins-base_0.10.12.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.12.bb
@@ -1,9 +1,5 @@
 require gst-plugins.inc
 
 PROVIDES += "gst-plugins"
-PR = "r0"
-
-do_stage() {
-       autotools_stage_all
-}
+PR = "r1"
 

diff --git a/packages/gstreamer/gst-plugins-good_0.10.5.bb b/packages/gstreamer/gst-plugins-good_0.10.5.bb
index be5dad7..e009145 100644 (file)
--- a/packages/gstreamer/gst-plugins-good_0.10.5.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.5.bb
@@ -2,4 +2,4 @@ require gst-plugins.inc
 
 EXTRA_OECONF += "--with-check=no"
 DEPENDS += "gst-plugins-base"
-PR = "r2"
+PR = "r3"

diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
index d890673..51ce56d 100644 (file)
--- a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
@@ -2,4 +2,4 @@ require gst-plugins.inc
 
 DEPENDS += "gst-plugins-base"
 SRC_URI += "file://cross-compile.patch;patch=1"
-PR = "r3"
+PR = "r4"

diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index b600eaf..2acf199 100644 (file)
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -1,16 +1,9 @@
+require gst-common.inc
 DESCRIPTION = "Plugins for GStreamer"
-SECTION = "multimedia"
-PRIORITY = "optional"
 DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound"
 
 PACKAGES_DYNAMIC = "gst-plugin-*"
 
-# until we have decided for a final naming scheme,
-# keep using version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools pkgconfig 
-
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
 
 EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl"
@@ -27,8 +20,4 @@ python populate_packages_prepend () {
        do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
 }
 
-#do_stage() {
-#      autotools_stage_all
-#}
-
 ALLOW_EMPTY = "1"

diff --git a/packages/gstreamer/gstreamer.inc b/packages/gstreamer/gstreamer.inc
index 36c7dcf..a8bece9 100644 (file)
--- a/packages/gstreamer/gstreamer.inc
+++ b/packages/gstreamer/gstreamer.inc
@@ -1,29 +1,12 @@
+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."
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "libxml2 glib-2.0 gettext-native popt"
-
-# until we have decided a final naming scheme,
-# don't use 0.10.x package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
 
-inherit autotools pkgconfig
+DEPENDS = "libxml2 glib-2.0 gettext-native popt"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
 
-do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
-              bindir=${STAGING_BINDIR} \
-              includedir=${STAGING_INCDIR} \
-              libdir=${STAGING_LIBDIR} \
-              datadir=${STAGING_DATADIR} \
-              mandir=${STAGING_DIR}/share/man
-}
-
 FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"

diff --git a/packages/gstreamer/gstreamer_0.10.12.bb b/packages/gstreamer/gstreamer_0.10.12.bb
index 3405c06..49d7f37 100644 (file)
--- a/packages/gstreamer/gstreamer_0.10.12.bb
+++ b/packages/gstreamer/gstreamer_0.10.12.bb
@@ -1,24 +1,3 @@
-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."
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "libxml2 glib-2.0 gettext-native popt"
+require gstreamer.inc
 
-inherit autotools pkgconfig
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
-
-do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
-              bindir=${STAGING_BINDIR} \
-              includedir=${STAGING_INCDIR} \
-              libdir=${STAGING_LIBDIR} \
-              datadir=${STAGING_DATADIR} \
-              mandir=${STAGING_DIR}/share/man
-}
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+PR = "r1"
\ No newline at end of file