Skip to content
Snippets Groups Projects
Commit 69cc8956 authored by nfg's avatar nfg
Browse files

upgpkg: 8.1.0-3, add pipewire

parent baf6753a
No related branches found
No related tags found
No related merge requests found
Pipeline #2554 passed
......@@ -8,14 +8,14 @@
# DESCRIPTION ]
pkgbase=qemu
pkgver=8.0.4
pkgver=8.1.0
pkgrel=3
pkgdesc="A generic and open source machine emulator and virtualizer"
url='https://www.qemu.org/'
pkgname=(
qemu-common
qemu-audio-{alsa,dbus,jack,oss,pa,sdl,spice}
qemu-audio-{alsa,dbus,jack,oss,pa,pipewire,sdl,spice}
qemu-block-{curl,dmg,gluster,iscsi,nfs,ssh}
qemu-chardev-{baum,spice}
qemu-docs
......@@ -42,13 +42,16 @@ source=(
qemu-sysusers.conf
65-kvm.rules
99-qemu-guest-agent.rules
$pkgbase-8.1.0-keyutils.patch
)
#--------------------
# BUILD PREPARATION ]
prepare() {
# extract licenses for TCG
prepare() {
# fix detection of keyutils: https://gitlab.com/qemu-project/qemu/-/issues/1842
patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-8.1.0-keyutils.patch
sed -n '1,23p' $pkgbase-$pkgver/tcg/tcg-internal.h > tcg.LICENSE.MIT
sed -n '1,23p' $pkgbase-$pkgver/tcg/arm/tcg-target.c.inc > tcg-arm.LICENSE.MIT
sed -n '1,23p' $pkgbase-$pkgver/tcg/tci/tcg-target.h > tci.LICENSE.MIT
......@@ -77,6 +80,7 @@ makedepends=(
gnutls
gtk3
jack
keyutils
libaio
libbpf
libcacard
......@@ -84,6 +88,7 @@ makedepends=(
libepoxy
libiscsi
libnfs
libpipewire
libpng
libpulse
libsasl
......@@ -104,6 +109,9 @@ makedepends=(
pam
pcre
python
python-distlib
python-setuptools
python-pip
python-sphinx
python-sphinx_rtd_theme
sdl2
......@@ -210,6 +218,7 @@ _qemu_base_optdepends=(
'qemu-audio-jack: for JACK audio driver'
'qemu-audio-oss: for OSS audio driver'
'qemu-audio-pa: for PulseAudio audio driver'
'qemu-audio-pipewire: for PipeWire audio driver'
'qemu-audio-sdl: for SDL audio driver'
'qemu-audio-spice: for spice audio driver'
'qemu-block-curl: for curl block driver'
......@@ -218,9 +227,9 @@ _qemu_base_optdepends=(
'qemu-block-ssh: for SSH block driver'
'qemu-chardev-spice: for the spice chardev driver'
'qemu-desktop: for dependencies commonly used on a desktop'
'qemu-hw-display-qxl: for the QXL display device'
'qemu-hw-display-virtio-vga: for the virtio-vga display device'
'qemu-hw-display-virtio-vga-gl: for the virtio-vga-gl display device'
'qemu-hw-display-qxl: for the QXL display device'
'qemu-hw-display-virtio-gpu: for the virtio-gpu display device'
'qemu-hw-display-virtio-gpu-gl: for the virtio-gpu-gl display device'
'qemu-hw-display-virtio-gpu-pci: for the virtio-gpu-pci display device'
......@@ -244,9 +253,9 @@ _pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
mkdir -vp "$(dirname "$d")"
mv -v "$f" "$d"
rmdir -vp --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
......@@ -344,7 +353,6 @@ package_qemu-common() {
--preserve-argv0 yes
)
license+=(BSD MIT)
depends=(gcc-libs glibc glib2 libglib-2.0.so libgmodule-2.0.so hicolor-icon-theme libcap-ng libcap-ng.so numactl libnuma.so)
backup=(
etc/$pkgbase/bridge.conf
......@@ -416,6 +424,7 @@ package_qemu-common() {
_pick qemu-audio-jack usr/lib/qemu/audio-jack.so
_pick qemu-audio-oss usr/lib/qemu/audio-oss.so
_pick qemu-audio-pa usr/lib/qemu/audio-pa.so
_pick qemu-audio-pipewire usr/lib/qemu/audio-pipewire.so
_pick qemu-audio-sdl usr/lib/qemu/audio-sdl.so
_pick qemu-audio-spice usr/lib/qemu/audio-spice.so
......@@ -585,7 +594,7 @@ package_qemu-audio-dbus() {
package_qemu-audio-jack() {
pkgdesc="QEMU JACK audio driver"
depends=(jack libjack.so glibc qemu-common=$pkgver-$pkgrel)
depends=(glibc jack libjack.so qemu-common=$pkgver-$pkgrel)
mv -v $pkgname/* "$pkgdir"
}
......@@ -601,6 +610,12 @@ package_qemu-audio-pa() {
mv -v $pkgname/* "$pkgdir"
}
package_qemu-audio-pipewire() {
pkgdesc="QEMU PipeWire audio driver"
depends=(gcc-libs glibc libpipewire libpipewire-0.3.so qemu-common=$pkgver-$pkgrel)
mv -v $pkgname/* "$pkgdir"
}
package_qemu-audio-sdl() {
pkgdesc="QEMU SDL audio driver"
depends=(glibc qemu-common=$pkgver-$pkgrel sdl2)
......@@ -657,7 +672,7 @@ package_qemu-chardev-baum() {
package_qemu-chardev-spice() {
pkgdesc="QEMU spice chardev driver"
depends=(libspice-server.so glibc qemu-common=$pkgver-$pkgrel qemu-ui-spice-core=$pkgver-$pkgrel)
depends=(glibc qemu-common=$pkgver-$pkgrel qemu-ui-spice-core=$pkgver-$pkgrel spice libspice-server.so)
mv -v $pkgname/* "$pkgdir"
}
......@@ -859,7 +874,7 @@ package_qemu-system-rx() {
package_qemu-system-s390x() {
pkgdesc="QEMU system emulator for S390"
depends=("${_qemu_system_deps[@]}" qemu-system-s390x-firmware=$pkgver-$pkgrel)
depends=("${_qemu_system_deps[@]}" qemu-system-s390x-firmware=$pkgver-$pkgrel libudev.so)
mv -v $pkgname/* "$pkgdir"
}
......@@ -1038,7 +1053,6 @@ package_qemu-user-binfmt() {
package_qemu-user-static() {
pkgdesc="QEMU static user mode emulation"
depends=(glibc)
optdepends=('qemu-user-static-binfmt: for binary format rules')
mv -v $pkgname/* "$pkgdir"
}
......@@ -1074,7 +1088,7 @@ package_qemu-desktop() {
pkgdesc="A QEMU setup for desktop environments"
depends=(
qemu-base=$pkgver-$pkgrel
qemu-audio-{alsa,dbus,jack,oss,pa,sdl,spice}=$pkgver-$pkgrel
qemu-audio-{alsa,dbus,jack,oss,pa,pipewire,sdl,spice}=$pkgver-$pkgrel
qemu-block-{curl,dmg,nfs,ssh}=$pkgver-$pkgrel
qemu-chardev-spice=$pkgver-$pkgrel
qemu-hw-display-{qxl,virtio-gpu{,-{gl,pci,pci-gl}}}=$pkgver-$pkgrel
......@@ -1117,10 +1131,33 @@ package_qemu-full() {
# ARCH LICENSE AUTH ]
arch=(x86_64)
license=(GPL2 LGPL2.1)
license=(
Apache-2.0PL
BSD-2-Clause
BSD-3-Clause
FSFAP
GPL-1.0-or-later
GPL-2.0-only
GPL-2.0-or-later
'GPL-2.0-or-later with GCC-exception-2.0 exception'
LGPL-2.0-only
LGPL-2.0-or-later
LGPL-2.1-only
LGPL-2.1-or-later
MIT
public-domain
CC-BY-3.0
)
validpgpkeys=(
'CEACC9E15534EBABB82D3FA03353C9CEF108B584' # Michael Roth <flukshun@gmail.com>
)
sha512sums=('')
sha256sums=('710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55'
'SKIP'
'13deacdf79d5afb01c48984cc3cd5291341ca5b28d43298e804dc511ce581895'
'50aa2cd12098f9683409d33fe13c52c548af40a72155d84c9fb9ada6949b194c'
'36fdb765d3ef4391ac69eecab80fbd760569ed6fdb25543f003cd6b378d796e6'
'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c'
'f2e13f81e52d62154ac9b285d762ecd243a0538c191b549ec2a88b988c83aa36'
'1ef66f2b068d8a9b300635cca1a48b40e60f801e50d55bf7729181d80bc97edd')
diff --git a/meson.build b/meson.build
--- a/meson.build
+++ b/meson.build
@@ -1771,7 +1771,7 @@ if gnutls.found()
method: 'pkg-config')
endif
keyutils = not_found
-if get_option('keyring').enabled()
+if not get_option('keyring').disabled()
keyutils = dependency('libkeyutils', required: false, method: 'pkg-config')
endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment