commit 3291110ebcd7aab047ab32ce4dfa77003687a1d6
Author: Jan Palus <at...@pld-linux.org>
Date: Tue May 21 18:31:45 2024 +0200
up to 0.2.8
box64.spec | 22 +++++++++++++++-------
getopt-regression.patch | 32 --------------------------------
2 files changed, 15 insertions(+), 39 deletions(-)
---
diff --git a/box64.spec b/box64.spec
index 9f15dd9..93fe521 100644
--- a/box64.spec
+++ b/box64.spec
@@ -13,25 +13,26 @@
%bcond_with sd845 # target Snapragon 845 device
%bcond_with sd888 # target Snapragon 888 device
%bcond_with sd8g2 # target Snapragon 8 Gen 2 device
+%bcond_with tegra_t194 # target Tegra Xavier device
+%bcond_with tegra_t234 # target Tegra Orin device
%bcond_with tegrax1 # target Tegra X1
Summary: Linux Userspace x86_64 Emulator
Name: box64
-Version: 0.2.6
-Release: 2
+Version: 0.2.8
+Release: 1
License: MIT
Group: Applications
Source0:
https://github.com/ptitSeb/box64/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 12a691bad57bb0806a6e06c23c71121a
-Patch0: getopt-regression.patch
+# Source0-md5: 6975d0307121bce5868ef6f74be6b3eb
URL: https://box86.org
-BuildRequires: cmake >= 3.4
+BuildRequires: cmake >= 3.13
BuildRequires: python3
BuildRequires: rpmbuild(macros) >= 1.605
ExclusiveArch: aarch64 ppc64le riscv64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoprov libcrypto.so libgcc_s.so libssl.so
libstdc\\+\\+.so libpng12.so libunwind.so
+%define _noautoprov libcrypto.so libgcc_s.so libmbed.*\\.so
libssl.so libstdc\\+\\+.so libpng12.so libunwind.so
%define _noautoreqfiles .*x86_64.*
%define _noautostrip .*x86_64.*
@@ -41,7 +42,6 @@ Linux systems, like ARM (host system needs to be 64bit
little-endian).
%prep
%setup -q
-%patch0 -p1
%build
%cmake -B build \
@@ -68,6 +68,8 @@ Linux systems, like ARM (host system needs to be 64bit
little-endian).
%{?with_sd845:-DSD845:BOOL=ON} \
%{?with_sd888:-DSD888:BOOL=ON} \
%{?with_sd8g2:-DSD8G2:BOOL=ON} \
+ %{?with_tegra_t194:-DTEGRA_T194:BOOL=ON} \
+ %{?with_tegra_t234:-DTEGRA_T234:BOOL=ON} \
%{?with_tegrax1:-DTEGRAX1:BOOL=ON}
%{__make} -C build
@@ -89,6 +91,12 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/lib/x86_64-linux-gnu
%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libgcc_s.so.1
+%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libmbedcrypto.so.3
+%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libmbedcrypto.so.7
+%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libmbedtls.so.12
+%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libmbedtls.so.14
+%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libmbedx509.so.0
+%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libmbedx509.so.1
%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libpng12.so.0
%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libssl.so.1.1
%attr(755,root,root) /usr/lib/x86_64-linux-gnu/libstdc++.so.5
diff --git a/getopt-regression.patch b/getopt-regression.patch
deleted file mode 100644
index 1784a51..0000000
--- a/getopt-regression.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cbea2b544367675f710ebab74f4056ca1d18c203 Mon Sep 17 00:00:00 2001
-From: ptitSeb <sebastien.c...@gmail.com>
-Date: Sat, 6 Jan 2024 10:30:31 +0100
-Subject: [PATCH] Rollback commit 9201559 as it breaks some programs using
- getopts (should help #1190)
-
----
- src/librarian/globalsymbols.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/librarian/globalsymbols.c b/src/librarian/globalsymbols.c
-index 6d96720b7..462af7fb2 100644
---- a/src/librarian/globalsymbols.c
-+++ b/src/librarian/globalsymbols.c
-@@ -20,7 +20,7 @@
- if (GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs,
&globend, -1, NULL, NULL)) { \
- printf_log(LOG_DEBUG, "Global " #A " workaround, @%p <- %p\n",
(void*)globoffs, &A); \
- memcpy((void*)globoffs, &A, sizeof(A));
\
-- } else
\
-+ }
\
- if (B && GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs,
&globend, -1, NULL, B)) { \
- printf_log(LOG_DEBUG, "Global " #A " workaround, @%p <- %p\n",
(void*)globoffs, &A); \
- memcpy((void*)globoffs, &A, sizeof(A));
\
-@@ -30,7 +30,7 @@
- if (GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs,
&globend, -1, NULL, NULL)) { \
- printf_log(LOG_DEBUG, "Global " #A " workaround, @%p -> %p\n",
(void*)globoffs, &A); \
- memcpy(&A, (void*)globoffs, sizeof(A));
\
-- } else
\
-+ }
\
- if (B && GetGlobalNoWeakSymbolStartEnd(my_context->maplib, #A, &globoffs,
&globend, -1, NULL, B)) { \
- printf_log(LOG_DEBUG, "Global " #A " workaround, @%p -> %p\n",
(void*)globoffs, &A); \
- memcpy(&A, (void*)globoffs, sizeof(A));
\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/box64.git/commitdiff/3291110ebcd7aab047ab32ce4dfa77003687a1d6
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
