resolve merge conflict

3 files changed, 170 insertions, 2 deletions

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index d3fd19175..e81d4b271 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -17,6 +17,10 @@ PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
 			scrnsaverproto resourceproto fontsproto videoproto \
 			compositeproto evieext libxkbfile libXfont pixman \
 			libpciaccess openssl xf86dgaproto
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+PKG_BUILDDEP+=		xf86driproto glproto dri2proto MesaLib
+PKG_DEPENDS+=		xf86driproto glproto dri2proto mesalib
+endif
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/xserver/
 
@@ -24,6 +28,9 @@ PKG_TARGET_DEPENDS:=	!foxboard
 
 CFLINE_XORG_SERVER:=	depends on ADK_TARGET_WITH_VGA
 
+PKG_FLAVOURS:=		WITH_DRI
+PKGFD_WITH_DRI:=	enable DRI/DRI2 support
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -38,8 +45,6 @@ CONFIGURE_ARGS+=	\
 			--disable-aiglx \
 			--disable-config-hal \
 			--disable-dpms \
-			--disable-dri \
-			--disable-dri2 \
 			--disable-glx \
 			--disable-xace \
 			--disable-xephyr \
@@ -58,6 +63,12 @@ CONFIGURE_ARGS+=	\
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
 
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+CONFIGURE_ARGS+=	--enable-dri --enable-dri2
+else
+CONFIGURE_ARGS+=	--disable-dri --disable-dri2
+endif
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
@@ -78,5 +89,9 @@ post-install:
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 	-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
 		$(IDIR_XORG_SERVER)/etc/X11
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
+		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
new file mode 100644
index 000000000..0e3d1974a
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h	2009-08-11 06:00:23.000000000 +0200
++++ xorg-server-1.7.5/hw/xfree86/dri/dri.h	2010-04-21 19:59:22.000000000 +0200
+@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include <pciaccess.h>
+ 
+ #include "scrnintstr.h"
+-#include "xf86dri.h"
++#include <X11/dri/xf86dri.h>
+ 
+ typedef int DRISyncType;
+ 
diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
new file mode 100644
index 000000000..8ee439b75
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
@@ -0,0 +1,142 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/loader/sdksyms.c	2010-02-16 02:42:49.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/loader/sdksyms.c	2010-04-21 19:50:58.000000000 +0200
+@@ -429,8 +429,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &AbortDDX,
+     (void *) &ddxGiveUp,
+     (void *) &TimeSinceLastInputEvent,
+-    (void *) &strlcpy,
+-    (void *) &strlcat,
+     (void *) &LogInit,
+     (void *) &LogClose,
+     (void *) &LogSetParameter,
+@@ -634,7 +632,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &NewCurrentScreen,
+     (void *) &PointerConfinedToScreen,
+     (void *) &GetSpritePosition,
+-    (void *) &XineramaGetCursorScreen,
+     (void *) &GEExtensions,
+     (void *) &GERegisterExtension,
+     (void *) &GEInitEvent,
+@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &PickPointer,
+     (void *) &PickKeyboard,
+     (void *) &IsInterferingGrab,
+-    (void *) &ReinitializeRootWindow,
+     (void *) &ScreenRestructured,
+     (void *) &ffs,
+     (void *) &AddCallback,
+@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &CreateLinearGradientPicture,
+     (void *) &CreateRadialGradientPicture,
+     (void *) &CreateConicalGradientPicture,
+-    (void *) &PanoramiXRenderInit,
+-    (void *) &PanoramiXRenderReset,
+     (void *) &PictTransform_from_xRenderTransform,
+     (void *) &xRenderTransform_from_PictTransform,
+     (void *) &PictureTransformPoint,
+@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &ShmSegType,
+     (void *) &ShmCompletionCode,
+     (void *) &BadShmSegCode,
+-    (void *) &PanoramiXNumScreens,
+-    (void *) &panoramiXdataPtr,
+-    (void *) &PanoramiXPixWidth,
+-    (void *) &PanoramiXPixHeight,
+-    (void *) &PanoramiXTranslateVisualID,
+-    (void *) &PanoramiXConsolidate,
+-    (void *) &PanoramiXCreateConnectionBlock,
+-    (void *) &PanoramiXFindIDByScrnum,
+-    (void *) &XineramaRegisterConnectionBlockCallback,
+-    (void *) &XineramaDeleteResource,
+-    (void *) &XineramaReinitData,
+-    (void *) &XineramaScreenRegions,
+-    (void *) &XRC_DRAWABLE,
+-    (void *) &XRT_WINDOW,
+-    (void *) &XRT_PIXMAP,
+-    (void *) &XRT_GC,
+-    (void *) &XRT_COLORMAP,
+-    (void *) &XineramaVisualsEqualPtr,
+-    (void *) &XineramaGetImageData,
+     (void *) &xf86CreateI2CBusRec,
+     (void *) &xf86DestroyI2CBusRec,
+     (void *) &xf86I2CBusInit,
+@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &noTestExtensions,
+     (void *) &dixScreenOrigins,
+     (void *) &ConnectionInfo,
+-    (void *) &DPMSStandbyTime,
+-    (void *) &DPMSSuspendTime,
+-    (void *) &DPMSOffTime,
+-    (void *) &DPMSPowerLevel,
+-    (void *) &DPMSEnabled,
+-    (void *) &DPMSDisabledSwitch,
+-    (void *) &DPMSCapableFlag,
+-    (void *) &PanoramiXExtensionDisabledHack,
+     (void *) &noCompositeExtension,
+     (void *) &noDamageExtension,
+     (void *) &noDbeExtension,
+-    (void *) &noDPMSExtension,
+-    (void *) &noGlxExtension,
+     (void *) &noScreenSaverExtension,
+     (void *) &noMITShmExtension,
+     (void *) &noRRExtension,
+@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &noResExtension,
+     (void *) &noXFree86DGAExtension,
+     (void *) &noXFree86DRIExtension,
+-    (void *) &noXFree86VidModeExtension,
+     (void *) &noXFixesExtension,
+-    (void *) &noPanoramiXExtension,
+     (void *) &noXvExtension,
+     (void *) &noDRI2Extension,
+     (void *) &defaultTextFont,
+@@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &ProcRRQueryOutputProperty,
+     (void *) &ProcRRConfigureOutputProperty,
+     (void *) &ProcRRDeleteOutputProperty,
+-    (void *) &RRXineramaExtensionInit,
+     (void *) &ExtensionModuleList,
+     (void *) &LoadSubModule,
+     (void *) &UnloadSubModule,
+@@ -1311,8 +1273,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &xf86ReconfigureLayout,
+     (void *) &xf86CVTMode,
+     (void *) &xf86DPMSInit,
+-    (void *) &DPMSSet,
+-    (void *) &DPMSSupported,
+     (void *) &DGAInit,
+     (void *) &DGAReInitModes,
+     (void *) &xf86SetDGAMode,
+@@ -1570,8 +1530,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &DMTModes,
+     (void *) &xf86ConfigFile,
+     (void *) &xf86AllowMouseOpenFail,
+-    (void *) &xf86VidModeDisabled,
+-    (void *) &xf86VidModeAllowNonLocal,
+     (void *) &xf86fpFlag,
+     (void *) &xf86sFlag,
+     (void *) &xf86bsEnableFlag,
+@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &ProcGrabButton,
+     (void *) &ProcUngrabButton,
+     (void *) &ProcRecolorCursor,
+-    (void *) &PostSyntheticMotion,
+     (void *) &SetDefaultFont,
+     (void *) &QueueFontWakeup,
+     (void *) &RemoveFontWakeup,
+@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &SProcUngrabButton,
+     (void *) &SProcUngrabKey,
+     (void *) &SProcWarpPointer,
+-    (void *) &XaceHooks,
+-    (void *) &XaceHook,
+-    (void *) &XaceHookDispatch,
+-    (void *) &XaceHookPropertyAccess,
+-    (void *) &XaceHookSelectionAccess,
+-    (void *) &XaceHookAuditEnd,
+-    (void *) &XaceGetConnectionNumber,
+-    (void *) &XaceIsLocal,
+-    (void *) &XaceCensorImage,
+     (void *) &XkbIndentText,
+     (void *) &XkbAtomText,
+     (void *) &XkbKeysymText,