From patchwork Mon Jun 20 21:08:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1645769 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LRj5l5Jdmz9sGG for ; Tue, 21 Jun 2022 07:12:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id ADC9C60FF3; Mon, 20 Jun 2022 21:12:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org ADC9C60FF3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CRIf_9Wz2d0g; Mon, 20 Jun 2022 21:12:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id BDDDC60B5A; Mon, 20 Jun 2022 21:12:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BDDDC60B5A X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5786F1BF398 for ; Mon, 20 Jun 2022 21:12:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3F4D460B5A for ; Mon, 20 Jun 2022 21:12:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3F4D460B5A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T9_rYFkyoMos for ; Mon, 20 Jun 2022 21:12:17 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 44C8960AE6 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by smtp3.osuosl.org (Postfix) with ESMTPS id 44C8960AE6 for ; Mon, 20 Jun 2022 21:12:17 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id n1so16020411wrg.12 for ; Mon, 20 Jun 2022 14:12:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCCnv0r97Sgzz86KMgQr2hHtEConOjpQIB69c9buJXc=; b=QCRD8+FyaHhPgvWew4Hxhk4SOS+Z4lP7NPOPv1XxwqtE0NjvBdmGlVuhCsVdRYFH5G imtNZxghlSJyHycaizNrXAmTfjWauuqNzTUarNwDKPSTThafcYBoP35fmx2IF5Qcqir/ BoiG0gPonb8MUyb0CP7hnxHayCeIBUw+cp4KE8Ig4PE/dDa3iIUBHNw2LCFSeEv7RJWc SSF2l8gojZhE8UHvDjFilM5DBxO9E/GGf0s8pVDaPAb75EL934RW1vTKNs48WlKtPKja GZVIR+7ZO2jpCBDXcVh4c/qmwXnaKwDZVjWutGaAAb07q8LRKQjU7IZ7jb61CkGIlTKr rFxg== X-Gm-Message-State: AJIora9ieTB6pdnytaK5APxfEBTpCQA9wRKl50xQz1+DvcHjdzD6dbo0 O9K0CVkbJiUO6vVMAJpIZiwEQssA08A= X-Google-Smtp-Source: AGRyM1v30T/r1SQUq/Fp8YhKVAsCvg588zEcOYP0NT9PgjhLC/zZB1pi8UkxXs+zhD1/vXl7p1bIQA== X-Received: by 2002:a5d:6d46:0:b0:21b:933d:7950 with SMTP id k6-20020a5d6d46000000b0021b933d7950mr3977801wri.679.1655759535067; Mon, 20 Jun 2022 14:12:15 -0700 (PDT) Received: from kali.home (2a01cb088e0b5b002be75de2a1caa253.ipv6.abo.wanadoo.fr. [2a01:cb08:8e0b:5b00:2be7:5de2:a1ca:a253]) by smtp.gmail.com with ESMTPSA id bt28-20020a056000081c00b0020fcc655e4asm13729556wrb.5.2022.06.20.14.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 14:12:14 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 20 Jun 2022 23:08:55 +0200 Message-Id: <20220620210856.771825-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCCnv0r97Sgzz86KMgQr2hHtEConOjpQIB69c9buJXc=; b=p9gPgeBOTDhq8FEDdfvDkpYpUWsFImo1q3mDFswegE4u8EJ5aNAfZ9gwunwp3aDB7t wCYJ43EN39YIKD5BwI5rg0/Yy8KsdTBY/9pGISq0frAnV3juALbeNGuE7R8x3vx/akKt DH2hKwlQWfgNpiCsZ38ltl1ye+sa1zGKLmMoW9kjWD7kvbvSWhxZbDhpi1hkqC5NoNp8 44YHYLxdglpRdtQcWAcC8z037BxP9ks4oPKNCrvtA6qnJniKFme+g7XmAthJMw8JIsYG NtDvpuNuu2uFYeJyKopxkUOhAxyJf9DslEM0yeOcxwTzqkRdORMKnz85IHbtpi1Mh6Jg gzlw== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=p9gPgeBO Subject: [Buildroot] [PATCH 1/2] package/x11r7/xserver_xorg-server: fix xephyr build with kdrive X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Fix the following xephyr build failure with kdrive raised since commit eedbd6f97d51a0049ec512de26541465403ab06f: checking for XEPHYR... no configure: error: Package requirements (xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb xcb-xv) were not met: Package 'xcb-renderutil', required by 'virtual:world', not found Package 'xcb-aux', required by 'virtual:world', not found Package 'xcb-image', required by 'virtual:world', not found Package 'xcb-icccm', required by 'virtual:world', not found Package 'xcb-keysyms', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/baba218c879b67bfbadc9c25d34313abc76397bc - http://autobuild.buildroot.org/results/9471b77db9aefa2fd0e5be61ea84709183511623 Signed-off-by: Fabrice Fontaine --- package/x11r7/xserver_xorg-server/Config.in | 4 ++++ package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 4fb03051dd..daf4d81702 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -85,6 +85,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR bool "Xephyr server" + select BR2_PACKAGE_XCB_UTIL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_WM if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE help Xephyr nested X server; successor to Xnest. diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 0f1779dcab..fa5d2a802d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -84,6 +84,13 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ --disable-glx \ --disable-dri +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),y) +XSERVER_XORG_SERVER_DEPENDENCIES += \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xcb-util-wm +endif else # modular XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive endif From patchwork Mon Jun 20 21:08:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1645770 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LRj5y55KDz9sGG for ; Tue, 21 Jun 2022 07:12:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 861A66100A; Mon, 20 Jun 2022 21:12:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 861A66100A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xUE5jpOcaSLq; Mon, 20 Jun 2022 21:12:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id A4A3460FFC; Mon, 20 Jun 2022 21:12:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A4A3460FFC X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1441F1BF398 for ; Mon, 20 Jun 2022 21:12:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F06BD41914 for ; Mon, 20 Jun 2022 21:12:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F06BD41914 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cA3FBGndxQQE for ; Mon, 20 Jun 2022 21:12:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C0C4E416EF Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by smtp4.osuosl.org (Postfix) with ESMTPS id C0C4E416EF for ; Mon, 20 Jun 2022 21:12:28 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id m16-20020a7bca50000000b0039c8a224c95so6265064wml.2 for ; Mon, 20 Jun 2022 14:12:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yV58Ua1xbOw3pSzn9PnH7aTeWpNfa1x0Pe21DwalMbQ=; b=N669b69SfTqHrrZm376whnRsbzmBZXfZX2RAoPi4dCz4++LjY8ZuFwfmWtKnTzraDj q3/5iWSu9P8Kkm8rETLQ0ajvOYBt25fv09HMLZ1BV1hCdps+uaZchLC69M7io+RgHTyL HQBs7IPT1MNqIN+k/3Ee1jf0UcgbfSyi20OgSNRFROwwrm3E5Rj65q2FPOC+NENr3i5r zyXqFz5a7rnv9Ld+o2RIMZhDOzEDCF/hxL2pnUnriPq8bmaJ84PgfEeczy+M9E/JRJVj lJMtSKMw4LRZTmTJp6m/AiugCgnPjmuIol0cW/7vn0+tbmj1UlM0JLIv2LLjLl/g03nl NUHg== X-Gm-Message-State: AOAM531id8P9hV/UEFtJtecNBbQQUXaVUnWYwdCX/9q6Pr2Ql0cfnkWH fFiB4s0O1VwptkhEyY3Nj/M1XL5+KKY= X-Google-Smtp-Source: ABdhPJxTSgOxoyqNk5iPa0pEnLNvdnROFX00a4I14iE0kH2h6g98FCXGhj5tMs3b4YnhtJA4z6hrFw== X-Received: by 2002:a05:600c:4c06:b0:39c:975a:a548 with SMTP id d6-20020a05600c4c0600b0039c975aa548mr36372254wmp.99.1655759546601; Mon, 20 Jun 2022 14:12:26 -0700 (PDT) Received: from kali.home (2a01cb088e0b5b002be75de2a1caa253.ipv6.abo.wanadoo.fr. [2a01:cb08:8e0b:5b00:2be7:5de2:a1ca:a253]) by smtp.gmail.com with ESMTPSA id bt28-20020a056000081c00b0020fcc655e4asm13729556wrb.5.2022.06.20.14.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 14:12:26 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 20 Jun 2022 23:08:56 +0200 Message-Id: <20220620210856.771825-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220620210856.771825-1-fontaine.fabrice@gmail.com> References: <20220620210856.771825-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yV58Ua1xbOw3pSzn9PnH7aTeWpNfa1x0Pe21DwalMbQ=; b=X+6X8Do/KehB6euA9Dd75DiJk5CzNTUMaSjxhK1yXRHlIf+vlaFReltTXLGXeSs6r+ Hpd1YmqulZn2hvO0NAUc60k2sTtopK/dmYW29mQhd37OYPaIz5HF+VT/XQgTFeNNCrLF OnrN73Z8XNraL6OHcs8Ah/bujSpgaH4Ft9ZHSAqaJdj+Gp1iLln7dfSpD3RxHjNM8qPX bxyKQ6dkPJwVKmXpRbjzQCpoJYFtEamqi/1Us0DXQdsyRSgMCXZ9jr9lo8Ddlc+fxcsC xDlY0U3EtygcdSom+uVsyAvrqZxi5XxaLc20kmxrD8RqywBluFYgu5vEks8n05f4VjJs Qcvg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=X+6X8Do/ Subject: [Buildroot] [PATCH 2/2] package/x11r7/xserver_xorg-server: drop unrecognized option X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" dmx has been dropped since version 21.1.0 and https://gitlab.freedesktop.org/xorg/xserver/-/commit/b3b81c8c2090cd49410960a021baf0d27fdd2ab3 Signed-off-by: Fabrice Fontaine --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index fa5d2a802d..43d2038a8d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -45,7 +45,6 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ --disable-config-hal \ --enable-record \ --disable-xnest \ - --disable-dmx \ --disable-unit-tests \ --with-builder-addr=buildroot@buildroot.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ @@ -165,10 +164,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver endif -ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto XSERVER_XORG_SERVER_DEPENDENCIES += openssl