[arch-commits] Commit in qemu/repos/extra-i686 (PKGBUILD helper.patch)

[Tobias Powalowski]

    Date: Friday, March 6, 2009 @ 04:46:56
  Author: tpowa
Revision: 29184

update to latest status'

Added:
  qemu/repos/extra-i686/helper.patch
Modified:
  qemu/repos/extra-i686/PKGBUILD

--------------+
 PKGBUILD     |   30 +++++++++++-------------------
 helper.patch |   17 +++++++++++++++++
 2 files changed, 28 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-06 09:32:28 UTC (rev 29183)
+++ PKGBUILD	2009-03-06 09:46:56 UTC (rev 29184)
@@ -1,36 +1,28 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qemu
-pkgver=0.9.1
-pkgrel=16
+pkgver=0.10.0
+pkgrel=1
 _kvmver=84
 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://bellard.org/qemu/"
-depends=('sdl' 'alsa-lib' 'zlib' 'e2fsprogs' 'gnutls>=2.4.1' 'bluez')
-makedepends=('gcc34')
+depends=('sdl' 'alsa-lib' 'esound' 'zlib' 'e2fsprogs' 'gnutls>=2.4.1' 'bluez')
 install=qemu.install
-source=(http://bellard.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
         70-kqemu.rules
         http://downloads.sourceforge.net/kvm/kvm-$_kvmver.tar.gz
-        dirent.patch
+        helper.patch
         kvm-bios.diff)
 
 build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
   unset CFLAGS
-  if [ "${CARCH}" = "x86_64" ]; then
-	sed -i -e 's/lib64/lib/g' x86_64.ld || return 1
-        # any "xxx-user" target seems to not build on x86_64
-         ./configure --prefix=/usr --enable-alsa \
-                     --target-list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu"
-  else 
-         ./configure --prefix=/usr --enable-alsa
-  fi
-  # fix compiling
-  patch -Np0 -i ../dirent.patch || return 1
+  sed -i -e 's/lib64/lib/g' x86_64.ld || return 1
+  ./configure --prefix=/usr --audio-drv-list=oss,alsa,sdl,esd
+  patch -Np1 -i ../helper.patch || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
   install -D -m644 ${srcdir}/70-kqemu.rules \
@@ -40,7 +32,7 @@
     cd ${srcdir}/kvm-$_kvmver
     # fix bios versions
     patch -Np1 -i ../kvm-bios.diff || return 1
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --audio-drv-list=oss,alsa,sdl,esd
   # fix sdl compilation, JON: and extboot
     sed -i -e 's#-rpath,/usr/lib#-rpath,/usr/lib,-rpath,/lib#g' qemu/config-host.mak
     for dir in libkvm user qemu extboot; do
@@ -62,8 +54,8 @@
    install -D -m644 ${srcdir}/kvm-$_kvmver/extboot/extboot.bin \
 	${pkgdir}/usr/share/qemu/extboot-kvm.bin
 }
-md5sums=('6591df8e9270eb358c881de4ebea1262'
+md5sums=('8dc50b834fa3f5f6a17d7bc3d0559e53'
          'ec06591830b8fcf53913f05f3d66f7e5'
          '39b7206ef400845800f081a5b901f757'
-         '4ea5d2609edcca10f927d7ddd233e8d2'
+         'd9e6ec663a43d9a6ef9e3316c4ba85ae'
          '1cdfcbd3cc569eec96a36d7557291fd2')

Added: helper.patch
===================================================================
--- helper.patch	                        (rev 0)
+++ helper.patch	2009-03-06 09:46:56 UTC (rev 29184)
@@ -0,0 +1,17 @@
+--- trunk/target-i386/helper.c	2009/03/05 19:01:21	6688
++++ trunk/target-i386/helper.c	2009/03/05 19:01:28	6689
+@@ -1421,10 +1421,10 @@
+ #else
+     asm volatile("pusha \n\t"
+                  "cpuid \n\t"
+-                 "mov %%eax, 0(%1) \n\t"
+-                 "mov %%ebx, 4(%1) \n\t"
+-                 "mov %%ecx, 8(%1) \n\t"
+-                 "mov %%edx, 12(%1) \n\t"
++                 "mov %%eax, 0(%2) \n\t"
++                 "mov %%ebx, 4(%2) \n\t"
++                 "mov %%ecx, 8(%2) \n\t"
++                 "mov %%edx, 12(%2) \n\t"
+                  "popa"
+                  : : "a"(function), "c"(count), "S"(vec)
+                  : "memory", "cc");