- now we have svgalib on all supported archs

[packages/bochs.git] / bochs.spec

diff --git a/bochs.spec b/bochs.spec
index da3932be88477dd17d20d147e80c332a6a94b804..b34982e1cb9c5d46da1df18001852b8a26b76688 100644 (file)
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,27 +1,31 @@
 # TODO:
 #      - more subpackages (plugins)
-
+#
+# Conditional build:
+%bcond_without  svga    # without svgalib support
+#
 Summary:       Portable x86 PC Emulator
 Summary(pl):   Przeno¶ny emulator x86 PC
 Name:          bochs
-Version:       2.0.2
+Version:       2.1.1
 Release:       2
 License:       GPL
 Group:         Applications/Emulators
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: 11bb4e7804f9fef3cda3822f03641b55
-Patch0:                %{name}-cpu.patch
-Patch1:                %{name}-ncurses.patch
-Patch2:                %{name}-wxGTK.patch
+# Source0-md5: 7b21efbe2b56cc15d110993234259b33
+Patch0:                %{name}-ncurses.patch
 URL:           http://bochs.sourceforge.net/
 BuildRequires: SDL-devel
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: docbook-dtd41-sgml
+BuildRequires: gtk+-devel
 BuildRequires: libstdc++-devel
-BuildRequires: svgalib-devel
-BuildRequires: wxGTK-devel
-#vga.pcf.gz
+BuildRequires: ncurses-devel
+%{?with_svga:BuildRequires:    svgalib-devel}
+BuildRequires: wxGTK2-devel
+BuildRequires: zlib-devel
 Requires:      XFree86-fonts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,31 +43,52 @@ Twoim komputerze.
 %prep
 %setup -q
 %patch0        -p1
-%patch1        -p1
-%patch2        -p1
 
 %build
+cp -f /usr/share/automake/config.sub .
 %{__autoconf}
+# --enable-x86-64 (not supported together with --enable-sep)
+# --enable-debugger --enable-iodebug --enable-x86-debugger (slowdowns emulation)
+# --enable-apic (no need to specify, configure will choose best depending on nr cpus)
 %configure \
-       --enable-cdrom \
-       --enable-cpu-level=5 \
-       --enable-vbe \
-       --enable-sb16=linux \
-       --enable-configure-interface \
+       WX_CONFIG=wxgtk2-2.4-config \
+       --enable-config-interface \
        --enable-new-pit \
-       --enable-ne2000 \
        --enable-plugins \
+       --enable-cpu-level=6 \
+       --enable-compressed-hd \
+       --enable-ne2000 \
+       --enable-pci \
+       --enable-usb \
+       --enable-4meg-pages \
+       --enable-pae \
+       --enable-guest2host-tlb \
        --enable-repeat-speedups \
        --enable-icache \
+%ifarch %{ix86}
+       --enable-fast-function-calls \
+%endif
+       --enable-global-pages \
        --enable-host-specific-asms \
+       --enable-ignore-bad-msr \
+       --enable-disasm \
        --enable-all-optimizations \
+       --enable-readline \
+       --enable-instrumentation \
+       --enable-vbe \
+       --enable-fpu \
        --enable-mmx \
+       --enable-3dnow \
        --enable-sse=2 \
+       --enable-sep \
+       --enable-cdrom \
+       --enable-sb16=linux \
+       --enable-gameport \
        --with-x \
        --with-wx \
        --with-rfb \
        --with-sdl \
-       --with-svga \
+       %{?with_svga:-with-svga} \
        --with-x11 \
        --with-term \
        --with-rfb
@@ -82,10 +107,10 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
 
 cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*fonts
-rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*pcf
+#rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*fonts
+#rm -f $RPM_BUILD_ROOT%{_datadir}/bochs/*pcf
 
-find $RPM_BUILD_ROOT -type d -name CVS | xargs rm -rf
+#find $RPM_BUILD_ROOT -type d -name CVS | xargs rm -rf
 
 %clean
 rm -rf $RPM_BUILD_ROOT