[arch-commits] Commit in bochs/trunk (PKGBUILD)

[Kyle Keen]

    Date: Tuesday, June 3, 2014 @ 14:08:13
  Author: kkeen
Revision: 112549

upgpkg: bochs 2.6.5-1

Modified:
  bochs/trunk/PKGBUILD

----------+
 PKGBUILD |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-03 10:47:27 UTC (rev 112548)
+++ PKGBUILD	2014-06-03 12:08:13 UTC (rev 112549)
@@ -1,9 +1,10 @@
 # $Id$
-#Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Kevin Piche <kevin at archlinux.org>
 
 pkgname=bochs
-pkgver=2.6.2
+pkgver=2.6.5
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64')
@@ -10,18 +11,45 @@
 url="http://bochs.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs' 'libxrandr')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('82ecaff9826d4f29fa46f3062e2957b8')
+#makedepends=('sdl')
+#optdepends=('sdl: debuggers')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('455020b528ac31477a58779a9a4a96e4')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \
-              --enable-fpu --enable-3dnow --enable-disasm
-  make
+    cd "$srcdir/$pkgname-$pkgver"
+
+    # typos in 2.6.5
+    sed -i 's/Bx3DNowOpcode\[i->modRMForm.Ib/&\[0\]/' cpu/fetchdecode{,64}.cc
+
+    # todo, figure out why debuggers won't build (FS#38274)
+    ./configure \
+        --prefix=/usr \
+        --without-wx \
+        --with-x11 \
+        --disable-docbook \
+        --enable-cpu-level=6 \
+        --enable-fpu \
+        --enable-3dnow \
+        --enable-disasm \
+        --enable-smp \
+        --enable-x86-64 \
+        --enable-avx \
+        --enable-long-phy-address \
+        --enable-disasm \
+        --enable-pcidev \
+        --enable-usb
+        #--with-sdl
+        #--enable-debugger
+        #--enable-x86-debugger
+        #--enable-all-optimizations
+        #--enable-plugins
+    #sed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile
+    make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m 644 .bochsrc "${pkgdir}/etc/bochsrc-sample.txt"
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+    install -Dm644 .bochsrc "$pkgdir/etc/bochsrc-sample.txt"
 }