upx: update to latest devel release

The upx development branch history has been rebaseed, so we update
our SRCREV to match.

As part of this update, we can drop our patch as it has now been
merged into the project.

The cmake structure has changed slightly, so we inherit cmake-native
to make it available as part of the Makefile driven build.

And finally, the name and location of the binary has changed, so
we adapt our install rule to match.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 5 insertions, 35 deletions

diff --git a/recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch b/recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch
deleted file mode 100644
index 8b07c77e..00000000
--- a/recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8fe8cd22163fe11b791aac15b642d122ea98b9b5 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@lge.com>
-Date: Fri, 14 May 2021 02:26:13 -0700
-Subject: [PATCH] MyCom.h: fix build with gcc-11
-
-* fixes:
-  ./../src/lzma-sdk/C/7zip/Compress/LZMA/LZMAEncoder.h: In member function 'virtual ULONG NCompress::NLZMA::CEncoder::Release()':
-  ./../src/lzma-sdk/C/7zip/Compress/LZMA/../../../Common/MyCom.h:159:32: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
-    159 | STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
-        |                                ^~
-
-Upstream-Status: Submitted [https://github.com/upx/upx-lzma-sdk/pull/5]
-Signed-off-by: Martin Jansa <martin.jansa@lge.com>
----
- C/Common/MyCom.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/C/Common/MyCom.h b/C/Common/MyCom.h
-index b8dbf38..2e3c54a 100644
---- a/C/Common/MyCom.h
-+++ b/C/Common/MyCom.h
-@@ -156,8 +156,7 @@ public:
- 
- #define MY_ADDREF_RELEASE \
- STDMETHOD_(ULONG, AddRef)() { return ++__m_RefCount; } \
--STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
--  return __m_RefCount; delete this; return 0; }
-+STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) return __m_RefCount; delete this; return 0; }
- 
- #define MY_UNKNOWN_IMP_SPEC(i) \
-   MY_QUERYINTERFACE_BEGIN \
diff --git a/recipes-extended/upx/upx_git.bb b/recipes-extended/upx/upx_git.bb
index 9f400b1b..989b2776 100644
--- a/recipes-extended/upx/upx_git.bb
+++ b/recipes-extended/upx/upx_git.bb
@@ -1,15 +1,16 @@
 HOMEPAGE = "http://upx.sourceforge.net"
 SUMMARY = "Ultimate executable compressor."
 
-SRCREV = "4e1ae22a1a07be5135c68b25ff05058ae8ae48e1"
+SRCREV = "8d1a98e03bf281b2cee459b6c27347e56d13c6a8"
 SRC_URI = "gitsm://github.com/upx/upx;branch=devel;protocol=https \
-    file://0001-MyCom.h-fix-build-with-gcc-11.patch;patchdir=src/lzma-sdk \
 "
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=353753597aa110e0ded3508408c6374a"
 
-DEPENDS = "zlib libucl xz"
+DEPENDS = "zlib libucl xz cmake-native"
+
+# inherit cmake
 
 S = "${WORKDIR}/git"
 
@@ -29,7 +30,7 @@ do_compile() {
 
 do_install:append() {
     install -d ${D}${bindir}
-    install -m 755 ${B}/src/upx.out ${D}${bindir}/upx
+    install -m 755 ${B}/build/release/upx ${D}${bindir}/upx
 }
 
 BBCLASSEXTEND = "native"