[oe-commits] org.oe.dev gstreamer 0.10 : Fixed QA staging issues
sirfred commit
openembedded-commits at lists.openembedded.org
Tue Jun 19 22:07:00 UTC 2007
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
Author: sirfred at openembedded.org
Branch: org.openembedded.dev
Revision: 80cb1accdd731a62c0845946a28fde1f35e82d1f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=80cb1accdd731a62c0845946a28fde1f35e82d1f
Files:
1
packages/gstreamer/gst-common.inc
packages/gstreamer/gst-plugins-bad_0.10.3.bb
packages/gstreamer/gst-plugins-base_0.10.12.bb
packages/gstreamer/gst-plugins-good_0.10.5.bb
packages/gstreamer/gst-plugins-ugly_0.10.5.bb
packages/gstreamer/gst-plugins.inc
packages/gstreamer/gstreamer.inc
packages/gstreamer/gstreamer_0.10.12.bb
Diffs:
#
# mt diff -r4dacfb422616694a48ebbb021311bfd93e35b589 -r80cb1accdd731a62c0845946a28fde1f35e82d1f
#
#
#
# add_file "packages/gstreamer/gst-common.inc"
# content [27ceb74f764523f7d0708087bd16ae8a3627c39e]
#
# patch "packages/gstreamer/gst-plugins-bad_0.10.3.bb"
# from [b18b94ffb6342d3a1cb9b1f8a6fbc861d1c1f4b4]
# to [091c86318da723ac2f5b9708ab9e4cfc39377038]
#
# patch "packages/gstreamer/gst-plugins-base_0.10.12.bb"
# from [a66fe4adbd8a25199d7f633f3cf084b83c5c0fc6]
# to [869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38]
#
# patch "packages/gstreamer/gst-plugins-good_0.10.5.bb"
# from [02d5a50a6207c7b1a0aa0be5279a1656d775f186]
# to [8e022b10f99f96c8cba7fe44d7252de0edc90cd9]
#
# patch "packages/gstreamer/gst-plugins-ugly_0.10.5.bb"
# from [b18b94ffb6342d3a1cb9b1f8a6fbc861d1c1f4b4]
# to [091c86318da723ac2f5b9708ab9e4cfc39377038]
#
# patch "packages/gstreamer/gst-plugins.inc"
# from [80f02b4157a4aaf0930a7003dfae8ab3e94ac833]
# to [6293327f294676ab88b8ec6b36906d0113b3566a]
#
# patch "packages/gstreamer/gstreamer.inc"
# from [fe5252bcb6bc7240f9051c345b27ee2a414cbdc7]
# to [4373e3c63e98e5e7231ff03f8d1ae556374e045f]
#
# patch "packages/gstreamer/gstreamer_0.10.12.bb"
# from [fbdf478d1fff2794c9698e59f238ead68822c687]
# to [7de1cce853de7552030f28b0d35bd51161bdffaa]
#
============================================================
--- packages/gstreamer/gst-common.inc 27ceb74f764523f7d0708087bd16ae8a3627c39e
+++ packages/gstreamer/gst-common.inc 27ceb74f764523f7d0708087bd16ae8a3627c39e
@@ -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}
+}
+
+
============================================================
--- packages/gstreamer/gst-plugins-bad_0.10.3.bb b18b94ffb6342d3a1cb9b1f8a6fbc861d1c1f4b4
+++ packages/gstreamer/gst-plugins-bad_0.10.3.bb 091c86318da723ac2f5b9708ab9e4cfc39377038
@@ -1,5 +1,5 @@ SRC_URI += "file://cross-compile.patch;p
require gst-plugins.inc
DEPENDS += "gst-plugins-base"
SRC_URI += "file://cross-compile.patch;patch=1"
+PR = "r4"
-PR = "r3"
============================================================
--- packages/gstreamer/gst-plugins-base_0.10.12.bb a66fe4adbd8a25199d7f633f3cf084b83c5c0fc6
+++ packages/gstreamer/gst-plugins-base_0.10.12.bb 869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38
@@ -1,9 +1,5 @@ PROVIDES += "gst-plugins"
require gst-plugins.inc
PROVIDES += "gst-plugins"
-PR = "r0"
+PR = "r1"
-do_stage() {
- autotools_stage_all
-}
-
============================================================
--- packages/gstreamer/gst-plugins-good_0.10.5.bb 02d5a50a6207c7b1a0aa0be5279a1656d775f186
+++ packages/gstreamer/gst-plugins-good_0.10.5.bb 8e022b10f99f96c8cba7fe44d7252de0edc90cd9
@@ -1,5 +1,5 @@ DEPENDS += "gst-plugins-base"
require gst-plugins.inc
EXTRA_OECONF += "--with-check=no"
DEPENDS += "gst-plugins-base"
+PR = "r3"
-PR = "r2"
============================================================
--- packages/gstreamer/gst-plugins-ugly_0.10.5.bb b18b94ffb6342d3a1cb9b1f8a6fbc861d1c1f4b4
+++ packages/gstreamer/gst-plugins-ugly_0.10.5.bb 091c86318da723ac2f5b9708ab9e4cfc39377038
@@ -1,5 +1,5 @@ SRC_URI += "file://cross-compile.patch;p
require gst-plugins.inc
DEPENDS += "gst-plugins-base"
SRC_URI += "file://cross-compile.patch;patch=1"
+PR = "r4"
-PR = "r3"
============================================================
--- packages/gstreamer/gst-plugins.inc 80f02b4157a4aaf0930a7003dfae8ab3e94ac833
+++ packages/gstreamer/gst-plugins.inc 6293327f294676ab88b8ec6b36906d0113b3566a
@@ -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"
============================================================
--- packages/gstreamer/gstreamer.inc fe5252bcb6bc7240f9051c345b27ee2a414cbdc7
+++ packages/gstreamer/gstreamer.inc 4373e3c63e98e5e7231ff03f8d1ae556374e045f
@@ -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"
+DEPENDS = "libxml2 glib-2.0 gettext-native popt"
-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"
============================================================
--- packages/gstreamer/gstreamer_0.10.12.bb fbdf478d1fff2794c9698e59f238ead68822c687
+++ packages/gstreamer/gstreamer_0.10.12.bb 7de1cce853de7552030f28b0d35bd51161bdffaa
@@ -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
+PR = "r1"
-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"
More information about the Openembedded-commits
mailing list