From df7f4becee695d6677a1bcd28ce93a18eebb1932 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 19 Jul 2018 10:54:15 +0200
Subject: [PATCH] imx-parser: update to version 4.4.0

This is the version used by NXP in the rocko-4.9.88-2.2.0_8qxp_beta2 branch of
their meta-fsl-bsp-release layer.

https://jira.digi.com/browse/DEL-6078

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../imx-parser/imx-parser.inc                 | 41 +++++++++++++++++++
 .../imx-parser/imx-parser_4.2.1.bb            | 11 -----
 .../imx-parser/imx-parser_4.4.0.bb            | 12 ++++++
 ...2.1.bbappend => imx-parser_4.4.0.bbappend} |  0
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 meta-digi-dey/recipes-multimedia/imx-parser/imx-parser.inc
 delete mode 100644 meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bb
 create mode 100644 meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.4.0.bb
 rename meta-digi-dey/recipes-multimedia/imx-parser/{imx-parser_4.2.1.bbappend => imx-parser_4.4.0.bbappend} (100%)

diff --git a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser.inc b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser.inc
new file mode 100644
index 000000000..e3290b92d
--- /dev/null
+++ b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser.inc
@@ -0,0 +1,41 @@
+# Copyright (C) 2012-2014, 2016 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Freescale Multimedia parser libs"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a"
+
+# For backwards compatibility
+PROVIDES += "libfslparser"
+RREPLACES_${PN} = "libfslparser"
+RPROVIDES_${PN} = "libfslparser"
+RCONFLICTS_${PN} = "libfslparser"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
+# Choose between 32bit and 64bit binaries
+EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \
+                  bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '--enable-fsw', d), d)}"
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+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.
+    # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
+    for p in d.getVar('PACKAGES', True).split():
+        d.setVar("INSANE_SKIP_%s" % p, "ldflags dev-so textrel")
+}
+
+do_package_qa[prefuncs] += "__set_insane_skip"
+
+# FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
+FILES_${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+INHIBIT_SYSROOT_STRIP = "1"
diff --git a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bb b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bb
deleted file mode 100644
index 2fe1cb4f1..000000000
--- a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include recipes-multimedia/imx-parser/imx-parser.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a"
-
-SRC_URI[md5sum] = "6717799abce0dc5918db8d3fd0e39184"
-SRC_URI[sha256sum] = "36d3ae7285f3a83a87abf680b8a52b3c07df869d2443de844fb5f0ff528ca862"
-
-COMPATIBLE_MACHINE = "(ccimx6)"
diff --git a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.4.0.bb b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.4.0.bb
new file mode 100644
index 000000000..252f4007b
--- /dev/null
+++ b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.4.0.bb
@@ -0,0 +1,12 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017-2018 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+include imx-parser.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28"
+
+SRC_URI[md5sum] = "55918adc721057ad762f39cada22c566"
+SRC_URI[sha256sum] = "edde3d1a0e52fce55f7b0df6bd831649434e71e434468cf8b247acc809c35e7a"
+
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
diff --git a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bbappend b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.4.0.bbappend
similarity index 100%
rename from meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bbappend
rename to meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.4.0.bbappend