From 938b9116f72d2952afbbc0c138463a37644d0574 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 1 Jun 2009 10:53:34 +0200
Subject: enable X11 XVideo Extensions

- add a new libXv package
- optimize xorg-server configuration
- remove some obeolete ipkg files
- enable X11 for mplayer
- fix ruby package
---
 package/xorg-server/Config.in |  2 ++
 package/xorg-server/Makefile  | 52 ++++++++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

(limited to 'package/xorg-server')

diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in
index 99409a37b..23dfc56a8 100644
--- a/package/xorg-server/Config.in
+++ b/package/xorg-server/Config.in
@@ -3,6 +3,7 @@ config ADK_PACKAGE_XORG_SERVER
 	tristate
 	default n
 	select ADK_PACKAGE_XKBCOMP
+	select ADK_PACKAGE_LIBXV
 	select ADK_PACKAGE_XKEYBOARD_CONFIG
 	select ADK_PACKAGE_LIBOPENSSL
 	select ADK_PACKAGE_LIBXKBFILE
@@ -20,5 +21,6 @@ config ADK_PACKAGE_XORG_SERVER
 	select ADK_PACKAGE_LIBXT
 	select ADK_PACKAGE_PIXMAN
 	select ADK_PACKAGE_XF86DGA
+	select ADK_PACKAGE_LIBXXF86DGA
 	help
          http://www.x.org
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 2b6be24a2..9256b48dc 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -17,44 +17,46 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--disable-xinerama \
+CONFIGURE_ARGS+=	\
+			--enable-builtin-fonts \
+			--enable-dga \
+			--enable-xorg \
+			--enable-xv \
+			--disable-afb \
 			--disable-aiglx \
-			--disable-dga \
+			--disable-cfb \
+			--disable-config-hal \
+			--disable-cup \
+			--disable-evi \
+			--disable-dpms \
 			--disable-dri \
+			--disable-dri2 \
+			--disable-freetype \
 			--disable-glx \
-			--disable-xnest \
-			--disable-config-hal \
-			--disable-xvfb \
+			--disable-kdrive-vesa \
 			--disable-mfb \
-			--disable-cfb \
-			--disable-afb \
+			--disable-xace \
 			--disable-xephyr \
-			--disable-xsdl \
-			--enable-freetype \
-			--disable-kdrive-vesa \
-			--disable-xfbdev \
+			--disable-xevie \
+			--disable-xf86bigfont \
+			--disable-xf86misc \
+			--disable-xf86vidmode \
 			--disable-xfake \
-			--disable-xsdl \
-			--disable-afb \
-			--disable-cfb \
-			--disable-mfb \
+			--disable-xfbdev \
+			--disable-xinerama \
 			--disable-xnest \
+			--disable-xprint \
+			--disable-xsdl \
+			--disable-xselinux \
+			--disable-xcsecurity \
 			--disable-xvfb \
-			--disable-xf86bigfont \
-			--disable-glx \
-			--disable-aiglx \
-			--enable-xv \
 			--disable-xvmc \
-			--disable-dri \
-			--disable-xace \
-			--disable-xephyr \
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
-			--with-vendor-web="http://www.openadk.org" \
-			--enable-builtin-fonts
+			--with-vendor-web="http://www.openadk.org"
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
-- 
cgit v1.2.3