From ef0b90b903c0e8b92aea7972e790902beaa7cc3e Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 15 Jan 2009 12:54:27 +0000
Subject: gupnp: Update to latest releases, add gupnp-av, stage the binding
 tool into native staging (its a script so thats allowed)

---
 meta/packages/gupnp/gssdp_0.6.2.bb       | 10 ----------
 meta/packages/gupnp/gssdp_0.6.3.bb       | 10 ++++++++++
 meta/packages/gupnp/gupnp-av_0.3.bb      |  6 ++++++
 meta/packages/gupnp/gupnp-tools_0.6.1.bb |  6 ------
 meta/packages/gupnp/gupnp-tools_0.7.bb   |  6 ++++++
 meta/packages/gupnp/gupnp_0.12.2.bb      |  9 ---------
 meta/packages/gupnp/gupnp_0.12.5.bb      | 14 ++++++++++++++
 7 files changed, 36 insertions(+), 25 deletions(-)
 delete mode 100644 meta/packages/gupnp/gssdp_0.6.2.bb
 create mode 100644 meta/packages/gupnp/gssdp_0.6.3.bb
 create mode 100644 meta/packages/gupnp/gupnp-av_0.3.bb
 delete mode 100644 meta/packages/gupnp/gupnp-tools_0.6.1.bb
 create mode 100644 meta/packages/gupnp/gupnp-tools_0.7.bb
 delete mode 100644 meta/packages/gupnp/gupnp_0.12.2.bb
 create mode 100644 meta/packages/gupnp/gupnp_0.12.5.bb

diff --git a/meta/packages/gupnp/gssdp_0.6.2.bb b/meta/packages/gupnp/gssdp_0.6.2.bb
deleted file mode 100644
index 09e12e2c6..000000000
--- a/meta/packages/gupnp/gssdp_0.6.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 libsoup-2.4 libglade"
-
-SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
-
-inherit autotools_stage pkgconfig
-
-PACKAGES =+ "gssdp-tools"
-
-FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
diff --git a/meta/packages/gupnp/gssdp_0.6.3.bb b/meta/packages/gupnp/gssdp_0.6.3.bb
new file mode 100644
index 000000000..09e12e2c6
--- /dev/null
+++ b/meta/packages/gupnp/gssdp_0.6.3.bb
@@ -0,0 +1,10 @@
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 libsoup-2.4 libglade"
+
+SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools_stage pkgconfig
+
+PACKAGES =+ "gssdp-tools"
+
+FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
diff --git a/meta/packages/gupnp/gupnp-av_0.3.bb b/meta/packages/gupnp/gupnp-av_0.3.bb
new file mode 100644
index 000000000..5f52525b4
--- /dev/null
+++ b/meta/packages/gupnp/gupnp-av_0.3.bb
@@ -0,0 +1,6 @@
+LICENSE = "LGPL"
+DEPENDS = "gupnp"
+
+SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/gupnp/gupnp-tools_0.6.1.bb b/meta/packages/gupnp/gupnp-tools_0.6.1.bb
deleted file mode 100644
index be4f3510b..000000000
--- a/meta/packages/gupnp/gupnp-tools_0.6.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-LICENSE = "GPL"
-DEPENDS = "gupnp gtk+ libglade gnome-icon-theme"
-
-SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
diff --git a/meta/packages/gupnp/gupnp-tools_0.7.bb b/meta/packages/gupnp/gupnp-tools_0.7.bb
new file mode 100644
index 000000000..be4f3510b
--- /dev/null
+++ b/meta/packages/gupnp/gupnp-tools_0.7.bb
@@ -0,0 +1,6 @@
+LICENSE = "GPL"
+DEPENDS = "gupnp gtk+ libglade gnome-icon-theme"
+
+SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
diff --git a/meta/packages/gupnp/gupnp_0.12.2.bb b/meta/packages/gupnp/gupnp_0.12.2.bb
deleted file mode 100644
index 2b615f060..000000000
--- a/meta/packages/gupnp/gupnp_0.12.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "LGPL"
-DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
-
-SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
-
-inherit autotools_stage pkgconfig
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
diff --git a/meta/packages/gupnp/gupnp_0.12.5.bb b/meta/packages/gupnp/gupnp_0.12.5.bb
new file mode 100644
index 000000000..4fd75d893
--- /dev/null
+++ b/meta/packages/gupnp/gupnp_0.12.5.bb
@@ -0,0 +1,14 @@
+LICENSE = "LGPL"
+DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
+
+SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
+PR = "r1"
+
+inherit autotools_stage pkgconfig
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
+
+do_stage_append () {
+	install ${S}/tools/gupnp-binding-tool ${STAGING_BINDIR_NATIVE}
+}
\ No newline at end of file
-- 
cgit v1.2.3