7.2.0rc0 udpate - deactivate temporarily headless build

2 files changed, 22 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7545ee21e023..75ba5359ef2a 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 = 7.1.0.r1253.g344744e148
+	pkgver = 7.2.0.rc0.r0.g60ab36907d
 	pkgrel = 1
 	epoch = 17
 	url = https://wiki.qemu.org/
@@ -48,6 +48,7 @@ pkgbase = qemu-git
 	makedepends = ndctl
 	makedepends = numactl
 	makedepends = pam
+	makedepends = pixman
 	makedepends = python
 	makedepends = python-sphinx
 	makedepends = python-sphinx_rtd_theme
@@ -161,73 +162,6 @@ pkgname = qemu-git
 	conflicts = qemu-desktop
 	replaces = qemu-kvm
 
-pkgname = qemu-headless-git
-	pkgdesc = QEMU without GUI. Git version.
-	depends = bzip2
-	depends = libbz2.so
-	depends = curl
-	depends = libcurl.so
-	depends = dtc
-	depends = fuse3
-	depends = gcc-libs
-	depends = glib2
-	depends = libgio-2.0.so
-	depends = libglib-2.0.so
-	depends = libgmodule-2.0.so
-	depends = libgobject-2.0.so
-	depends = gnutls
-	depends = libaio
-	depends = libbpf
-	depends = libbpf.so
-	depends = libcacard
-	depends = libcap-ng
-	depends = libcap-ng.so
-	depends = libjpeg
-	depends = libjpeg.so
-	depends = libnfs
-	depends = libpng
-	depends = libsasl
-	depends = libseccomp
-	depends = libseccomp.so
-	depends = libslirp
-	depends = libslirp.so
-	depends = libssh
-	depends = libssh.so
-	depends = libusb
-	depends = libusb-1.0.so
-	depends = liburing
-	depends = liburing.so
-	depends = libxkbcommon
-	depends = libxkbcommon.so
-	depends = lzo
-	depends = ndctl
-	depends = numactl
-	depends = libnuma.so
-	depends = ncurses
-	depends = libncursesw.so
-	depends = pam
-	depends = libpam.so
-	depends = pixman
-	depends = libpixman-1.so
-	depends = seabios
-	depends = snappy
-	depends = spice
-	depends = libspice-server.so
-	depends = systemd-libs
-	depends = libudev.so
-	depends = usbredir
-	depends = vde2
-	depends = zlib
-	depends = zstd
-	depends = libzstd.so
-	optdepends = qemu-headless-arch-extra-git: extra architectures support
-	provides = qemu-headless
-	provides = qemu
-	conflicts = qemu-headless
-	conflicts = qemu
-	conflicts = qemu-base
-	replaces = qemu-kvm
-
 pkgname = qemu-arch-extra-git
 	pkgdesc = QEMU for foreign architectures. Git version.
 	depends = dtc
@@ -275,53 +209,6 @@ pkgname = qemu-arch-extra-git
 	conflicts = qemu-emulators-full
 	options = !strip
 
-pkgname = qemu-headless-arch-extra-git
-	pkgdesc = QEMU without GUI, for foreign architectures. Git version.
-	depends = dtc
-	depends = fuse3
-	depends = gcc-libs
-	depends = gnutls
-	depends = libaio
-	depends = libbpf
-	depends = libbpf.so
-	depends = glib2
-	depends = libgio-2.0.so
-	depends = libglib-2.0.so
-	depends = libgobject-2.0.so
-	depends = libgmodule-2.0.so
-	depends = libjpeg
-	depends = libjpeg.so
-	depends = libpng
-	depends = libsasl
-	depends = libseccomp
-	depends = libseccomp.so
-	depends = libslirp
-	depends = libslirp.so
-	depends = liburing
-	depends = liburing.so
-	depends = lzo
-	depends = ndctl
-	depends = numactl
-	depends = libnuma.so
-	depends = pam
-	depends = libpam.so
-	depends = pixman
-	depends = libpixman-1.so
-	depends = snappy
-	depends = qemu-headless-git
-	depends = systemd-libs
-	depends = libudev.so
-	depends = vde2
-	depends = zlib
-	depends = zstd
-	depends = libzstd.so
-	optdepends = edk2-armvirt: for aarch64 UEFI support
-	optdepends = edk2-ovmf: for ia32 and x64 UEFI support
-	provides = qemu-headless-arch-extra
-	conflicts = qemu-headless-arch-extra
-	conflicts = qemu-emulators-full
-	options = !strip
-
 pkgname = qemu-block-iscsi-git
 	pkgdesc = QEMU iSCSI block module. Git version.
 	depends = glibc
diff --git a/PKGBUILD b/PKGBUILD
index a4458f877679..5034b2cb15b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@ pkgbase=qemu-git
 _gitname=qemu
 pkgname=(
   qemu-git
-  qemu-headless-git
+  #qemu-headless-git
   qemu-arch-extra-git
-  qemu-headless-arch-extra-git
+  #qemu-headless-arch-extra-git
   qemu-block-{iscsi,gluster}-git
   qemu-guest-agent-git
 )
 pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=7.1.0.r1253.g344744e148
+pkgver=7.2.0.rc0.r0.g60ab36907d
 pkgrel=1
 epoch=17
 arch=(i686 x86_64)
@@ -65,6 +65,7 @@ makedepends=(
   ndctl
   numactl
   pam
+  pixman
   python
   python-sphinx
   python-sphinx_rtd_theme
@@ -109,20 +110,20 @@ prepare() {
 build() {
   _build full
 
-  _build headless \
-    --audio-drv-list= \
-    --disable-sdl \
-    --disable-gtk \
-    --disable-vte \
-    --disable-brlapi \
-    --disable-opengl \
-    --disable-dbus-display \
-    --disable-virglrenderer \
-    --disable-alsa \
-    --disable-jack \
-    --disable-oss \
-    --disable-pa \
-    --disable-sdl
+  #_build headless \
+  #  --audio-drv-list= \
+  #  --disable-sdl \
+  #  --disable-gtk \
+  #  --disable-vte \
+  #  --disable-brlapi \
+  #  --disable-opengl \
+  #  --disable-dbus-display \
+  #  --disable-virglrenderer \
+  #  --disable-alsa \
+  #  --disable-jack \
+  #  --disable-oss \
+  #  --disable-pa \
+  #  --disable-sdl
 }
 
 _build() (
@@ -136,8 +137,8 @@ _build() (
     --smbd=/usr/bin/smbd \
     --enable-modules \
     --enable-sdl \
-    --disable-werror \
-    "${@:2}"
+    --disable-werror #\
+    #"${@:2}"
 
   ninja
 )