3 files changed, 28 insertions, 17 deletions

diff --git a/recipes-multimedia/libfslcodec/libfslcodec.inc b/recipes-multimedia/imx-codec/imx-codec.inc
index 2f0bc445..e6fd9c6f 100644
--- a/recipes-multimedia/libfslcodec/libfslcodec.inc
+++ b/recipes-multimedia/imx-codec/imx-codec.inc
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2014 Freescale Semiconductor
+# Copyright (C) 2012-2016 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
@@ -19,8 +19,8 @@ PACKAGECONFIG_mx6dl = "vpu"
 PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,imx-vpu"
 
 do_install_append() {
-        # FIXME: This link points to nowhere
-        rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so
+    # FIXME: This link points to nowhere
+    rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so
 
     # LTIB move the files around or gst-fsl-plugin won't find them
     for p in $(find ${D}${libdir}/imx-mm -mindepth 2 -maxdepth 2 -not -type d); do
@@ -41,7 +41,7 @@ python __set_insane_skip() {
 
         # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
         # the source we cannot fix it. Disable the insane check for now.
-        if p == 'libfslcodec-test-bin':
+        if p == 'imx-codec-test-bin':
             # FIXME: includes the DUT .so files so we need to deploy those
             d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel libdir")
         else:
@@ -54,18 +54,29 @@ python __split_libfslcodec_plugins() {
     codecdir = bb.data.expand('${libdir}', d)
     do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*',
                       aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*',
-                      output_pattern='libfslcodec-%s',
+                      output_pattern='imx-codec-%s',
                       description='Freescale i.MX Codec (%s)',
                       extra_depends='')
+    pkgs = d.getVar('PACKAGES', True).split()
+    for pkg in pkgs:
+        meta = pkg[10:]
+        if meta != '':
+            d.setVar('RREPLACES_%s' % pkg, ' libfslcodec-%s' % meta)
+            d.setVar('RPROVIDES_%s' % pkg, ' libfslcodec-%s' % meta)
+            d.setVar('RCONFLICTS_%s' % pkg, ' libfslcodec-%s' % meta)
+        else :
+            d.setVar('RREPLACES_%s' % pkg, ' libfslcodec')
+            d.setVar('RPROVIDES_%s' % pkg, ' libfslcodec')
+            d.setVar('RCONFLICTS_%s' % pkg, ' libfslcodec')
 }
 
 python __set_metapkg_rdepends() {
     # Allow addition of all codecs in a image; useful specially for
     # debugging.
     codec_pkgs = oe.utils.packages_filter_out_system(d)
-    codec_pkgs = filter(lambda x: x not in ['libfslcodec-test-bin', 'libfslcodec-test-source'],
+    codec_pkgs = filter(lambda x: x not in ['imx-codec-test-bin', 'imx-codec-test-source'],
                         codec_pkgs)
-    d.appendVar('RDEPENDS_libfslcodec-meta', ' ' + ' '.join(codec_pkgs))
+    d.appendVar('RDEPENDS_imx-codec-meta', ' ' + ' '.join(codec_pkgs))
 }
 
 PACKAGESPLITFUNCS =+ "__split_libfslcodec_plugins __set_metapkg_rdepends"
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.0.9.bb b/recipes-multimedia/imx-codec/imx-codec_4.0.9.bb
new file mode 100644
index 00000000..3fb9802d
--- /dev/null
+++ b/recipes-multimedia/imx-codec/imx-codec_4.0.9.bb
@@ -0,0 +1,9 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-codec.inc
+
+SRC_URI[md5sum] = "bcf54698af6f52958b36e34dcbd9fcd1"
+SRC_URI[sha256sum] = "62bda182143cde9743cba0eb2a1c315a53cb434294605742f9fc364219958888"
+
+COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"
diff --git a/recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb b/recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb
deleted file mode 100644
index 1b32f907..00000000
--- a/recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2013-2015 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require libfslcodec.inc
-
-SRC_URI[md5sum] = "462fb27b20cd7df56a49b9e7d6b7c8b4"
-SRC_URI[sha256sum] = "544ffc5989bce18ca50c7a826cc03370b1cf8455335e4291ef0c0779b4c33de0"
-
-COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"