From f4f248406d39b7d4d884cf3cfe3e4a5153c2b6df Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Thu, 8 Aug 2019 22:45:17 +0800
Subject: zlib-intel: use '.' instead of '_' in PV

Otherwise everything after underscore either gets ignored (in case of
devtool)  or converted to a hyphen. This ensures that the version is
handled more consistently.

Also add a custom GITTAGREGEX check to check for upstream releases.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb | 18 ++++++++++++++++++
 recipes-core/zlib/zlib-intel_1.2.11.1_jtkv6.3.bb | 16 ----------------
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
 delete mode 100644 recipes-core/zlib/zlib-intel_1.2.11.1_jtkv6.3.bb

diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
new file mode 100644
index 00000000..65303bff
--- /dev/null
+++ b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
@@ -0,0 +1,18 @@
+require recipes-core/zlib/zlib_1.2.11.bb
+
+FILESEXTRAPATHS_append = ":${COREBASE}/meta/recipes-core/zlib/zlib"
+
+SUMMARY = "Zlib Compression Library (Intel-tuned)"
+
+PROVIDES = "zlib"
+
+SRC_URI_remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI_prepend = "git://github.com/jtkukunas/zlib.git;protocol=git "
+
+SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010"
+S = "${WORKDIR}/git"
+
+RPROVIDES_${PN} += "zlib"
+RPROVIDES_${PN}-ptest += "zlib-ptest"
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+)_jtkv(\d+(\.\d+)+))$"
diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1_jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1_jtkv6.3.bb
deleted file mode 100644
index 02b75156..00000000
--- a/recipes-core/zlib/zlib-intel_1.2.11.1_jtkv6.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require recipes-core/zlib/zlib_1.2.11.bb
-
-FILESEXTRAPATHS_append = ":${COREBASE}/meta/recipes-core/zlib/zlib"
-
-SUMMARY = "Zlib Compression Library (Intel-tuned)"
-
-PROVIDES = "zlib"
-
-SRC_URI_remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI_prepend = "git://github.com/jtkukunas/zlib.git;protocol=git "
-
-SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010"
-S = "${WORKDIR}/git"
-
-RPROVIDES_${PN} += "zlib"
-RPROVIDES_${PN}-ptest += "zlib-ptest"
-- 
cgit v1.2.3-54-g00ecf