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

Sat Oct 9 04:04:23 UTC 2010

Date: Saturday, October 9, 2010 @ 00:04:21
  Author: kevin
Revision: 94642

upgpkg: bochs 2.4.5-1
Updated to 2.4.5

Added:
  bochs/trunk/2.4.5-fetchcode.patch
Modified:
  bochs/trunk/PKGBUILD
Deleted:
  bochs/trunk/bochs-2.3.7-typo-fixes.patch

------------------------------+
 2.4.5-fetchcode.patch        |   45 +++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                     |   11 ++++++----
 bochs-2.3.7-typo-fixes.patch |   24 ---------------------
 3 files changed, 52 insertions(+), 28 deletions(-)

Added: 2.4.5-fetchcode.patch
===================================================================

--- 2.4.5-fetchcode.patch	                        (rev 0)
+++ 2.4.5-fetchcode.patch	2010-10-09 04:04:21 UTC (rev 94642)
@@ -0,0 +1,45 @@
+--- cpu/fetchdecode.cc.orig	2010-04-16 15:52:44.000000000 -0400
++++ cpu/fetchdecode.cc	2010-10-07 13:23:06.000000000 -0400
+@@ -1,5 +1,5 @@
+ /////////////////////////////////////////////////////////////////////////
+-// $Id: fetchdecode.cc,v 1.266 2010/04/16 19:52:44 sshwarts Exp $
++// $Id: fetchdecode.cc,v 1.267 2010/04/29 21:04:23 sshwarts Exp $
+ /////////////////////////////////////////////////////////////////////////
+ //
+ //  Copyright (C) 2001-2009  The Bochs Project
+@@ -474,7 +474,7 @@
+   /* 0F 0D /wr */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
+   /* 0F 0E /wr */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
+ #if BX_SUPPORT_3DNOW
+-  /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
++  /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR },
+ #else
+   /* 0F 0F /wr */ { 0, BX_IA_ERROR },
+ #endif
+@@ -1025,7 +1025,7 @@
+   /* 0F 0D /dr */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
+   /* 0F 0E /dr */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
+ #if BX_SUPPORT_3DNOW
+-  /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
++  /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR },
+ #else
+   /* 0F 0F /dr */ { 0, BX_IA_ERROR },
+ #endif
+@@ -1583,7 +1583,7 @@
+   /* 0F 0D /wm */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
+   /* 0F 0E /wm */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
+ #if BX_SUPPORT_3DNOW
+-  /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
++  /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR },
+ #else
+   /* 0F 0F /wm */ { 0, BX_IA_ERROR },
+ #endif
+@@ -2134,7 +2134,7 @@
+   /* 0F 0D /dm */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
+   /* 0F 0E /dm */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
+ #if BX_SUPPORT_3DNOW
+-  /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
++  /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR },
+ #else
+   /* 0F 0F /dm */ { 0, BX_IA_ERROR },
+ #endif

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-08 22:09:11 UTC (rev 94641)
+++ PKGBUILD	2010-10-09 04:04:21 UTC (rev 94642)
@@ -3,21 +3,24 @@
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 
 pkgname=bochs
-pkgver=2.4.2
+pkgver=2.4.5
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://bochs.sourceforge.net/"
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+2.4.5-fetchcode.patch)
 depends=('gcc-libs' 'libxpm')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
   ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
-              --enable-fpu --enable-mmx --enable-3dnow --enable-sse --enable-sep || return 1
+              --enable-fpu --enable-3dnow 
   make || return 1
   make prefix=${pkgdir}/usr install
   install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
 }
-sha256sums=('5dd350c8cb1d2ad9b6d90962b48c06bbe9ec189be152a07a6e175e050bf03406')
+sha256sums=('b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616'
+            '3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')

Deleted: bochs-2.3.7-typo-fixes.patch
===================================================================
--- bochs-2.3.7-typo-fixes.patch	2010-10-08 22:09:11 UTC (rev 94641)
+++ bochs-2.3.7-typo-fixes.patch	2010-10-09 04:04:21 UTC (rev 94642)
@@ -1,24 +0,0 @@
-diff -NaurwB bochs-2.3.7.orig/cpu/ia_opcodes.h bochs-2.3.7/cpu/ia_opcodes.h
---- bochs-2.3.7.orig/cpu/ia_opcodes.h	2008-05-30 22:35:08.000000000 +0200
-+++ bochs-2.3.7/cpu/ia_opcodes.h	2008-06-04 14:56:46.000000000 +0200
-@@ -891,7 +891,7 @@
- bx_define_opcode(BX_IA_PF2ID_PqQq, BX_CPU_C::PF2ID_PqQq)
- bx_define_opcode(BX_IA_PF2IW_PqQq, BX_CPU_C::PF2IW_PqQq)
- bx_define_opcode(BX_IA_PFACC_PqQq, BX_CPU_C::PFACC_PqQq)
--bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::BX_PFADD_PqQq)
-+bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::PFADD_PqQq)
- bx_define_opcode(BX_IA_PFCMPEQ_PqQq, BX_CPU_C::PFCMPEQ_PqQq)
- bx_define_opcode(BX_IA_PFCMPGE_PqQq, BX_CPU_C::PFCMPGE_PqQq)
- bx_define_opcode(BX_IA_PFCMPGT_PqQq, BX_CPU_C::PFCMPGT_PqQq)
-diff -NaurwB bochs-2.3.7.orig/iodev/iodebug.h bochs-2.3.7/iodev/iodebug.h
---- bochs-2.3.7.orig/iodev/iodebug.h	2008-05-01 22:46:58.000000000 +0200
-+++ bochs-2.3.7/iodev/iodebug.h	2008-06-04 14:45:50.000000000 +0200
-@@ -18,7 +18,7 @@
-   virtual void init(void);
-   virtual void reset (unsigned type) {}
-   static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data);
--  static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, void *data);
-+  static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data);
- 
- private:
-   static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);


