[packages/bochs] - updated to 3.0
qboosh
qboosh at pld-linux.org
Fri Mar 21 19:47:36 CET 2025
commit 9d4d9bf85704c1778f761341a5845be9e7d69c25
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Mar 21 19:32:23 2025 +0100
- updated to 3.0
bochs-build.patch | 11 -----------
bochs.spec | 29 ++++++++++++++++++++++++-----
2 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/bochs.spec b/bochs.spec
index db7690a..b1c7295 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,30 +1,35 @@
# TODO:
# - more subpackages (plugins)
#
+# Conditonal build:
+%bcond_without system_libslirp # system libslirp instead of builtin
+
Summary: Portable x86 PC Emulator
Summary(pl.UTF-8): Przenośny emulator x86 PC
Name: bochs
-Version: 2.8
+Version: 3.0
Release: 1
License: LGPL v2+
Group: Applications/Emulators
Source0: https://downloads.sourceforge.net/bochs/%{name}-%{version}.tar.gz
-# Source0-md5: c65bc348938b5677f86feaef51c43efe
-Patch0: %{name}-build.patch
+# Source0-md5: 407a010ab5cdb78e8ca8795dafdc3323
URL: https://bochs.sourceforge.net/
-BuildRequires: SDL2-devel >= 2
+BuildRequires: SDL2-devel >= 2.0.5
BuildRequires: alsa-lib-devel
BuildRequires: autoconf >= 2.71
BuildRequires: automake
BuildRequires: docbook-dtd41-sgml
BuildRequires: gtk+3-devel >= 3.0
BuildRequires: libltdl-devel
+# or soxr (libsamplerate is preferred)
BuildRequires: libsamplerate-devel
+%{?with_system_libslirp:BuildRequires: libslirp-devel}
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: libvncserver-devel
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
BuildRequires: wxGTK3-unicode-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXpm-devel
@@ -48,7 +53,6 @@ Twoim komputerze.
%prep
%setup -q
-%patch0 -p1
%build
cp -f /usr/share/automake/config.sub .
@@ -60,28 +64,38 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
WX_CONFIG="wx-gtk3-unicode-config" \
--enable-3dnow \
--enable-all-optimizations \
+ --enable-amx \
+ --enable-avx \
--enable-cdrom \
+ --enable-cet \
--enable-clgd54xx \
--enable-cpu-level=6 \
--enable-e1000 \
--enable-es1370 \
+ --enable-evex \
%ifarch %{ix86}
--enable-fast-function-calls \
%endif
--enable-fpu \
--enable-gameport \
--enable-instrumentation \
+ --enable-memtype \
--enable-monitor-mwait \
--enable-ne2000 \
--enable-pci \
--enable-plugins \
+ --enable-protection-keys \
--enable-readline \
--enable-repeat-speedups \
--enable-sb16 \
--enable-smp \
+ --enable-svm \
+ --enable-uintr \
--enable-usb \
--enable-usb-ehci \
--enable-usb-xhci \
+ %{?with_system_libslirp:--enable-using-libslirp} \
+ --enable-vmx=2 \
--enable-voodoo \
--enable-x86-64 \
--with-rfb \
@@ -101,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
docdir=%{_docdir}/%{name}-%{version}
%{__mv} $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*-{LICENSE,README} \
+ $RPM_BUILD_ROOT%{_datadir}/bochs/README-i440fx \
$RPM_BUILD_ROOT%{_datadir}/bochs/Sea*BIOS-README \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -151,6 +166,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_sounddummy.so*
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_soundfile.so*
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_soundoss.so*
+# R: pulseaudio-libs
+%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_soundpulse.so*
# R: SDL2
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_soundsdl.so*
# -- generic plugins
@@ -190,11 +207,13 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_usb_xhci.so*
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_vga.so*
%attr(755,root,root) %{_libdir}/%{name}/plugins/libbx_voodoo.so*
+
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/keymaps
%{_datadir}/%{name}/BIOS-*
%{_datadir}/%{name}/VGABIOS-*
%{_datadir}/%{name}/bios.bin*
+%{_datadir}/%{name}/i440fx.bin
%{_datadir}/%{name}/vgabios-*.bin*
%{_mandir}/man1/bochs.1*
%{_mandir}/man1/bochs-dlx.1*
diff --git a/bochs-build.patch b/bochs-build.patch
deleted file mode 100644
index cad85d9..0000000
--- a/bochs-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bochs-2.8/instrument/stubs/instrument.cc.orig 2024-03-10 07:59:37.000000000 +0100
-+++ bochs-2.8/instrument/stubs/instrument.cc 2024-03-26 20:47:30.140134418 +0100
-@@ -24,6 +24,8 @@
-
- #if BX_INSTRUMENTATION
-
-+class bxInstruction_c;
-+
- void bx_instr_init_env(void) {}
- void bx_instr_exit_env(void) {}
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bochs.git/commitdiff/9d4d9bf85704c1778f761341a5845be9e7d69c25
More information about the pld-cvs-commit
mailing list