swfdec: Fixed dependencies and package splitting. Disabled static. Packaged stable 0.8.2.

5 files changed, 71 insertions, 13 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 15b8cfa8c3..ff7a42c051 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -23134,6 +23134,10 @@ sha256=c6b2ee967ae04776fd60a47dc283570917e387dbcffc907a0dfc91f567c139f7
 md5=08fcda4a46454bfc66b97fba2d385f8c
 sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a
 
+[http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-0.8.2.tar.gz]
+md5=2fb20b04c0e426a1e894a4c4bf22cf87
+sha256=10fd6f07264d3fbd92c03858a99637cd4b9d98ab00fb4d31720adce0c1ed7af4
+
 [http://swfdec.freedesktop.org/download/swfdec/0.9/swfdec-0.9.2.tar.gz]
 md5=7be5e39236e2d6efa61a18e83e5ab73d
 sha256=7d56a3044c19e7ca4b492f3739d9aa6f6bdb6e51ecf4daa5d29c035ae430f1ef
@@ -23146,6 +23150,10 @@ sha256=84962251e647fdcdcf111bef0c478f7d3679ae104267ba72e59ad749c6955cc2
 md5=c5958f3b003190b21977495021ac2b28
 sha256=0d7927f2e791321b2867c120eb4140d9017c59b77925eb909b2a03f3ef2a8fe4
 
+[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/swfdec-mozilla-0.8.2.tar.gz]
+md5=716632e0d35b3c1582c180569ba30346
+sha256=49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5
+
 [http://swfdec.freedesktop.org/download/swfdec-mozilla/0.9/swfdec-mozilla-0.9.2.tar.gz]
 md5=5e19c365d02f1ece2e7caec13c2b23d4
 sha256=8c8cfb52b47efabefab90577fb118ab2699c803cebbc82891700f8e2d712343b
diff --git a/recipes/swfdec/swfdec-mozilla_0.8.2.bb b/recipes/swfdec/swfdec-mozilla_0.8.2.bb
new file mode 100644
index 0000000000..bfb5c208d1
--- /dev/null
+++ b/recipes/swfdec/swfdec-mozilla_0.8.2.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations."
+LICENSE = "LGPL"
+
+DEPENDS = "swfdec glib-2.0"
+RDEPENDS = "gst-ffmpeg"
+
+SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/${P}.tar.gz \
+"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+EXTRA_OECONF = "--disable-static"
+
+do_install_append() {
+	rm ${D}${libdir}/mozilla/plugins/*.la
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/mozilla/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/mozilla/plugins/.debug"
+
diff --git a/recipes/swfdec/swfdec-mozilla_0.9.2.bb b/recipes/swfdec/swfdec-mozilla_0.9.2.bb
index 74f4e7b942..4bb8c607af 100644
--- a/recipes/swfdec/swfdec-mozilla_0.9.2.bb
+++ b/recipes/swfdec/swfdec-mozilla_0.9.2.bb
@@ -1,20 +1,23 @@
 DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
-
-DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+PR = "r1"
+DEPENDS = "swfdec glib-2.0"
 RDEPENDS = "gst-ffmpeg"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.9/${P}.tar.gz \
 "
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig gtk-icon-cache
+
+EXTRA_OECONF = "--disable-static"
+
+do_install_append() {
+	rm ${D}${libdir}/mozilla/plugins/*.la
+}
 
 do_stage() {
 	autotools_stage_all
 }
 
-FILES_${PN} += "${datadir}/icons ${libdir}/mozilla/plugins/*.so"
-FILES_${PN}-dev += "${libdir}/mozilla/plugins/*a"
+FILES_${PN} += "${libdir}/mozilla/plugins/*.so"
 FILES_${PN}-dbg += "${libdir}/mozilla/plugins/.debug"
-
diff --git a/recipes/swfdec/swfdec_0.8.2.bb b/recipes/swfdec/swfdec_0.8.2.bb
new file mode 100644
index 0000000000..33012daf67
--- /dev/null
+++ b/recipes/swfdec/swfdec_0.8.2.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
+LICENSE = "LGPL"
+
+DEPENDS = "gstreamer gst-plugins-base libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib"
+
+SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.8/${P}.tar.gz \
+"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--disable-static"
+
+do_install_append() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/player/.libs/swfplay ${D}/${bindir}
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "libswfdecgtk libswfdec"
+FILES_libswfdec = "${libdir}/libswfdec-0.8.so.*"
+FILES_libswfdecgtk = "${libdir}/libswfdec-gtk-0.8.so.*"
diff --git a/recipes/swfdec/swfdec_0.9.2.bb b/recipes/swfdec/swfdec_0.9.2.bb
index 81950ed311..89ece48982 100644
--- a/recipes/swfdec/swfdec_0.9.2.bb
+++ b/recipes/swfdec/swfdec_0.9.2.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
-
-DEPENDS = "gstreamer gst-plugins-base libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+PR = "r1"
+DEPENDS = "gstreamer gst-plugins-base libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.9/${P}.tar.gz \
 "
 
 inherit autotools pkgconfig 
 
+EXTRA_OECONF = "--disable-static"
+
 do_install_append() {
 	install -d ${D}/${bindir}
 	install -m 0755 ${S}/player/.libs/swfplay ${D}/${bindir}
@@ -19,8 +21,5 @@ do_stage() {
 
 PACKAGES =+ "libswfdecgtk libswfdec"
 
-FILES_${PN} += "${datadir}/icons"
 FILES_libswfdec = "${libdir}/libswfdec-0.9.so.*"
-FILES_libswfdecgtk = "${libdir}/libswfdec-gtk-0.9.so*"
-
-
+FILES_libswfdecgtk = "${libdir}/libswfdec-gtk-0.9.so.*"