rpms/bochs/devel .cvsignore, 1.3, 1.4 bochs-config.patch, 1.1, 1.2 bochs.spec, 1.7, 1.8 sources, 1.3, 1.4 bochs-buildpaths.patch, 1.1, NONE bochs-fpu-regparm.patch, 1.1, NONE bochs-gtk2.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat May 28 15:36:38 UTC 2005
Author: scop
Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24723
Modified Files:
.cvsignore bochs-config.patch bochs.spec sources
Removed Files:
bochs-buildpaths.patch bochs-fpu-regparm.patch
bochs-gtk2.patch
Log Message:
2.2, enable SDL and 3DNow!, use upstream default display library.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Dec 2004 16:23:17 -0000 1.3
+++ .cvsignore 28 May 2005 15:36:35 -0000 1.4
@@ -1,2 +1,2 @@
dlxlinux4.tar.gz
-bochs-2.1.1.tar.gz
+bochs-2.2.tar.gz
bochs-config.patch:
Index: bochs-config.patch
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bochs-config.patch 8 Nov 2004 04:06:28 -0000 1.1
+++ bochs-config.patch 28 May 2005 15:36:35 -0000 1.2
@@ -1,34 +1,8 @@
---- dlxlinux/bochsrc.txt~ 2002-12-15 00:44:43.000000000 +0200
-+++ dlxlinux/bochsrc.txt 2003-05-20 23:19:50.000000000 +0300
-@@ -22,9 +22,9 @@
+--- dlxlinux/bochsrc.txt~ 2005-03-27 16:29:54.000000000 +0300
++++ dlxlinux/bochsrc.txt 2005-05-28 17:51:14.000000000 +0300
+@@ -27,3 +27,4 @@
+ #display_library: x
+-# other choices: win32 sdl wx carbon amigaos beos macintosh nogui rfb term svga
++# other choices: sdl wx nogui rfb term
++# Note: if you use the sdl display library, disable keyboard mapping below.
- # default config interface is textconfig.
- #config_interface: textconfig
--#config_interface: wx
-+config_interface: wx
-
--#display_library: x
-+display_library: wx
- # other choices: win32 sdl wx carbon amigaos beos macintosh nogui rfb term
-
- # where do we send log messages?
---- .bochsrc~ 2002-12-21 21:30:48.000000000 +0200
-+++ .bochsrc 2003-05-20 23:21:20.000000000 +0300
-@@ -17,7 +17,7 @@
- # the "wx" display library.
- #=======================================================================
- #config_interface: textconfig
--#config_interface: wx
-+config_interface: wx
-
- #=======================================================================
- # DISPLAY_LIBRARY
-@@ -55,7 +55,7 @@
- #display_library: sdl
- #display_library: term
- #display_library: win32
--#display_library: wx
-+display_library: wx
- #display_library: x
-
- #=======================================================================
Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bochs.spec 23 May 2005 00:26:13 -0000 1.7
+++ bochs.spec 28 May 2005 15:36:35 -0000 1.8
@@ -1,25 +1,24 @@
Name: bochs
-Version: 2.1.1
-Release: 3
-
-Summary: Bochs Project x86 PC Emulator
+Version: 2.2
+Release: 1
+Summary: Portable x86 PC emulator
Group: Applications/Emulators
License: LGPL
URL: http://bochs.sourceforge.net/
-Source0: http://download.sourceforge.net/bochs/bochs-2.1.1.tar.gz
+Source0: http://download.sf.net/bochs/%{name}-%{version}.tar.gz
Source1: http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
Patch0: %{name}-nonet-build.patch
-Patch1: %{name}-buildpaths.patch
+Patch1: %{name}-dlxreadme.patch
Patch2: %{name}-config.patch
-Patch3: %{name}-gtk2.patch
-Patch4: %{name}-dlxreadme.patch
-Patch5: %{name}-fpu-regparm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: docbook-utils, wxGTK2-devel, ncurses-devel, dos2unix
+BuildRequires: docbook-utils
+BuildRequires: wxGTK2-devel
+BuildRequires: ncurses-devel
+BuildRequires: dos2unix
BuildRequires: %{__perl}
-%{?_with_sdl:BuildRequires: SDL-devel}
+BuildRequires: SDL-devel
%{?_with_debugger:BuildRequires: readline-devel}
%description
@@ -44,9 +43,11 @@
%setup -q
%patch0 -p0
%patch1 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
+# Uh-oh, great!
+%{__perl} -pi -e \
+ 's|wx_needs_gtk2=0|wx_needs_gtk2=1| ;
+ s|/opt/gnome/include/|%{_includedir}/|' \
+ configure*
# Fix up some man page paths.
%{__perl} -pi -e \
's|/usr/local/share/doc/bochs\b|%{_docdir}/%{name}-%{version}| ;
@@ -56,19 +57,8 @@
%build
-
-# Force linking with ncurses, otherwise the "term" UI won't work.
-export GUI_LINK_OPTS_TERM="-lncurses"
-
-# Force pthreads, the rfb UI needs them and configure fails to add -lpthread.
-export PTHREAD_LIBS=-lpthread
-export PTHREAD_CFLAGS=-pthread
-
-# Notes:
-# - The CPU level, MMX et al affect what the emulator will emulate, they
-# are not properties of the build target architecture.
-# - Using the following options makes the build fail as of 2.1(.1):
-# --enable-3dnow --enable-external-debugger
+# Note: the CPU level, MMX et al affect what the emulator will emulate, they
+# are not properties of the build target architecture.
%configure \
--enable-plugins \
--enable-cpu-level=5 \
@@ -79,6 +69,7 @@
%{?_with_debugger:--enable-debugger} \
--enable-all-optimizations \
--enable-vbe \
+ --enable-3dnow \
--enable-mmx \
--enable-cdrom \
--enable-sb16=linux \
@@ -86,7 +77,7 @@
--with-nogui \
--with-term \
--with-rfb \
- %{?_with_sdl} \
+ --with-sdl \
--with-wx
make %{?_smp_mflags}
@@ -113,28 +104,34 @@
%{_bindir}/bochs
%{_bindir}/bxcommit
%{_bindir}/bximage
-# Note: must include *.la in %{_libdir}/bochs/plugins.
-%{_libdir}/bochs
+# 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
+%dir %{_datadir}/bochs/
%{_datadir}/bochs/*BIOS*
-%{_datadir}/bochs/keymaps
+%{_datadir}/bochs/keymaps/
%files dlxlinux
%defattr(-,root,root,-)
%{_bindir}/bochs-dlx
%{_mandir}/man1/bochs-dlx.1*
-%{_datadir}/bochs/dlxlinux
+%{_datadir}/bochs/dlxlinux/
%changelog
+* Sat May 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2-1
+- 2.2, buildpaths and fpu-regparms patches applied upstream, pthread and
+ ncurses linking hacks no longer needed.
+- Use upstream default display library, wx is clunky with wxGTK2 2.4.x.
+- Enable 3DNow! emulation and the SDL display library.
+
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.1.1-3
- rebuild on all arches
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.1-2
- rebuilt
* Sun Dec 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.1.1-1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Dec 2004 16:23:17 -0000 1.3
+++ sources 28 May 2005 15:36:35 -0000 1.4
@@ -1,2 +1,2 @@
-21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz
-7b21efbe2b56cc15d110993234259b33 bochs-2.1.1.tar.gz
+379269841ae5aef95e4ec56d6d186532 dlxlinux4.tar.gz
+2f0d82bda2193242a2d7ece1917016c1 bochs-2.2.tar.gz
--- bochs-buildpaths.patch DELETED ---
--- bochs-fpu-regparm.patch DELETED ---
--- bochs-gtk2.patch DELETED ---
More information about the fedora-extras-commits
mailing list