[arch-commits] Commit in qemu/trunk (4 files)

[Tobias Powalowski]

    Date: Wednesday, May 29, 2013 @ 00:04:38
  Author: tpowa
Revision: 186554

upgpkg: qemu 1.5.0-1

bump to latest version, added libaio, libiscsi and libssec depends

Modified:
  qemu/trunk/65-kvm.rules
  qemu/trunk/PKGBUILD
  qemu/trunk/qemu.install
Deleted:
  qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch

-------------------------------------------------------+
 65-kvm.rules                                          |    1 
 PKGBUILD                                              |   37 ++++++----------
 doc-fix-sheepdog-invalid-texi-table-list-syntax.patch |   30 ------------
 qemu.install                                          |    2 
 4 files changed, 17 insertions(+), 53 deletions(-)

Modified: 65-kvm.rules
===================================================================
--- 65-kvm.rules	2013-05-28 21:18:10 UTC (rev 186553)
+++ 65-kvm.rules	2013-05-28 22:04:38 UTC (rev 186554)
@@ -1 +1,2 @@
 KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-28 21:18:10 UTC (rev 186553)
+++ PKGBUILD	2013-05-28 22:04:38 UTC (rev 186554)
@@ -1,38 +1,33 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qemu
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl' 'python2')
-depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+makedepends=('texi2html' 'perl' 'python2' 'gtk3' 'vte3')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+         'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl'
+         'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+         'libiscsi')
+optdepends=('gtk3: GTK gui'
+            'vte3: GTK gui')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
-        doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
         65-kvm.rules)
 replaces=('qemu-kvm')
 options=(!strip)
 
-prepare()
-{
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld
-  # fix building with tex version 5.0
-  # https://bugs.launchpad.net/qemu/+bug/1130533
-  patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
-}
-
 build ()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"  
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
-              --python=/usr/bin/python2 \
-              --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
+              --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
+              --enable-gtk --with-gtkabi=3.0 --enable-linux-aio --enable-seccomp
               make
 }
 
@@ -57,6 +52,6 @@
     done
 
 }
-md5sums=('eb2d696956324722b5ecfa46e41f9a75'
-         'b431782f310bfc6af4ef21a8068f866b'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
+
+md5sums=('b6f3265b8ed39d77e8f354f35cc26e16'
+         '9d6de26867a05c306157e3d3c612b28a')

Deleted: doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
===================================================================
--- doc-fix-sheepdog-invalid-texi-table-list-syntax.patch	2013-05-28 21:18:10 UTC (rev 186553)
+++ doc-fix-sheepdog-invalid-texi-table-list-syntax.patch	2013-05-28 22:04:38 UTC (rev 186554)
@@ -1,30 +0,0 @@
-diff --git a/qemu-options.hx b/qemu-options.hx
-index 4bc9c85..3af60bf 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked
- devices.
- 
- Syntax for specifying a sheepdog device
-- at table @list
--``sheepdog:<vdiname>''
--
--``sheepdog:<vdiname>:<snapid>''
--
--``sheepdog:<vdiname>:<tag>''
--
--``sheepdog:<host>:<port>:<vdiname>''
--
--``sheepdog:<host>:<port>:<vdiname>:<snapid>''
--
--``sheepdog:<host>:<port>:<vdiname>:<tag>''
-+ at table @code
-+ at item sheepdog:<vdiname>
-+ at item sheepdog:<vdiname>:<snapid>
-+ at item sheepdog:<vdiname>:<tag>
-+ at item sheepdog:<host>:<port>:<vdiname>
-+ at item sheepdog:<host>:<port>:<vdiname>:<snapid>
-+ at item sheepdog:<host>:<port>:<vdiname>:<tag>
- @end table
- 
- Example

Modified: qemu.install
===================================================================
--- qemu.install	2013-05-28 21:18:10 UTC (rev 186553)
+++ qemu.install	2013-05-28 22:04:38 UTC (rev 186554)
@@ -2,8 +2,6 @@
 post_install() {
   #
   groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Add yourself to the group 'kvm'."
 }
 
 post_upgrade() {