summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2020-02-21 15:59:39 +0100
committerFrederic Bezies2020-02-21 15:59:39 +0100
commit079aa685afb0fa1c2738f9fe36215287c24e07a4 (patch)
tree058af7ee36d91b743ba5d877ee5a3d05c0556f54
parent11a4a1c22b251f849e60d8b79c7ea1d822898fa3 (diff)
downloadaur-079aa685afb0fa1c2738f9fe36215287c24e07a4.tar.gz
February 21st, 2020 update
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
2 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 797b6f04ffa..d700aadcdb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qemu-git
pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
- pkgver = v4.2.0.r1501.gb29c3e23f6
+ pkgver = v4.2.0.r1621.gb651b80822
pkgrel = 1
epoch = 9
url = http://wiki.qemu.org/
@@ -13,12 +13,14 @@ pkgbase = qemu-git
makedepends = ceph
makedepends = libiscsi
makedepends = glusterfs
+ makedepends = python-sphinx
makedepends = git
depends = dtc
depends = virglrenderer
depends = sdl2
depends = vte3
depends = libpulse
+ depends = brltty
depends = seabios
depends = gnutls
depends = libpng
@@ -35,6 +37,8 @@ pkgbase = qemu-git
depends = spice
depends = libcacard
depends = usbredir
+ depends = libslirp
+ depends = libssh
source = git://git.qemu.org/qemu.git
source = qemu-ga.service
source = 65-kvm.rules
@@ -73,6 +77,8 @@ pkgname = qemu-headless-git
depends = spice
depends = libcacard
depends = usbredir
+ depends = libslirp
+ depends = libssh
optdepends = qemu-headless-arch-extra-git: extra architectures support
conflicts = qemu-headless
diff --git a/PKGBUILD b/PKGBUILD
index d44d6780844..be86a05b835 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,17 @@ pkgbase=qemu-git
_gitname=qemu
pkgname=(qemu-git qemu-headless-git qemu-arch-extra-git qemu-headless-arch-extra-git qemu-block-{iscsi-git,rbd-git,gluster-git} qemu-guest-agent-git)
pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=v4.2.0.r1501.gb29c3e23f6
+pkgver=v4.2.0.r1621.gb651b80822
pkgrel=1
epoch=9
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
url="http://wiki.qemu.org/"
-_headlessdeps=(seabios gnutls libpng libaio numactl jemalloc xfsprogs libnfs lzo snappy curl vde2 libcap-ng spice libcacard usbredir)
-depends=(dtc virglrenderer sdl2 vte3 libpulse "${_headlessdeps[@]}")
-makedepends=(spice-protocol python ceph libiscsi glusterfs git)
+_headlessdeps=(seabios gnutls libpng libaio numactl jemalloc xfsprogs libnfs
+ lzo snappy curl vde2 libcap-ng spice libcacard usbredir libslirp
+ libssh)
+depends=(dtc virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}")
+makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx git)
source=(git://git.qemu.org/qemu.git
qemu-ga.service
65-kvm.rules)
@@ -40,7 +42,7 @@ prepare() {
mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
#cd "${srcdir}/${_gitname}"
- sed -i 's/vte-2\.90/vte-2.91/g' configure
+ #sed -i 's/vte-2\.90/vte-2.91/g' configure
}
build() {
@@ -52,6 +54,7 @@ build() {
--disable-sdl \
--disable-gtk \
--disable-vte \
+ --disable-brlapi \
--disable-opengl \
--disable-virglrenderer
}
@@ -70,12 +73,12 @@ _build() (
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/qemu \
- --python=/usr/bin/python \
--smbd=/usr/bin/smbd \
--enable-modules \
--enable-sdl \
--enable-jemalloc \
--disable-werror \
+ --enable-slirp=system \
"${@:2}"
make