merge of '88df3da823d2bce88856c558a8edb5e19f13c6dc'

     and 'b69e1fa3c948f1b457f68d8dafdae100280874ed'

diff --git a/packages/gstreamer/gstreamer.inc b/packages/gstreamer/gstreamer.inc
new file mode 100644 (file)
index 0000000..36c7dcf
--- /dev/null
+++ b/packages/gstreamer/gstreamer.inc
@@ -0,0 +1,29 @@
+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
+
+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.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb
index 1b930cf..fcb5ad7 100644 (file)
--- a/packages/gstreamer/gstreamer_0.10.4.bb
+++ b/packages/gstreamer/gstreamer_0.10.4.bb
@@ -1,27 +1 @@
-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 = "glib-2.0 gettext-native popt"
-
-PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-
-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"
+require gstreamer.inc

diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb
index 3273690..fcb5ad7 100644 (file)
--- a/packages/gstreamer/gstreamer_0.10.5.bb
+++ b/packages/gstreamer/gstreamer_0.10.5.bb
@@ -1,30 +1 @@
-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 = "glib-2.0 gettext-native popt"
-
-PR = "r0"
-# until we have decided a final naming scheme, 
-# don't use this package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-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"
+require gstreamer.inc

diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb
index d44630f..fcb5ad7 100644 (file)
--- a/packages/gstreamer/gstreamer_0.10.6.bb
+++ b/packages/gstreamer/gstreamer_0.10.6.bb
@@ -1,30 +1 @@
-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"
-
-PR = "r0"
-# until we have decided a final naming scheme, 
-# don't use this package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-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"
+require gstreamer.inc

diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb
index d44630f..fcb5ad7 100644 (file)
--- a/packages/gstreamer/gstreamer_0.10.8.bb
+++ b/packages/gstreamer/gstreamer_0.10.8.bb
@@ -1,30 +1 @@
-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"
-
-PR = "r0"
-# until we have decided a final naming scheme, 
-# don't use this package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-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"
+require gstreamer.inc