patch

2 files changed, 25 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4c6ef1553d2..13e41d84c205 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
-# Generated by mksrcinfo v8
-# Mi Jun  1 09:39:49 UTC 2016
-pkgbase = qemu-git
-	pkgver = 2.6.0.r45576.500acc9
+pkgbase = qemu-spice-gtk-pa-mic-patch-git
+	pkgver = 2.8.0.r50101.ffe22bf510
 	pkgrel = 1
 	url = http://wiki.qemu.org/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	license = LGPL2.1
+	makedepends = spice
+	makedepends = spice-protocol
 	makedepends = pixman
 	makedepends = libjpeg
 	makedepends = libpng
@@ -41,20 +41,26 @@ pkgbase = qemu-git
 	makedepends = texi2html
 	makedepends = perl
 	makedepends = numactl
+	conflicts = qemu
+	conflicts = qemu-git
 	source = git://git.qemu.org/qemu.git
 	source = qemu.sysusers
 	source = qemu-ga.service
 	source = 65-kvm.rules
 	source = qemu.install
+	source = https://launchpadlibrarian.net/282321876/pulseaudio-microphone-workaround.patch
 	sha256sums = SKIP
 	sha256sums = dd43e2ef062b071a0b9d0d5ea54737f41600ca8a84a8aefbebb1ff09f978acfb
 	sha256sums = 0b4f3283973bb3bc876735f051d8eaab68f0065502a3a5012141fad193538ea1
 	sha256sums = 60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7
 	sha256sums = 0df69a77645c9a05f98635773666b6212084525d7801ef8382242b06baebe5aa
+	sha256sums = 57d87ba45340f9b7f4b70834fc35da25be72cf4092abcc5012e853aa7b37c83a
 
 pkgname = qemu-git
 	pkgdesc = A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. Git version.
 	install = qemu.install
+	depends = spice
+	depends = spice-protocol
 	depends = pixman
 	depends = libjpeg
 	depends = libpng
diff --git a/PKGBUILD b/PKGBUILD
index 5c68de77b080..1020fc9176e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: ajs124 < aur at ajs124 dot de>
+# Maintainer: ajs124 < aur at ajs124 dot de >, saren < saren at wtako dot net >
 # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Frederic Bezies <fredbezies@gmail.com>
 # Contributor: Sébastien "Seblu" Luttringer <seblu@seblu.net>
 
-pkgbase=qemu-git
+pkgbase=qemu-spice-gtk-pa-mic-patch-git
 _gitname=qemu
 pkgname=('qemu-git'
          'qemu-arch-extra-git'
@@ -12,12 +12,13 @@ pkgname=('qemu-git'
          'qemu-block-rbd-git'
          'qemu-block-gluster-git'
          'qemu-guest-agent-git')
-pkgver=2.6.0.r45576.500acc9
+pkgver=2.8.0.r50101.ffe22bf510
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url='http://wiki.qemu.org/'
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+conflicts=('qemu' 'qemu-git')
+makedepends=('spice' 'spice-protocol' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
              'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
              'libgl' 'libpulse' 'libcap-ng' 'libaio' 'libseccomp'
              'libiscsi' 'python2' 'virglrenderer'
@@ -27,12 +28,14 @@ source=(git://git.qemu.org/qemu.git
         qemu.sysusers
         qemu-ga.service
         65-kvm.rules
-        qemu.install)
+        qemu.install
+        https://launchpadlibrarian.net/282321876/pulseaudio-microphone-workaround.patch)
 sha256sums=('SKIP'
             'dd43e2ef062b071a0b9d0d5ea54737f41600ca8a84a8aefbebb1ff09f978acfb'
             '0b4f3283973bb3bc876735f051d8eaab68f0065502a3a5012141fad193538ea1'
             '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7'
-            '0df69a77645c9a05f98635773666b6212084525d7801ef8382242b06baebe5aa')
+            '0df69a77645c9a05f98635773666b6212084525d7801ef8382242b06baebe5aa'
+            '57d87ba45340f9b7f4b70834fc35da25be72cf4092abcc5012e853aa7b37c83a')
 
 _extra_arches=(aarch64 alpha arm armeb cris lm32 m68k microblaze microblazeel mips
 mips64 mips64el mipsel mipsn32 mipsn32el or32 ppc ppc64 ppc64abi32 ppc64le s390x
@@ -43,12 +46,13 @@ petalogix-s3adsp1800.dtb ppc_rom.bin s390-ccw.img slof.bin
 spapr-rtas.bin u-boot.e500)
 
 pkgver() {
-	cd "${srcdir}/$_gitname"
-	echo "$(git describe | sed 's/^v//' | cut -c -5).r$(git rev-list --count master).$(git log -1 --format=%h)"
+    cd "${srcdir}/$_gitname"
+    echo "$(git describe | sed 's/^v//' | cut -c -5).r$(git rev-list --count master).$(git log -1 --format=%h)"
 }
 
 build() {
   cd $_gitname
+  patch -p1 < ../pulseaudio-microphone-workaround.patch
   # qemu vs. make 4 == bad
   export ARFLAGS="rv"
   # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
@@ -57,7 +61,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
               --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
               --enable-docs --libexecdir=/usr/lib/qemu \
-              --disable-gtk --enable-linux-aio --enable-seccomp \
+              --enable-linux-aio --enable-seccomp --enable-spice \
               --localstatedir=/var \
               --enable-tpm --disable-werror \
               --enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
@@ -66,9 +70,9 @@ build() {
 
 package_qemu-git() {
   pkgdesc='A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. Git version.'
-  depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'libgl'
+  depends=('spice' 'spice-protocol' 'pixman' 'libjpeg' 'libpng' 'sdl' 'libgl'
            'gnutls' 'bluez-libs'
-           'usbredir' 'lzo' 'snappy' 'libpulse' 
+           'usbredir' 'lzo' 'snappy' 'libpulse'
            'dtc' 'numactl' 'libnfs' 'libepoxy')
   optdepends=('ovmf: Tianocore UEFI firmware for qemu'
               'samba: SMB/CIFS server support'
@@ -169,5 +173,3 @@ package_qemu-guest-agent-git() {
   install -D $_gitname/qemu-ga "${pkgdir}"/usr/bin/qemu-ga
   install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
 }
-
-# vim:set ts=2 sw=2 et: