commit: 10849338838c4d28272a13e1412a8c2b89e02889 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Thu Aug 13 22:36:43 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Thu Aug 13 22:36:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10849338
app-emulation/qemu: fix pixman detection for vhost-user-gnu Use patch by Rafael Kitover to fix dependency detection. Fix-by: Rafael Kitover Closes: https://bugs.gentoo.org/735146 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../qemu-5.1.0-pixman-for-vhost-user-gpu.patch | 62 ++++++++++++++++++++++ app-emulation/qemu/qemu-5.1.0.ebuild | 1 + app-emulation/qemu/qemu-9999.ebuild | 1 + 3 files changed, 64 insertions(+) diff --git a/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch b/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch new file mode 100644 index 00000000000..4eb644fde54 --- /dev/null +++ b/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch @@ -0,0 +1,62 @@ +https://bugs.gentoo.org/735146 + +From 4fd46e6cdd976f4aecdc3fbbad728e00a7bc4ee0 Mon Sep 17 00:00:00 2001 +From: Rafael Kitover <rkito...@gmail.com> +Date: Thu, 13 Aug 2020 20:19:24 +0000 +Subject: [PATCH] configure: Require pixman for vhost-user-gpu. + +Use the test from Makefile to check if vhost-user-gpu is being built, +and if so require pixman. + +Signed-off-by: Rafael Kitover <rkito...@gmail.com> +--- + configure | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +--- a/configure ++++ b/configure +@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then + fi + fi + +-########################################## +-# pixman support probe +- +-if test "$softmmu" = "no"; then +- pixman_cflags= +- pixman_libs= +-elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then +- pixman_cflags=$($pkg_config --cflags pixman-1) +- pixman_libs=$($pkg_config --libs pixman-1) +-else +- error_exit "pixman >= 0.21.8 not present." \ +- "Please install the pixman devel package." +-fi +- + ########################################## + # libmpathpersist probe + +@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then + done + fi + ++########################################## ++# pixman support probe ++ ++if test "$softmmu" = "no" && ! test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes"; then ++ pixman_cflags= ++ pixman_libs= ++elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then ++ pixman_cflags=$($pkg_config --cflags pixman-1) ++ pixman_libs=$($pkg_config --libs pixman-1) ++else ++ error_exit "pixman >= 0.21.8 not present." \ ++ "Please install the pixman devel package." ++fi ++ + ########################################## + # libxml2 probe + if test "$libxml2" != "no" ; then +-- +2.28.0 + diff --git a/app-emulation/qemu/qemu-5.1.0.ebuild b/app-emulation/qemu/qemu-5.1.0.ebuild index 7abd42909d8..dc2c1447afa 100644 --- a/app-emulation/qemu/qemu-5.1.0.ebuild +++ b/app-emulation/qemu/qemu-5.1.0.ebuild @@ -224,6 +224,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 "${FILESDIR}"/${PN}-4.2.0-cflags.patch + "${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch ) QA_PREBUILT=" diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 7abd42909d8..dc2c1447afa 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -224,6 +224,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 "${FILESDIR}"/${PN}-4.2.0-cflags.patch + "${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch ) QA_PREBUILT="
