[arch-commits] Commit in bochs/repos/community-x86_64 (3 files)

[Kyle Keen]

    Date: Thursday, September 2, 2021 @ 09:56:25
  Author: kkeen
Revision: 1010554

archrelease: copy trunk to community-x86_64

Added:
  bochs/repos/community-x86_64/PKGBUILD
    (from rev 1010553, bochs/trunk/PKGBUILD)
Deleted:
  bochs/repos/community-x86_64/PKGBUILD
  bochs/repos/community-x86_64/fix-build.patch

-----------------+
 PKGBUILD        |  118 ++++++++++++++++++++++++++----------------------------
 fix-build.patch |   21 ---------
 2 files changed, 57 insertions(+), 82 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-02 09:56:06 UTC (rev 1010553)
+++ PKGBUILD	2021-09-02 09:56:25 UTC (rev 1010554)
@@ -1,61 +0,0 @@
-# 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.11
-pkgrel=1
-pkgdesc="A portable x86 PC emulation software package, including GUI debugger"
-arch=('x86_64')
-url="http://bochs.sourceforge.net/"
-license=('LGPL')
-depends=('gcc-libs' 'libxrandr' 'libxpm' 'gtk2')
-source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "fix-build.patch")
-sha256sums=('63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862'
-            '3c6352bc9b32de00bc68b614b49879b4475ad37620b17573d69526241ef2ab3e')
-
-prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    # 4.X kernel is basically 3.20
-    sed -i 's/2\.6\*|3\.\*)/2.6*|3.*|4.*)/' configure*
-
-    patch -p1 < ../fix-build.patch # https://sourceforge.net/p/bochs/bugs/1411/
-}
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-
-    ./configure \
-        --prefix=/usr \
-        --without-wx \
-        --with-x11 \
-        --with-x \
-        --with-term \
-        --disable-docbook \
-        --enable-cpu-level=6 \
-        --enable-fpu \
-        --enable-3dnow \
-        --enable-disasm \
-        --enable-smp \
-        --enable-x86-64 \
-        --enable-avx \
-	--enable-evex \
-        --enable-long-phy-address \
-        --enable-disasm \
-        --enable-pcidev \
-        --enable-usb \
-        --enable-debugger
-        #--with-sdl
-        #--enable-x86-debugger
-        #--enable-all-optimizations
-        #--enable-plugins
-    sed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile
-    make -j 1
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-    install -Dm644 .bochsrc "$pkgdir/etc/bochsrc-sample.txt"
-}

Copied: bochs/repos/community-x86_64/PKGBUILD (from rev 1010553, bochs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-09-02 09:56:25 UTC (rev 1010554)
@@ -0,0 +1,57 @@
+# 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.7
+pkgrel=1
+pkgdesc="A portable x86 PC emulation software package, including GUI debugger"
+arch=('x86_64')
+url="http://bochs.sourceforge.net/"
+license=('LGPL')
+depends=('gcc-libs' 'libxrandr' 'libxpm' 'gtk2')
+source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a')
+
+prepare() {
+    cd "$srcdir/$pkgname-$pkgver"
+    # 4.X kernel is basically 3.20
+    sed -i 's/2\.6\*|3\.\*)/2.6*|3.*|4.*)/' configure*
+}
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    ./configure \
+        --prefix=/usr \
+        --without-wx \
+        --with-x11 \
+        --with-x \
+        --with-term \
+        --disable-docbook \
+        --enable-cpu-level=6 \
+        --enable-fpu \
+        --enable-3dnow \
+        --enable-disasm \
+        --enable-smp \
+        --enable-x86-64 \
+        --enable-avx \
+	--enable-evex \
+        --enable-long-phy-address \
+        --enable-disasm \
+        --enable-pcidev \
+        --enable-usb \
+        --enable-debugger
+        #--with-sdl
+        #--enable-x86-debugger
+        #--enable-all-optimizations
+        #--enable-plugins
+    sed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile
+    make -j 1
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+    install -Dm644 .bochsrc "$pkgdir/etc/bochsrc-sample.txt"
+}

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2021-09-02 09:56:06 UTC (rev 1010553)
+++ fix-build.patch	2021-09-02 09:56:25 UTC (rev 1010554)
@@ -1,21 +0,0 @@
-Description: Fix the build with SMP enabled
-Origin: https://sourceforge.net/p/bochs/code/13778/
-
-Index: bochs/bx_debug/dbg_main.cc
-===================================================================
---- bochs/bx_debug/dbg_main.cc	(revision 13777)
-+++ bochs/bx_debug/dbg_main.cc	(working copy)
-@@ -1494,11 +1494,11 @@
- {
-   char cpu_param_name[16];
- 
--  Bit32u index = BX_ITLB_INDEX_OF(laddr);
-+  Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
-   sprintf(cpu_param_name, "ITLB.entry%d", index);
-   bx_dbg_show_param_command(cpu_param_name, 0);
- 
--  index = BX_DTLB_INDEX_OF(laddr, 0);
-+  index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
-   sprintf(cpu_param_name, "DTLB.entry%d", index);
-   bx_dbg_show_param_command(cpu_param_name, 0);
- }