Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Apr 2024 13:26:39 GMT
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a6a428bcd414 - main - emulators/*unicorn: update to 2.0.1p1
Message-ID:  <202404181326.43IDQdPq024656@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by antoine:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a6a428bcd414da741ed7271224816e7a23c95f17

commit a6a428bcd414da741ed7271224816e7a23c95f17
Author:     Antoine Brodin <antoine@FreeBSD.org>
AuthorDate: 2024-04-18 13:25:56 +0000
Commit:     Antoine Brodin <antoine@FreeBSD.org>
CommitDate: 2024-04-18 13:25:56 +0000

    emulators/*unicorn: update to 2.0.1p1
---
 emulators/py-unicorn/Makefile                      |  6 ++++--
 emulators/py-unicorn/distinfo                      |  6 +++---
 emulators/py-unicorn/files/patch-setup.py          |  6 +++---
 emulators/unicorn/Makefile                         | 25 ++++------------------
 emulators/unicorn/distinfo                         |  6 +++---
 emulators/unicorn/files/patch-Makefile             | 23 --------------------
 emulators/unicorn/files/patch-qemu_configure       | 18 ----------------
 .../unicorn/files/patch-qemu_include_qemu-common.h | 18 ----------------
 emulators/unicorn/files/patch-tests_unit_Makefile  | 12 -----------
 emulators/unicorn/pkg-plist                        |  6 +++++-
 10 files changed, 22 insertions(+), 104 deletions(-)

diff --git a/emulators/py-unicorn/Makefile b/emulators/py-unicorn/Makefile
index 678d21b56917..3f79455c04c6 100644
--- a/emulators/py-unicorn/Makefile
+++ b/emulators/py-unicorn/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	unicorn
-DISTVERSION=	1.0.2
+PORTVERSION=	2.0.1p1
 CATEGORIES=	emulators python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -9,10 +9,12 @@ WWW=		https://www.unicorn-engine.org/
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libunicorn.so:emulators/unicorn
+BUILD_DEPENDS=	${LOCALBASE}/lib/libunicorn.so:emulators/unicorn
+RUN_DEPENDS=	${LOCALBASE}/lib/libunicorn.so:emulators/unicorn
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	unicorn-engine
+GH_TAGNAME=	2.0.1.post1
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/emulators/py-unicorn/distinfo b/emulators/py-unicorn/distinfo
index fe34caf0954c..b9ef5e0ccdd5 100644
--- a/emulators/py-unicorn/distinfo
+++ b/emulators/py-unicorn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603347498
-SHA256 (unicorn-engine-unicorn-1.0.2_GH0.tar.gz) = 6400e16f9211486fa5353b1870e6a82f8aa342e429718d1cbca08d609aaadc52
-SIZE (unicorn-engine-unicorn-1.0.2_GH0.tar.gz) = 3735111
+TIMESTAMP = 1712441135
+SHA256 (unicorn-engine-unicorn-2.0.1p1-2.0.1.post1_GH0.tar.gz) = 6b276c857c69ee5ec3e292c3401c8c972bae292e0e4cb306bb9e5466c0f14737
+SIZE (unicorn-engine-unicorn-2.0.1p1-2.0.1.post1_GH0.tar.gz) = 4071380
diff --git a/emulators/py-unicorn/files/patch-setup.py b/emulators/py-unicorn/files/patch-setup.py
index 6dc06749b154..5c6b2f90e3b6 100644
--- a/emulators/py-unicorn/files/patch-setup.py
+++ b/emulators/py-unicorn/files/patch-setup.py
@@ -1,12 +1,12 @@
 # Do not bundle libunicorn.so
 
---- setup.py.orig	2020-09-21 18:11:43 UTC
+--- setup.py.orig	2022-11-16 14:16:49 UTC
 +++ setup.py
-@@ -281,11 +281,4 @@ setup(
+@@ -246,11 +246,4 @@ setup(
          'Programming Language :: Python :: 3',
      ],
      requires=['ctypes'],
--    cmdclass={'build': custom_build, 'develop': custom_develop, 'sdist': custom_sdist, 'bdist_egg': custom_bdist_egg},
+-    cmdclass=cmdclass,
 -    zip_safe=False,
 -    include_package_data=True,
 -    is_pure=False,
diff --git a/emulators/unicorn/Makefile b/emulators/unicorn/Makefile
index bd6c509b2d98..1ea8b9c56756 100644
--- a/emulators/unicorn/Makefile
+++ b/emulators/unicorn/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	unicorn
-DISTVERSION=	1.0.2
+PORTVERSION=	2.0.1p1
 CATEGORIES=	emulators
 
 MAINTAINER=	antoine@FreeBSD.org
@@ -9,29 +9,12 @@ WWW=		https://www.unicorn-engine.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_armv6=		fails to compile: 'tcg-target.h' file not found
-BROKEN_armv7=		fails to compile: 'tcg-target.h' file not found
-BROKEN_mips=		fails to compile: 'ICACHE' undeclared (first use in this function)
-BROKEN_mips64=		fails to compile: 'ICACHE' undeclared (first use in this function)
-BROKEN_riscv64=		fails to compile: 'tcg-target.h' file not found
-
-TEST_DEPENDS=	cmocka>0:sysutils/cmocka
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	unicorn-engine
+GH_TAGNAME=	2.0.1.post1
 
-USES=		compiler:c11 gmake python:build
+USES=		cmake:testing pkgconfig
 USE_LDCONFIG=	yes
-BINARY_ALIAS=	python=${PYTHON_CMD}
-MAKE_ENV=	INSTALL_LIB="${INSTALL_LIB}" \
-		SMP_MFLAGS=-j${MAKE_JOBS_NUMBER} \
-		V=1
-TEST_TARGET=	test
-TEST_WRKSRC=	${WRKSRC}/tests/unit
-_MAKE_JOBS=	# MAKE_JOBS_NUMBER is passed via MAKE_ENV
-# Optimization breaks runtime,
-# see https://github.com/unicorn-engine/unicorn/issues/356
-# and https://github.com/unicorn-engine/unicorn/issues/689
-CFLAGS:=	${CFLAGS:C/-O[1-9]/-O0/g}
+CMAKE_TESTING_ON=	UNICORN_BUILD_TESTS
 
 .include <bsd.port.mk>
diff --git a/emulators/unicorn/distinfo b/emulators/unicorn/distinfo
index fe34caf0954c..b9ef5e0ccdd5 100644
--- a/emulators/unicorn/distinfo
+++ b/emulators/unicorn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603347498
-SHA256 (unicorn-engine-unicorn-1.0.2_GH0.tar.gz) = 6400e16f9211486fa5353b1870e6a82f8aa342e429718d1cbca08d609aaadc52
-SIZE (unicorn-engine-unicorn-1.0.2_GH0.tar.gz) = 3735111
+TIMESTAMP = 1712441135
+SHA256 (unicorn-engine-unicorn-2.0.1p1-2.0.1.post1_GH0.tar.gz) = 6b276c857c69ee5ec3e292c3401c8c972bae292e0e4cb306bb9e5466c0f14737
+SIZE (unicorn-engine-unicorn-2.0.1p1-2.0.1.post1_GH0.tar.gz) = 4071380
diff --git a/emulators/unicorn/files/patch-Makefile b/emulators/unicorn/files/patch-Makefile
deleted file mode 100644
index cf77dbbc37ca..000000000000
--- a/emulators/unicorn/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	2020-05-29 03:56:24 UTC
-+++ Makefile
-@@ -140,9 +140,9 @@ V ?= 0
- MACOS_UNIVERSAL ?= no
- 
- ifeq ($(UNICORN_DEBUG),yes)
--CFLAGS += -g
-+#CFLAGS += -g
- else
--CFLAGS += -O3
-+#CFLAGS += -O3
- UNICORN_QEMU_FLAGS += --disable-debug-info
- endif
- 
-@@ -258,7 +258,7 @@ LIBDIRARCH ?= lib
- # Or better, pass 'LIBDIRARCH=lib64' to 'make install/uninstall' via 'make.sh'.
- #LIBDIRARCH ?= lib64
- 
--LIBDIR ?= $(PREFIX)/$(LIBDIRARCH)
-+LIBDIR = $(PREFIX)/$(LIBDIRARCH)
- INCDIR ?= $(PREFIX)/include
- BINDIR ?= $(PREFIX)/bin
- 
diff --git a/emulators/unicorn/files/patch-qemu_configure b/emulators/unicorn/files/patch-qemu_configure
deleted file mode 100644
index a6c327bc5a8c..000000000000
--- a/emulators/unicorn/files/patch-qemu_configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- qemu/configure.orig	2020-05-29 03:56:24 UTC
-+++ qemu/configure
-@@ -225,11 +225,11 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QE
- QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
- if test "$debug_info" = "yes"; then
--    CFLAGS="-g $CFLAGS"
--    LDFLAGS="-g $LDFLAGS"
-+#    CFLAGS="-g $CFLAGS"
-+#    LDFLAGS="-g $LDFLAGS"
- else
--    CFLAGS="-O3 $CFLAGS"
--    LDFLAGS="-O3 $LDFLAGS"
-+#    CFLAGS="-O3 $CFLAGS"
-+#    LDFLAGS="-O3 $LDFLAGS"
- fi
- 
- # make source path absolute
diff --git a/emulators/unicorn/files/patch-qemu_include_qemu-common.h b/emulators/unicorn/files/patch-qemu_include_qemu-common.h
deleted file mode 100644
index dcba49364942..000000000000
--- a/emulators/unicorn/files/patch-qemu_include_qemu-common.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- qemu/include/qemu-common.h.orig	2020-10-24 17:16:21 UTC
-+++ qemu/include/qemu-common.h
-@@ -205,7 +205,6 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b
- 
- /* vector definitions */
- #ifdef __ALTIVEC__
--#include <altivec.h>
- /* The altivec.h header says we're allowed to undef these for
-  * C++ compatibility.  Here we don't care about C++, but we
-  * undef them anyway to avoid namespace pollution.
-@@ -213,6 +212,7 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b
- #undef vector
- #undef pixel
- #undef bool
-+#include <altivec.h>
- #define VECTYPE        __vector unsigned char
- #define SPLAT(p)       vec_splat(vec_ld(0, p), 0)
- #define ALL_EQ(v1, v2) vec_all_eq(v1, v2)
diff --git a/emulators/unicorn/files/patch-tests_unit_Makefile b/emulators/unicorn/files/patch-tests_unit_Makefile
deleted file mode 100644
index b2df81e57013..000000000000
--- a/emulators/unicorn/files/patch-tests_unit_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- tests/unit/Makefile.orig	2020-02-15 00:22:32 UTC
-+++ tests/unit/Makefile
-@@ -1,8 +1,7 @@
- CFLAGS += -Wall -Werror -Wno-unused-function -g
- CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
- CFLAGS += -L ../../ -I ../../include
--CFLAGS += -L ../../cmocka/src -I ../../cmocka/include
--CFLAGS += -L /usr/local/lib -I /usr/local/include
-+CFLAGS += -L $(LOCALBASE)/lib -I $(LOCALBASE)/include
- ASFLAGS += --32
- OBJCOPY = objcopy
- 
diff --git a/emulators/unicorn/pkg-plist b/emulators/unicorn/pkg-plist
index 9137b50ad671..a45cb8b088c7 100644
--- a/emulators/unicorn/pkg-plist
+++ b/emulators/unicorn/pkg-plist
@@ -3,10 +3,14 @@ include/unicorn/arm64.h
 include/unicorn/m68k.h
 include/unicorn/mips.h
 include/unicorn/platform.h
+include/unicorn/ppc.h
+include/unicorn/riscv.h
+include/unicorn/s390x.h
 include/unicorn/sparc.h
+include/unicorn/tricore.h
 include/unicorn/unicorn.h
 include/unicorn/x86.h
 lib/libunicorn.a
 lib/libunicorn.so
-lib/libunicorn.so.1
+lib/libunicorn.so.2
 libdata/pkgconfig/unicorn.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404181326.43IDQdPq024656>