From: Will Wagner <will_wagner@carallon.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support
Date: Thu, 1 Apr 2010 13:46:45 +0100 [thread overview]
Message-ID: <1270126006-22405-15-git-send-email-will_wagner@carallon.com> (raw)
In-Reply-To: <1270126006-22405-1-git-send-email-will_wagner@carallon.com>
Later version of xserver no longer need configure hack to say where
mesa3d is located.
Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
package/x11r7/xserver_xorg-server/Config.in | 36 ++++++++++---------
.../xserver_xorg-server/xserver_xorg-server.mk | 34 +++++++++++++-----
2 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 86909d1..2342fb5 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,23 +1,26 @@
config BR2_PACKAGE_XSERVER_XORG_SERVER
bool "xorg-server"
- select BR2_PACKAGE_XLIB_LIBXFONT
select BR2_PACKAGE_LIBDRM
+ select BR2_PACKAGE_MCOOKIE
+ select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
- select BR2_PACKAGE_XPROTO_DAMAGEPROTO
- select BR2_PACKAGE_XPROTO_FIXESPROTO
- select BR2_PACKAGE_XPROTO_GLPROTO
- select BR2_PACKAGE_XPROTO_KBPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
+ select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
+ select BR2_PACKAGE_XLIB_LIBPCIACCESS
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXAU
+ select BR2_PACKAGE_XLIB_LIBXCURSOR
+ select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXDMCP
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
+ select BR2_PACKAGE_XLIB_LIBXFONT
+ select BR2_PACKAGE_XLIB_LIBXFT
select BR2_PACKAGE_XLIB_LIBXI
+ select BR2_PACKAGE_XLIB_LIBXINERAMA
+ select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXRES
select BR2_PACKAGE_XLIB_LIBXXF86MISC
@@ -26,9 +29,16 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XLIB_XTRANS
select BR2_PACKAGE_XDATA_XBITMAPS
select BR2_PACKAGE_XPROTO_BIGREQSPROTO
+ select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
+ select BR2_PACKAGE_XPROTO_DAMAGEPROTO
+ select BR2_PACKAGE_XPROTO_DRI2PROTO
select BR2_PACKAGE_XPROTO_EVIEEXT
+ select BR2_PACKAGE_XPROTO_FIXESPROTO
select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_INPUTPROTO
+ select BR2_PACKAGE_XPROTO_KBPROTO
+ select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
select BR2_PACKAGE_XPROTO_RESOURCEPROTO
select BR2_PACKAGE_XPROTO_VIDEOPROTO
@@ -41,12 +51,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO
- select BR2_PACKAGE_PIXMAN
- select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
- select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
+ select BR2_PACKAGE_XUTIL_UTIL_MACROS
depends on !BR2_avr32
help
- xorg-server 1.7.1
+ xorg-server 1.7.5
No description available
comment "xorg-xserver is BROKEN on AVR32"
@@ -58,12 +66,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
help
Don't display root cursor.
-config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
- bool "Use Builtin Fonts"
- depends on BR2_PACKAGE_XSERVER_XORG_SERVER
- help
- Enable/Use Builtin fonts.
-
config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
bool "Enable AIGLX Extension"
depends on BR2_PACKAGE_XSERVER_XORG_SERVER
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 950c2ca..ba8cf9d 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XSERVER_XORG_SERVER_VERSION = 1.7.1
+XSERVER_XORG_SERVER_VERSION = 1.7.5
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
XSERVER_XORG_SERVER_AUTORECONF = NO
@@ -15,11 +15,11 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install
XSERVER_XORG_SERVER_DEPENDENCIES = \
xutil_util-macros \
+ xlib_libpciaccess \
xlib_libXfont \
xlib_libX11 \
xlib_libXau \
xlib_libXdmcp \
- xlib_libXScrnSaver \
xlib_libXext \
xlib_libXfixes \
xlib_libXi \
@@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_bigreqsproto \
xproto_compositeproto \
xproto_damageproto \
+ xproto_dri2proto \
xproto_evieext \
xproto_fixesproto \
xproto_fontsproto \
@@ -69,7 +70,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
-XSERVER_XORG_SERVER_CONF_OPT += --with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" --enable-xorg
+XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
endif
@@ -86,12 +87,6 @@ else
XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor
endif
-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-builtin-fonts
-else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-builtin-fonts
-endif
-
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx
else
@@ -111,7 +106,6 @@ endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
-XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
endif
ifeq ($(BR2_PACKAGE_XPROTO_TRAPPROTO),y)
@@ -124,9 +118,29 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
XSERVER_XORG_SERVER_CONF_OPT += --enable-record
endif
+ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
+XSERVER_XORG_SERVER_CONF_OPT += --disable-xvmc
+endif
+
+ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
+XSERVER_XORG_SERVER_CONF_OPT += --disable-composite
+endif
+
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2
endif
+ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
+XSERVER_XORG_SERVER_CONF_OPT += --enable-screensaver
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-screensaver
+endif
+
+ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
+XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx
+endif
+
+
$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
--
1.7.0
next prev parent reply other threads:[~2010-04-01 12:46 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-01 12:46 [Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19 Will Wagner
2010-04-01 12:46 ` [Buildroot] [PATCH 02/16] pixman: bump version Will Wagner
2010-04-01 12:54 ` Lionel Landwerlin
2010-04-08 19:36 ` Peter Korsgaard
2010-04-08 19:36 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 03/16] mesa3d: bump version and convert to autotools Will Wagner
2010-04-08 19:38 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 04/16] correct name of xapp_xinput.mk Will Wagner
2010-04-08 19:42 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 05/16] xlib_libXau: remove duplicate dependancies Will Wagner
2010-04-01 18:09 ` Thomas Petazzoni
2010-04-08 19:43 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 06/16] pthread-stubs: bump version Will Wagner
2010-04-08 19:44 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 07/16] xproto_dri2proto: " Will Wagner
2010-04-08 19:47 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 08/16] xproto_fontcacheproto: " Will Wagner
2010-04-08 19:50 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 09/16] xproto_xf86miscproto: " Will Wagner
2010-04-08 19:51 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 10/16] xlib_libpciaccess: " Will Wagner
2010-04-08 19:59 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 11/16] xlib_libXfontcache: " Will Wagner
2010-04-08 19:58 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 12/16] xkeyboard-config: " Will Wagner
2010-04-08 19:59 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 13/16] xproto_evieext: " Will Wagner
2010-04-08 20:01 ` Peter Korsgaard
2010-04-01 12:46 ` [Buildroot] [PATCH 14/16] xlib_libXxf86misc: " Will Wagner
2010-04-08 20:02 ` Peter Korsgaard
2010-04-01 12:46 ` Will Wagner [this message]
2010-04-08 20:08 ` [Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support Peter Korsgaard
2010-04-08 22:01 ` Will Wagner
2010-04-14 11:50 ` Will Wagner
2010-04-14 13:00 ` Paulius Zaleckas
2010-04-14 13:09 ` Paulius Zaleckas
2010-04-14 13:52 ` Will Wagner
2010-04-01 12:46 ` [Buildroot] [PATCH 16/16] xdriver_xf86-video-intel: bump version Signed-off-by: Will Wagner <will_wagner@carallon.com> Will Wagner
2010-04-08 20:11 ` Peter Korsgaard
2010-04-01 12:51 ` [Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19 Will Wagner
2010-04-01 19:08 ` Paulius Zaleckas
2010-04-01 21:12 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270126006-22405-15-git-send-email-will_wagner@carallon.com \
--to=will_wagner@carallon.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.