diff --git a/.gitignore b/.gitignore index dd0e94e..c9b2209 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ bochs-2.4.5.cvs.tar.gz /bochs-2.6.tar.gz /bochs-2.6.1.tar.gz /bochs-2.6.2.tar.gz +/bochs-2.6.9.tar.gz diff --git a/bochs-2.6.9-string-format.patch b/bochs-2.6.9-string-format.patch new file mode 100644 index 0000000..8830519 --- /dev/null +++ b/bochs-2.6.9-string-format.patch @@ -0,0 +1,11 @@ +--- gui/siminterface.cc~ 2017-02-18 05:13:56.000000000 -0600 ++++ gui/siminterface.cc 2017-05-05 09:48:30.169046100 -0500 +@@ -1590,7 +1590,7 @@ + return bx_gui->bx_printf(buf); + } + } +- return printf(buf); ++ return printf("%s", buf); + } + + char* bx_real_sim_c::bx_gets(char *s, int size, FILE *stream) diff --git a/bochs-usb.patch b/bochs-usb.patch new file mode 100644 index 0000000..6ff5f1b --- /dev/null +++ b/bochs-usb.patch @@ -0,0 +1,10 @@ +--- iodev/devices.cc (revision 12882) ++++ iodev/devices.cc (working copy) +@@ -180,6 +180,7 @@ + PLUG_load_plugin(pci, PLUGTYPE_CORE); + PLUG_load_plugin(pci2isa, PLUGTYPE_CORE); + #if BX_SUPPORT_PCIUSB ++ PLUG_load_plugin(usb_common, PLUGTYPE_CORE); + if (chipset == BX_PCI_CHIPSET_I440FX) { + // UHCI is a part of the PIIX3, so load / enable it + if (!PLUG_device_present("usb_uhci")) { diff --git a/bochs.spec b/bochs.spec index 621c2f2..48049d6 100644 --- a/bochs.spec +++ b/bochs.spec @@ -1,15 +1,11 @@ %define _hardened_build 1 Name: bochs -Version: 2.6.2 -Release: 12%{?dist} +Version: 2.6.9 +Release: 1%{?dist} Summary: Portable x86 PC emulator -Group: Applications/Emulators License: LGPLv2+ URL: http://bochs.sourceforge.net/ -# Using cvs checkout done 4/29/2010, see upstream bug 2994370 -#Source0: bochs-2.4.5.cvs.tar.gz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz - Patch0: %{name}-0001_bx-qemu.patch #Patch1: %{name}-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch #Patch2: %{name}-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch @@ -20,9 +16,10 @@ Patch4: %{name}-0009_qemu-bios-pci-hotplug-support.patch Patch7: %{name}-nonet-build.patch # Update configure for aarch64 (bz #925112) Patch8: bochs-aarch64.patch +Patch9: bochs-2.6.9-string-format.patch +Patch10: bochs-usb.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libXt-devel libXpm-devel SDL-devel readline-devel byacc +BuildRequires: libXt-devel libXpm-devel SDL2-devel readline-devel byacc BuildRequires: docbook-utils BuildRequires: gtk2-devel %ifarch %{ix86} x86_64 @@ -98,7 +95,9 @@ Header and source files from bochs source. #%patch6 -p1 %patch7 -p0 -z .nonet # Update configure for aarch64 (bz #925112) -%patch8 -p1 +#%patch8 -p1 +%patch9 -p0 +%patch10 -p0 # Fix up some man page paths. sed -i -e 's|/usr/local/share/|%{_datadir}/|' doc/man/*.* @@ -130,12 +129,10 @@ CONFIGURE_FLAGS=" \ --with-nogui \ --with-term \ --with-rfb \ - --with-sdl \ + --with-sdl2 \ --without-wx \ --enable-cpu-level=6 \ --enable-disasm \ - --enable-usb \ - --enable-usb-ohci \ $ARCH_CONFIGURE_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID" @@ -161,7 +158,6 @@ cp BIOS-bochs-latest BIOS-bochs-kvm %install rm -rf $RPM_BUILD_ROOT _installed-docs make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS* ln -s %{_prefix}/share/seavgabios/vgabios-cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/vgabios-cirrus ln -s %{_prefix}/share/seavgabios/vgabios-isavga.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/vgabios-isavga ln -s %{_prefix}/share/seavgabios/vgabios-qxl.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/vgabios-qxl @@ -188,12 +184,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc _installed-docs/* README-* %{_bindir}/bochs -%{_bindir}/bxcommit %{_bindir}/bximage +%{_bindir}/bxhub # Note: must include *.la in %{_libdir}/bochs/plugins/ %{_libdir}/bochs/ %{_mandir}/man1/bochs.1* -%{_mandir}/man1/bxcommit.1* %{_mandir}/man1/bximage.1* %{_mandir}/man5/bochsrc.5* %dir %{_datadir}/bochs/ @@ -204,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_datadir}/bochs/BIOS* %{_datadir}/bochs/vgabios* +%{_datadir}/bochs/VGABIOS* +%{_datadir}/bochs/bios.bin-1.7.5 +%{_datadir}/bochs/SeaBIOS-README %endif @@ -220,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/include/bochs/ %changelog +* Fri May 05 2017 Gwyn Ciesla - 2.6.9-1 +- 2.6.9 + * Fri Feb 10 2017 Fedora Release Engineering - 2.6.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 8b35d70..fc7ab5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82ecaff9826d4f29fa46f3062e2957b8 bochs-2.6.2.tar.gz +SHA512 (bochs-2.6.9.tar.gz) = dfecf3a1bad07f06c2f7bb989d146e4a8eaeca493b598d415f5a4aec2a85eb5524ba417422157608c8b0828832611df487c6923c8f4ad98a147ac089fc514c46