{"id":808620,"url":"http://patchwork.ozlabs.org/api/patches/808620/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901105023.11108-1-kraxel@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901105023.11108-1-kraxel@redhat.com>","list_archive_url":null,"date":"2017-09-01T10:50:23","name":"pixman: drop submodule","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"348e208c0e81bca015ca15ff8d183683db1bb33a","submitter":{"id":589,"url":"http://patchwork.ozlabs.org/api/people/589/?format=json","name":"Gerd Hoffmann","email":"kraxel@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901105023.11108-1-kraxel@redhat.com/mbox/","series":[{"id":995,"url":"http://patchwork.ozlabs.org/api/series/995/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=995","date":"2017-09-01T10:50:23","name":"pixman: drop submodule","version":1,"mbox":"http://patchwork.ozlabs.org/series/995/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808620/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808620/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=kraxel@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkGHn2qByz9s8J\n\tfor ;\n\tFri, 1 Sep 2017 20:51:00 +1000 (AEST)","from localhost ([::1]:34846 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnjXN-0003U9-TH\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 06:50:57 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49694)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnjWz-0003T6-97\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 06:50:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnjWu-00074f-CD\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 06:50:33 -0400","from mx1.redhat.com ([209.132.183.28]:45246)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnjWu-00074J-1z\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 06:50:28 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id E33BC61481\n\tfor ; Fri, 1 Sep 2017 10:50:26 +0000 (UTC)","from sirius.home.kraxel.org (ovpn-116-70.ams2.redhat.com\n\t[10.36.116.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 69D365C323;\n\tFri, 1 Sep 2017 10:50:24 +0000 (UTC)","by sirius.home.kraxel.org (Postfix, from userid 1000)\n\tid 7915916A891; Fri, 1 Sep 2017 12:50:23 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E33BC61481","From":"Gerd Hoffmann ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 12:50:23 +0200","Message-Id":"<20170901105023.11108-1-kraxel@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tFri, 01 Sep 2017 10:50:27 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH] pixman: drop submodule","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Gerd Hoffmann ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Drop pixman submodule and support for the \"internal\" pixman build.\npixman should be reasonable well established meanwhile that we don't\nneed the fallback submodule any more. While being at it also drop\nsome #ifdefs for pixman versions olter than what we require in\nconfigure anyway.\n\nSigned-off-by: Gerd Hoffmann \n---\n configure | 20 ++------------------\n Makefile | 10 ----------\n ui/qemu-pixman.c | 4 ----\n .gitmodules | 3 ---\n pixman | 1 -\n 5 files changed, 2 insertions(+), 36 deletions(-)\n delete mode 160000 pixman","diff":"diff --git a/configure b/configure\nindex dd73cce62f..73760430b0 100755\n--- a/configure\n+++ b/configure\n@@ -930,8 +930,6 @@ for opt do\n ;;\n --with-system-pixman) pixman=\"system\"\n ;;\n- --without-system-pixman) pixman=\"internal\"\n- ;;\n --without-pixman) pixman=\"none\"\n ;;\n --disable-sdl) sdl=\"no\"\n@@ -3305,8 +3303,6 @@ if test \"$pixman\" = \"\"; then\n pixman=\"none\"\n elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then\n pixman=\"system\"\n- else\n- pixman=\"internal\"\n fi\n fi\n if test \"$pixman\" = \"none\"; then\n@@ -3323,16 +3319,8 @@ elif test \"$pixman\" = \"system\"; then\n pixman_cflags=$($pkg_config --cflags pixman-1)\n pixman_libs=$($pkg_config --libs pixman-1)\n else\n- if test ! -d ${source_path}/pixman/pixman; then\n- error_exit \"pixman >= 0.21.8 not present. Your options:\" \\\n- \" (1) Preferred: Install the pixman devel package (any recent\" \\\n- \" distro should have packages as Xorg needs pixman too).\" \\\n- \" (2) Fetch the pixman submodule, using:\" \\\n- \" git submodule update --init pixman\"\n- fi\n- mkdir -p pixman/pixman\n- pixman_cflags=\"-I\\$(SRC_PATH)/pixman/pixman -I\\$(BUILD_DIR)/pixman/pixman\"\n- pixman_libs=\"-L\\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1\"\n+ error_exit \"pixman >= 0.21.8 not present.\" \\\n+ \"Please install the pixman devel package.\"\n fi\n \n ##########################################\n@@ -6527,10 +6515,6 @@ echo \"QEMU_CFLAGS+=$cflags\" >> $config_target_mak\n \n done # for target in $targets\n \n-if [ \"$pixman\" = \"internal\" ]; then\n- echo \"config-host.h: subdir-pixman\" >> $config_host_mak\n-fi\n-\n if [ \"$dtc_internal\" = \"yes\" ]; then\n echo \"config-host.h: subdir-dtc\" >> $config_host_mak\n fi\ndiff --git a/Makefile b/Makefile\nindex 81447b1f08..280af66628 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -325,15 +325,6 @@ $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak\n subdir-%:\n \t$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=\"$(V)\" TARGET_DIR=\"$*/\" all,)\n \n-subdir-pixman: pixman/Makefile\n-\t$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V=\"$(V)\" all,)\n-\n-pixman/Makefile: $(SRC_PATH)/pixman/configure\n-\t(cd pixman; CFLAGS=\"$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)\" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)\n-\n-$(SRC_PATH)/pixman/configure:\n-\t(cd $(SRC_PATH)/pixman; autoreconf -v --install)\n-\n DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V=\"$(V)\" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt\n DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)\n DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt\n@@ -532,7 +523,6 @@ distclean: clean\n \trm -rf $$d || exit 1 ; \\\n done\n \trm -Rf .sdk\n-\tif test -f pixman/config.log; then $(MAKE) -C pixman distclean; fi\n \tif test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi\n \n KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \\\ndiff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c\nindex 6e8b83add6..6e591ab821 100644\n--- a/ui/qemu-pixman.c\n+++ b/ui/qemu-pixman.c\n@@ -96,17 +96,13 @@ int qemu_pixman_get_type(int rshift, int gshift, int bshift)\n if (bshift == 0) {\n type = PIXMAN_TYPE_ARGB;\n } else {\n-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 21, 8)\n type = PIXMAN_TYPE_RGBA;\n-#endif\n }\n } else if (rshift < gshift && gshift < bshift) {\n if (rshift == 0) {\n type = PIXMAN_TYPE_ABGR;\n } else {\n-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 16, 0)\n type = PIXMAN_TYPE_BGRA;\n-#endif\n }\n }\n return type;\ndiff --git a/.gitmodules b/.gitmodules\nindex 5b0c212622..84c54cdc49 100644\n--- a/.gitmodules\n+++ b/.gitmodules\n@@ -22,9 +22,6 @@\n [submodule \"roms/sgabios\"]\n \tpath = roms/sgabios\n \turl = git://git.qemu-project.org/sgabios.git\n-[submodule \"pixman\"]\n-\tpath = pixman\n-\turl = git://anongit.freedesktop.org/pixman\n [submodule \"dtc\"]\n \tpath = dtc\n \turl = git://git.qemu-project.org/dtc.git\ndiff --git a/pixman b/pixman\ndeleted file mode 160000\nindex 87eea99e44..0000000000\n--- a/pixman\n+++ /dev/null\n@@ -1 +0,0 @@\n-Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0\n","prefixes":[]}