gst-fsl-plugin: refactor packaging to use .inc file properly

The .inc file was not being used by complete and had most code on the
versioned .bb one. This patch refactor it so newer versions are easy
to add.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>

2 files changed, 32 insertions, 30 deletions

diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
index 1940f881b..258e656da 100644
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
+++ b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
@@ -1,21 +1,40 @@
 # Copyright (C) 2011 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
+DESCRIPTION = "Gstreamer freescale plugins"
+LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1"
+SECTION = "multimedia"
+DEPENDS = "gstreamer gst-plugins-base fsl-mm-codeclib imx-lib"
+RDEPENDS_${PN} = "fsl-mm-codeclib"
+INC_PR = "r5"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+                    file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
+
+SRC_URI = "file://${PN}-${PV}.tar.gz \
+          file://fix_segment_fault_in_v4lsink_for_yocto.patch"
+
+inherit autotools pkgconfig
+
+# Todo add a mechanism to map posible build targets
+INCLUDE_DIR = "-I${STAGING_KERNEL_DIR}/include"
+EXTRA_OEMAKE = "INCLUDES=${INCLUDE_DIR}"
+EXTRA_OECONF = "PLATFORM=MX51 --disable-valgrind --disable-examples --disable-debug"
+
 PACKAGES += "${PN}-libmfwsconf ${PN}-libgplaycore \
              ${PN}-libme ${PN}-libgstbufmeta ${PN}-libmfwba \
              ${PN}-libfwvss ${PN}-gplay"
 
-FILES_${PN} = "${libdir}/gstreamer-0.10/*.so \
-    ${datadir}"
-FILES_${PN}-dbg = "${libdir}/gstreamer-0.10/.debug \
-    ${libdir}/.debug"
-FILES_${PN}-dev = "${libdir}/gstreamer-0.10/*.la \
-    {libdir}/*.la"
+FILES_${PN} = "${libdir}/gstreamer-0.10/*.so ${datadir}"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
+FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
 
 FILES_${PN}-gplay = "${bindir}/gplay"
-FILES_${PN}-libmfwsconf = "${libdir}/libmfwsconf.so.*"
-FILES_${PN}-libgplaycore = "${libdir}/libgplaycore.so.*"
-FILES_${PN}-libme = "${libdir}/libme.so.*"
-FILES_${PN}-libgstbufmeta = "${libdir}/libgstbufmeta.so.*"
-FILES_${PN}-libmfwba =  "${libdir}/libmfwba.so.*"
-FILES_${PN}-libfwvss = "${libdir}/libmfwvss.so.*"
+FILES_${PN}-libmfwsconf = "${libdir}/libmfwsconf${SOLIBS}"
+FILES_${PN}-libgplaycore = "${libdir}/libgplaycore${SOLIBS}"
+FILES_${PN}-libme = "${libdir}/libme${SOLIBS}"
+FILES_${PN}-libgstbufmeta = "${libdir}/libgstbufmeta${SOLIBS}"
+FILES_${PN}-libmfwba =  "${libdir}/libmfwba${SOLIBS}"
+FILES_${PN}-libfwvss = "${libdir}/libmfwvss${SOLIBS}"
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
index 92af1318a..540b25986 100644
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
+++ b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
@@ -2,25 +2,8 @@
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 require gst-fsl-plugin.inc
-inherit autotools pkgconfig
 
-DESCRIPTION = "Gstreamer freescale plugins"
-LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1"
-SECTION = "multimedia"
-DEPENDS = "gstreamer gst-plugins-base fsl-mm-codeclib imx-lib"
-RDEPENDS_${PN} = "fsl-mm-codeclib"
-PR = "r5"
+PR = "${INC_PR}.0"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-                    file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
-
-SRC_URI = "file://${PN}-${PV}.tar.gz \
-          file://fix_segment_fault_in_v4lsink_for_yocto.patch"
 SRC_URI[md5sum] = "036a8e86031b0670f41b10796e268f9e"
 SRC_URI[sha256sum] = "ee024e6fe94ce309b10dc89ab247d1bbcf8ae9cc8006178c96101ce2d4d164a0"
-
-# Todo add a mechanism to map posible build targets
-INCLUDE_DIR = "-I${STAGING_KERNEL_DIR}/include"
-EXTRA_OEMAKE = "INCLUDES=${INCLUDE_DIR}"
-EXTRA_OECONF = "PLATFORM=MX51 --disable-valgrind --disable-examples --disable-debug"