From nobody Wed May 1 23:03:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504620185896689.5617235780787; Tue, 5 Sep 2017 07:03:05 -0700 (PDT) Received: from localhost ([::1]:59096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpERV-0000uo-06 for importer@patchew.org; Tue, 05 Sep 2017 10:03:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpEPu-0008Kw-KF for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpEPp-00031A-Fx for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14837) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpEPp-0002zz-7k for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A1B36C05A1DB; Tue, 5 Sep 2017 14:01:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-175.ams2.redhat.com [10.36.117.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D8958A70C; Tue, 5 Sep 2017 14:01:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2907697C; Tue, 5 Sep 2017 16:01:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A1B36C05A1DB Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 5 Sep 2017 16:01:15 +0200 Message-Id: <20170905140116.28181-2-kraxel@redhat.com> In-Reply-To: <20170905140116.28181-1-kraxel@redhat.com> References: <20170905140116.28181-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 05 Sep 2017 14:01:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/2] pixman: drop submodule X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop pixman submodule and support for the "internal" pixman build. pixman should be reasonably well established meanwhile so we don't need the fallback submodule any more. While being at it also drop some #ifdefs for pixman versions older than what we require in configure anyway. Signed-off-by: Gerd Hoffmann --- configure | 20 ++------------------ Makefile | 10 ---------- ui/qemu-pixman.c | 4 ---- .gitmodules | 3 --- pixman | 1 - 5 files changed, 2 insertions(+), 36 deletions(-) delete mode 160000 pixman diff --git a/configure b/configure index dd73cce62f..73760430b0 100755 --- a/configure +++ b/configure @@ -930,8 +930,6 @@ for opt do ;; --with-system-pixman) pixman=3D"system" ;; - --without-system-pixman) pixman=3D"internal" - ;; --without-pixman) pixman=3D"none" ;; --disable-sdl) sdl=3D"no" @@ -3305,8 +3303,6 @@ if test "$pixman" =3D ""; then pixman=3D"none" elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; t= hen pixman=3D"system" - else - pixman=3D"internal" fi fi if test "$pixman" =3D "none"; then @@ -3323,16 +3319,8 @@ elif test "$pixman" =3D "system"; then pixman_cflags=3D$($pkg_config --cflags pixman-1) pixman_libs=3D$($pkg_config --libs pixman-1) else - if test ! -d ${source_path}/pixman/pixman; then - error_exit "pixman >=3D 0.21.8 not present. Your options:" \ - " (1) Preferred: Install the pixman devel package (any recent" \ - " distro should have packages as Xorg needs pixman too)." \ - " (2) Fetch the pixman submodule, using:" \ - " git submodule update --init pixman" - fi - mkdir -p pixman/pixman - pixman_cflags=3D"-I\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pix= man" - pixman_libs=3D"-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1" + error_exit "pixman >=3D 0.21.8 not present." \ + "Please install the pixman devel package." fi =20 ########################################## @@ -6527,10 +6515,6 @@ echo "QEMU_CFLAGS+=3D$cflags" >> $config_target_mak =20 done # for target in $targets =20 -if [ "$pixman" =3D "internal" ]; then - echo "config-host.h: subdir-pixman" >> $config_host_mak -fi - if [ "$dtc_internal" =3D "yes" ]; then echo "config-host.h: subdir-dtc" >> $config_host_mak fi diff --git a/Makefile b/Makefile index 81447b1f08..280af66628 100644 --- a/Makefile +++ b/Makefile @@ -325,15 +325,6 @@ $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak subdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" TARGET_= DIR=3D"$*/" all,) =20 -subdir-pixman: pixman/Makefile - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V=3D"$(V)" all= ,) - -pixman/Makefile: $(SRC_PATH)/pixman/configure - (cd pixman; CFLAGS=3D"$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $= (SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared= --enable-static) - -$(SRC_PATH)/pixman/configure: - (cd $(SRC_PATH)/pixman; autoreconf -v --install) - DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_srcdir=3D$(SRC_PATH)/dtc/libfdt DTC_CFLAGS=3D$(CFLAGS) $(QEMU_CFLAGS) DTC_CPPFLAGS=3D-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libf= dt @@ -532,7 +523,6 @@ distclean: clean rm -rf $$d || exit 1 ; \ done rm -Rf .sdk - if test -f pixman/config.log; then $(MAKE) -C pixman distclean; fi if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi =20 KEYMAPS=3Dda en-gb et fr fr-ch is lt modifiers no pt-br sv= \ diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 6e8b83add6..6e591ab821 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -96,17 +96,13 @@ int qemu_pixman_get_type(int rshift, int gshift, int bs= hift) if (bshift =3D=3D 0) { type =3D PIXMAN_TYPE_ARGB; } else { -#if PIXMAN_VERSION >=3D PIXMAN_VERSION_ENCODE(0, 21, 8) type =3D PIXMAN_TYPE_RGBA; -#endif } } else if (rshift < gshift && gshift < bshift) { if (rshift =3D=3D 0) { type =3D PIXMAN_TYPE_ABGR; } else { -#if PIXMAN_VERSION >=3D PIXMAN_VERSION_ENCODE(0, 16, 0) type =3D PIXMAN_TYPE_BGRA; -#endif } } return type; diff --git a/.gitmodules b/.gitmodules index 5b0c212622..84c54cdc49 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule "roms/sgabios"] path =3D roms/sgabios url =3D git://git.qemu-project.org/sgabios.git -[submodule "pixman"] - path =3D pixman - url =3D git://anongit.freedesktop.org/pixman [submodule "dtc"] path =3D dtc url =3D git://git.qemu-project.org/dtc.git diff --git a/pixman b/pixman deleted file mode 160000 index 87eea99e44..0000000000 --- a/pixman +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0 --=20 2.9.3 From nobody Wed May 1 23:03:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504620179228863.4829856919258; Tue, 5 Sep 2017 07:02:59 -0700 (PDT) Received: from localhost ([::1]:59095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpERO-0000o8-9F for importer@patchew.org; Tue, 05 Sep 2017 10:02:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpEPt-0008Kr-Uc for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpEPp-00030y-An for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpEPp-0002zu-5p for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7799F76A1E; Tue, 5 Sep 2017 14:01:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-175.ams2.redhat.com [10.36.117.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CFD98A70E; Tue, 5 Sep 2017 14:01:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3082497D; Tue, 5 Sep 2017 16:01:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7799F76A1E Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 5 Sep 2017 16:01:16 +0200 Message-Id: <20170905140116.28181-3-kraxel@redhat.com> In-Reply-To: <20170905140116.28181-1-kraxel@redhat.com> References: <20170905140116.28181-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 05 Sep 2017 14:01:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/2] pixman: drop configure switches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove pixman switches from configure, should not be needed any more, configure can figure by itself whenever pixman is needed or not. Signed-off-by: Gerd Hoffmann --- configure | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 73760430b0..fdef7e138b 100755 --- a/configure +++ b/configure @@ -282,7 +282,6 @@ curses=3D"" docs=3D"" fdt=3D"" netmap=3D"no" -pixman=3D"" sdl=3D"" sdlabi=3D"" virtfs=3D"" @@ -928,10 +927,6 @@ for opt do # configure to be used by RPM and similar macros that set # lots of directory switches by default. ;; - --with-system-pixman) pixman=3D"system" - ;; - --without-pixman) pixman=3D"none" - ;; --disable-sdl) sdl=3D"no" ;; --enable-sdl) sdl=3D"yes" @@ -3298,24 +3293,10 @@ fi ########################################## # pixman support probe =20 -if test "$pixman" =3D ""; then - if test "$want_tools" =3D "no" -a "$softmmu" =3D "no"; then - pixman=3D"none" - elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; t= hen - pixman=3D"system" - fi -fi -if test "$pixman" =3D "none"; then - if test "$want_tools" !=3D "no" -o "$softmmu" !=3D "no"; then - error_exit "pixman disabled but system emulation or tools build" \ - "enabled. You can turn off pixman only if you also" \ - "disable all system emulation targets and the tools" \ - "build with '--disable-tools --disable-system'." - fi +if test "$want_tools" =3D "no" -a "$softmmu" =3D "no"; then pixman_cflags=3D pixman_libs=3D -elif test "$pixman" =3D "system"; then - # pixman version has been checked above +elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; then pixman_cflags=3D$($pkg_config --cflags pixman-1) pixman_libs=3D$($pkg_config --libs pixman-1) else @@ -5293,7 +5274,6 @@ echo "static build $static" if test "$darwin" =3D "yes" ; then echo "Cocoa support $cocoa" fi -echo "pixman $pixman" echo "SDL support $sdl $(echo_version $sdl $sdlversion)" echo "GTK support $gtk $(echo_version $gtk $gtk_version)" echo "GTK GL support $gtk_gl" --=20 2.9.3