From patchwork Tue Apr 10 18:24:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ismael Luceno X-Patchwork-Id: 151681 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 494B7B700E for ; Wed, 11 Apr 2012 04:25:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 699A48C902; Tue, 10 Apr 2012 18:25:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LKxlr5oMC4Uj; Tue, 10 Apr 2012 18:25:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A6248CD40; Tue, 10 Apr 2012 18:25:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6CDA88F753 for ; Tue, 10 Apr 2012 18:25:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 58F6D8CD40 for ; Tue, 10 Apr 2012 18:25:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eFTYdh8cfrRa for ; Tue, 10 Apr 2012 18:25:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yw0-f43.google.com (mail-yw0-f43.google.com [209.85.213.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1D0888C902 for ; Tue, 10 Apr 2012 18:25:31 +0000 (UTC) Received: by yhkk6 with SMTP id k6so122243yhk.16 for ; Tue, 10 Apr 2012 11:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=8tCsMpm0Y7Kc0siI5sim8oASeaOHJY9Np6gDhsbA3B8=; b=H5syWGC5NXZ0ZpJ03/HhHRpTmghRjoiv5i5EecsZVYvHKVEvsnBDN8Q/H1gde/dbBX kuInIrs+MIZJ0US8Egt4GdqZCUt1ktyyUSvxzhCDe4vOouOu/KeoQYaG1Uv7lGC+jh3T QPa6tn+hXy+4D0/zQmAEq4IOrtYgpFl6AAibzIhSNK10S1NEauSxAROAVnFcG0TH3FvC uvSK6O92X5hZMAMHwEvq9rE3RK/vzFINIqIHPUGjuErtqI+nqqWDuKyEk1uZJdK7AJVT TPG49N6rDaQ139xhsAv0p9CfUxpt2aYOR3FSmQkUM2UzcjN/16eefoUlmNKjm4UK4gyl vb3Q== Received: by 10.236.136.198 with SMTP id w46mr10395828yhi.68.1334082330088; Tue, 10 Apr 2012 11:25:30 -0700 (PDT) Received: from localhost.localdomain (r190-132-186-241.dialup.mobile.ancel.net.uy. [190.132.186.241]) by mx.google.com with ESMTPS id k17sm178285ann.11.2012.04.10.11.25.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Apr 2012 11:25:29 -0700 (PDT) From: Ismael Luceno To: buildroot@busybox.net Date: Tue, 10 Apr 2012 15:24:07 -0300 Message-Id: <1334082247-17878-1-git-send-email-ismael.luceno@gmail.com> X-Mailer: git-send-email 1.7.9.4 Subject: [Buildroot] [PATCH] xserver_xorg-server: Xvfb support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Ismael Luceno --- package/x11r7/xserver_xorg-server/Config.in | 13 +++++++++++-- .../xserver_xorg-server/xserver_xorg-server.mk | 5 +++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index ddc03c6..4e284a0 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -56,14 +56,23 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER comment "xorg-xserver is BROKEN on AVR32" depends on BR2_avr32 +if BR2_PACKAGE_XSERVER_XORG_SERVER + config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR bool "Null root cursor" - depends on BR2_PACKAGE_XSERVER_XORG_SERVER help Don't display root cursor. config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX bool "Enable AIGLX Extension" - depends on BR2_PACKAGE_XSERVER_XORG_SERVER help Enable/Use AIGLX extension. + +comment "Optional Servers" + +config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB + bool "Xvfb server" + help + Virtual frame buffer X server. + +endif diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index df7ba9a..cfacb65 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -57,10 +57,11 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ host-pkg-config XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ - --disable-xnest --disable-xephyr --disable-xvfb \ + --disable-xnest --disable-xephyr \ --with-builder-addr=buildroot@uclibc.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \ - --with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var + --with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var \ + --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg