fix conflicts

6 files changed, 0 insertions, 70 deletions

diff --git a/packages/gstreamer/gst-plugins-bad_0.10.1.bb b/packages/gstreamer/gst-plugins-bad_0.10.1.bb
deleted file mode 100644
index 182ed9349f..0000000000
--- a/packages/gstreamer/gst-plugins-bad_0.10.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include gst-plugins.inc
-DEPENDS += "gst-plugins-base"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.5.bb b/packages/gstreamer/gst-plugins-base_0.10.5.bb
deleted file mode 100644
index 655f2c1d66..0000000000
--- a/packages/gstreamer/gst-plugins-base_0.10.5.bb
+++ /dev/null
@@ -1 +0,0 @@
-include gst-plugins.inc
diff --git a/packages/gstreamer/gst-plugins-good_0.10.2.bb b/packages/gstreamer/gst-plugins-good_0.10.2.bb
deleted file mode 100644
index 182ed9349f..0000000000
--- a/packages/gstreamer/gst-plugins-good_0.10.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include gst-plugins.inc
-DEPENDS += "gst-plugins-base"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb
deleted file mode 100644
index 182ed9349f..0000000000
--- a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include gst-plugins.inc
-DEPENDS += "gst-plugins-base"
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
deleted file mode 100644
index 6ebf6560d1..0000000000
--- a/packages/gstreamer/gst-plugins.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Plugins for GStreamer"
-SECTION = "multimedia"
-PRIORITY = "optional"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
-DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag"
-PR = "r0"
-
-# until we have decided for a final naming scheme,
-# keep using version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools pkgconfig gconf
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
-
-EXTRA_OECONF = "--disable-x --disable-aalib --disable-esd --disable-shout2 \
-		--disable-sdl"
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-LIBV = "0.10"
-
-python populate_packages_prepend () {
-	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
-	postinst = bb.data.getVar('plugin_postinst', d, 1)
-
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
-	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_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb
deleted file mode 100644
index 435ac720b8..0000000000
--- a/packages/gstreamer/gstreamer_0.10.4.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-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/"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.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"