[arch-commits] Commit in bochs/trunk (2.4.5-fetchcode.patch PKGBUILD)

[Kevin Piché]

    Date: Sunday, June 12, 2011 @ 21:13:14
  Author: kevin
Revision: 127309

upgpkg: bochs 2.4.6-1
Updated to 2.4.6

Modified:
  bochs/trunk/PKGBUILD
Deleted:
  bochs/trunk/2.4.5-fetchcode.patch

-----------------------+
 2.4.5-fetchcode.patch |   45 ---------------------------------------------
 PKGBUILD              |    8 ++------
 2 files changed, 2 insertions(+), 51 deletions(-)

Deleted: 2.4.5-fetchcode.patch
===================================================================
--- 2.4.5-fetchcode.patch	2011-06-13 00:31:54 UTC (rev 127308)
+++ 2.4.5-fetchcode.patch	2011-06-13 01:13:14 UTC (rev 127309)
@@ -1,45 +0,0 @@
---- 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	2011-06-13 00:31:54 UTC (rev 127308)
+++ PKGBUILD	2011-06-13 01:13:14 UTC (rev 127309)
@@ -9,14 +9,12 @@
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://bochs.sourceforge.net/"
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-2.4.5-fetchcode.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 depends=('gcc-libs' 'libxrandr')
-# 'libxpm')
+sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9')
 
 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-3dnow 
   make
@@ -27,5 +25,3 @@
   make prefix=${pkgdir}/usr install
   install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
 }
-sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9'
-            '3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')