[arch-commits] Commit in qemu/repos (3 files)

[Tobias Powalowski]

    Date: Monday, December 1, 2008 @ 12:43:12
  Author: tpowa
Revision: 20199

Merged revisions 18122,20198 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/qemu/trunk

........
  r18122 | jgc | 2008-11-03 08:28:10 +0000 (Mo, 03 Nov 2008) | 2 lines
  
  Fix build on x86_64.
........
  r20198 | tpowa | 2008-12-01 17:42:18 +0000 (Mo, 01 Dez 2008) | 1 line
  
  upgpkg: qemu 0.9.1-12
........

Added:
  qemu/repos/testing-x86_64/dirent.patch
    (from rev 20198, qemu/trunk/dirent.patch)
Modified:
  qemu/repos/testing-x86_64/	(properties)
  qemu/repos/testing-x86_64/PKGBUILD

--------------+
 PKGBUILD     |   30 ++++++++++++++----------------
 dirent.patch |   11 +++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)


Property changes on: qemu/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /qemu/trunk:1-15013
   + /qemu/trunk:1-20198

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-12-01 17:42:18 UTC (rev 20198)
+++ testing-x86_64/PKGBUILD	2008-12-01 17:43:12 UTC (rev 20199)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qemu
 pkgver=0.9.1
-pkgrel=11
-_kvmver=76
+pkgrel=12
+_kvmver=79
 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')
@@ -11,26 +11,26 @@
 depends=('sdl' 'alsa-lib' 'zlib' 'e2fsprogs' 'gnutls>=2.4.1' 'bluez')
 makedepends=('gcc34')
 install=qemu.install
-source=(http://bellard.org/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-        70-kqemu.rules \
-        http://downloads.sourceforge.net/kvm/kvm-$_kvmver.tar.gz\
-	kvm-bios.diff
-	ftp://ftp.archlinux.org/other/qemu/pre-77.patch)
+source=(http://bellard.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        70-kqemu.rules
+        http://downloads.sourceforge.net/kvm/kvm-$_kvmver.tar.gz
+        dirent.patch
+        kvm-bios.diff)
 
 build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
   unset CFLAGS
   if [ "${CARCH}" = "x86_64" ]; then
-     # any "xxx-user" target seems to not build on x86_64
+	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 sdl compilation
-  sed -i -e 's#-rpath,/usr/lib#-rpath,/usr/lib,-rpath,/lib#g' config-host.mak
-
+  # fix compiling
+  patch -Np0 -i ../dirent.patch || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
   install -D -m644 ${srcdir}/70-kqemu.rules \
@@ -38,8 +38,6 @@
 
   # we add the kvm/qemu version
     cd ${srcdir}/kvm-$_kvmver
-    # add pre patch to fix weird vga issues
-    patch -Np1 -i ../pre-77.patch || return 1
     # fix bios versions
     patch -Np1 -i ../kvm-bios.diff || return 1
     ./configure --prefix=/usr
@@ -66,6 +64,6 @@
 }
 md5sums=('6591df8e9270eb358c881de4ebea1262'
          'ec06591830b8fcf53913f05f3d66f7e5'
-         '08cf1364e8f02026569a1660e8b8ea01'
-         '1cdfcbd3cc569eec96a36d7557291fd2'
-         'cf1d4b5fc041b63da7ccad94936988a9')
+         '6a59a481201ed91a92105a9b1b339547'
+         '4ea5d2609edcca10f927d7ddd233e8d2'
+         '1cdfcbd3cc569eec96a36d7557291fd2')

Copied: qemu/repos/testing-x86_64/dirent.patch (from rev 20198, qemu/trunk/dirent.patch)
===================================================================
--- testing-x86_64/dirent.patch	                        (rev 0)
+++ testing-x86_64/dirent.patch	2008-12-01 17:43:12 UTC (rev 20199)
@@ -0,0 +1,11 @@
+--- linux-user/syscall.c~	2008-12-01 17:29:10.000000000 +0000
++++ linux-user/syscall.c	2008-12-01 17:29:10.000000000 +0000
+@@ -66,7 +66,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
+ #include <linux/soundcard.h>
+-#include <linux/dirent.h>
++#include <dirent.h>
+ #include <linux/kd.h>
+ 
+ #include "qemu.h"