X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbochs.git;a=blobdiff_plain;f=bochs.spec;h=4fb73bfe583a84fdb6495067037fabe62816ea54;hp=7638c764d490700dda667e8fde7c61555a529237;hb=dab63487b3d5fbdde44633cff3e6b52b0c38f450;hpb=3912903fa20d7158cd02861a09964e0bcc4253b3

diff --git a/bochs.spec b/bochs.spec
index 7638c76..4fb73bf 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,21 +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
-Release:	1.2
+Version:	2.2.1
+Release:	2
 License:	GPL
 Group:		Applications/Emulators
-Source0:	http://telia.dl.sourceforge.net/sourceforge/bochs/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/bochs/%{name}-%{version}.tar.gz
+# Source0-md5:	50484c75d8175fcd97a81432ac18fb71
 URL:		http://bochs.sourceforge.net/
+BuildRequires:	SDL-devel
 BuildRequires:	XFree86-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	gtk+2-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	wxGTK-devel
-BuildRequires:	SDL-devel
-BuildRequires: 	svgalib-devel
-#vga.pcf.gz
+BuildRequires:	ncurses-devel
+%{?with_svga:BuildRequires:	svgalib-devel}
+BuildRequires:	wxGTK2-devel
+BuildRequires:	zlib-devel
+BuildRequires:	pkgconfig
 Requires:	XFree86-fonts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,69 +37,102 @@ Windows '95, Minix 2.0, and other OS's, all on your workstation.
 %description -l pl
 Bochs jest przeno¶nym emulatorem x86 PC emuluj±cym wystarczaj±co du¿o
 architektury procesora x86 oraz hardware'u AT i BIOS-u ¿eby uruchomiæ
-DOS-a, Windows'95, Minix 2.0 i inne systemu operacyjne, wszystkie na
+DOS-a, Windows 95, Minix 2.0 i inne systemy operacyjne, wszystkie na
 Twoim komputerze.
 
 %prep
 %setup -q
 
 %build
+cp -f /usr/share/automake/config.sub .
+%{__autoconf}
+CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses `pkg-config gdk-2.0 --cflags`"
+LDFLAGS=`pkg-config gdk-2.0 --libs`
+export CXXFLAGS LDFLAGS
+# --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)
+
+WXGTK2CONFIG=""
+[ -x /usr/bin/wx-gtk2-ansi-config ] && WXGTK2CONFIG=wx-gtk2-ansi-config
+[ -x /usr/bin/wxgtk-2.4-config ] && WXGTK2CONFIG=wxgtk-2.4-config
+
+[ "x$WXGTK2CONFIG" == "x" ] && echo "Can't find wxGTK2 config file!" && exit 1
+
 %configure \
-	--enable-cdrom \
-	--enable-cpu-level=5 \
-	--enable-vbe \
-	--enable-sb16=linux \
-	--enable-configure-interface \
+	WX_CONFIG=$WXGTK2CONFIG \
+	--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-x11
-	
+	%{?with_svga:-with-svga} \
+	--with-x11 \
+	--with-term \
+	--with-rfb
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-    DESTDIR=$RPM_BUILD_ROOT \
-    docdir=%{_docdir}/%{name}-%{version}
+	DESTDIR=$RPM_BUILD_ROOT \
+	docdir=%{_docdir}/%{name}-%{version}
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \
-    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README} \
+	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 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
 
-DIRS=`find $RPM_BUILD_ROOT -type d -name CVS`
-for DIR in $DIRS
-do
-    rm -rf $DIR
-done
+#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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/keymaps
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/keymaps/convertmap.pl
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so.*
 %{_libdir}/%{name}/plugins/*.la
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/keymaps
 %{_datadir}/%{name}/keymaps/*.map
 %{_datadir}/%{name}/*BIOS*
 %{_mandir}/man[15]/*