From 8b4e24886ae210ca68349a91544ba6da2365c028 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 21 Sep 2007 19:30:53 +0000
Subject: [PATCH] clean up of XOrg-server package

SVN-Revision: 8936
---
 .../xorg-server-X11R7.2/120-xorgcfg.patch     | 12 --------
 .../xorg-server-X11R7.2/130-xorgconfig.patch  | 13 ---------
 .../xorg-server-X11R7.2/140-xfree86.patch     | 11 -------
 XOrg/server/xorg-server-X11R7.2/150-vfb.patch | 12 --------
 .../xorg-server-X11R7.2/160-xnest.patch       | 12 --------
 XOrg/server/xorg-server-X11R7.2/Makefile      |  8 ++---
 .../patches/100-sgml-cross.patch              | 29 -------------------
 .../patches/110-uclibc-lm.patch               | 12 --------
 8 files changed, 4 insertions(+), 105 deletions(-)
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/120-xorgcfg.patch
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/130-xorgconfig.patch
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/140-xfree86.patch
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/150-vfb.patch
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/160-xnest.patch
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/patches/100-sgml-cross.patch
 delete mode 100644 XOrg/server/xorg-server-X11R7.2/patches/110-uclibc-lm.patch

diff --git a/XOrg/server/xorg-server-X11R7.2/120-xorgcfg.patch b/XOrg/server/xorg-server-X11R7.2/120-xorgcfg.patch
deleted file mode 100644
index 638e73b60..000000000
--- a/XOrg/server/xorg-server-X11R7.2/120-xorgcfg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/utils/xorgcfg/Makefile.in xorg-server-X11R7.2-1.2.0/hw/xfree86/utils/xorgcfg/Makefile.in
---- xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/utils/xorgcfg/Makefile.in	2007-09-14 21:34:05.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/hw/xfree86/utils/xorgcfg/Makefile.in	2007-09-14 21:35:49.000000000 +0200
-@@ -474,7 +474,7 @@
- XNEST_LIBS = @XNEST_LIBS@
- XNEST_TRUE = @XNEST_TRUE@
- XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
--XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
-+XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@ -lXdmcp -lXau -shared
- XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
- XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
- XORG_BUS_FREEBSDPCI_FALSE = @XORG_BUS_FREEBSDPCI_FALSE@
diff --git a/XOrg/server/xorg-server-X11R7.2/130-xorgconfig.patch b/XOrg/server/xorg-server-X11R7.2/130-xorgconfig.patch
deleted file mode 100644
index 779c15202..000000000
--- a/XOrg/server/xorg-server-X11R7.2/130-xorgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/utils/xorgconfig/Makefile.in xorg-server-X11R7.2-1.2.0/hw/xfree86/utils/xorgconfig/Makefile.in
---- xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/utils/xorgconfig/Makefile.in	2007-09-14 22:02:33.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/hw/xfree86/utils/xorgconfig/Makefile.in	2007-09-14 22:58:12.000000000 +0200
-@@ -585,7 +585,7 @@
-         -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
-         -DXVERSIONSTRING='"$(PACKAGE_STRING)"'
- 
--xorgconfig_LDADD = @XORGCONFIG_DEP_LIBS@
-+xorgconfig_LDADD = @XORGCONFIG_DEP_LIBS@  -lXdmcp -lXau -shared 
- xorgconfig_SOURCES = \
- 	cards.c		\
- 	cards.h		\
-
diff --git a/XOrg/server/xorg-server-X11R7.2/140-xfree86.patch b/XOrg/server/xorg-server-X11R7.2/140-xfree86.patch
deleted file mode 100644
index 4f121c218..000000000
--- a/XOrg/server/xorg-server-X11R7.2/140-xfree86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/Makefile.in xorg-server-X11R7.2-1.2.0/hw/xfree86/Makefile.in
---- xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/Makefile.in	2007-09-15 15:37:21.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/hw/xfree86/Makefile.in	2007-09-15 15:40:39.000000000 +0200
-@@ -636,6 +636,7 @@
- 
- Xorg_LDADD = $(XORG_LIBS) \
-              @XSERVER_LIBS@ \
-+			 -lfreetype -lz \
- 	     dixmods/libxorgxkb.la
- 
- Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
diff --git a/XOrg/server/xorg-server-X11R7.2/150-vfb.patch b/XOrg/server/xorg-server-X11R7.2/150-vfb.patch
deleted file mode 100644
index 4482352ea..000000000
--- a/XOrg/server/xorg-server-X11R7.2/150-vfb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-server-X11R7.2-1.2.0.orig/hw/vfb/Makefile.in xorg-server-X11R7.2-1.2.0/hw/vfb/Makefile.in
---- xorg-server-X11R7.2-1.2.0.orig/hw/vfb/Makefile.in	2007-09-15 16:12:28.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/hw/vfb/Makefile.in	2007-09-15 16:19:17.000000000 +0200
-@@ -459,7 +459,7 @@
- XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
- XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
- XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
--XSERVER_LIBS = @XSERVER_LIBS@
-+XSERVER_LIBS = @XSERVER_LIBS@ -lfreetype -lz 
- XTRAP_FALSE = @XTRAP_FALSE@
- XTRAP_TRUE = @XTRAP_TRUE@
- XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
diff --git a/XOrg/server/xorg-server-X11R7.2/160-xnest.patch b/XOrg/server/xorg-server-X11R7.2/160-xnest.patch
deleted file mode 100644
index d8dfb4aac..000000000
--- a/XOrg/server/xorg-server-X11R7.2/160-xnest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-server-X11R7.2-1.2.0.orig/hw/xnest/Makefile.in xorg-server-X11R7.2-1.2.0/hw/xnest/Makefile.in
---- xorg-server-X11R7.2-1.2.0.orig/hw/xnest/Makefile.in	2007-09-15 16:52:43.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/hw/xnest/Makefile.in	2007-09-15 17:04:07.000000000 +0200
-@@ -598,7 +598,7 @@
- Xnest_SOURCES = $(SRCS)
- Xnest_LDADD = $(XORG_CORE_LIBS) \
-               $(XNEST_LIBS) \
--              $(XNESTMODULES_LIBS)
-+              $(XNESTMODULES_LIBS)  -lz -lfreetype -lfontenc -shared
- 
- Xnest_LDFLAGS = 
- AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile
index 3abcdf6e1..ff22ccd10 100644
--- a/XOrg/server/xorg-server-X11R7.2/Makefile
+++ b/XOrg/server/xorg-server-X11R7.2/Makefile
@@ -17,6 +17,10 @@ PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/server/xorg-server-X11R7.2-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 
+EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/X11/GL -I${STAGING_DIR}/usr/include/X11/dri/ -I${STAGING_DIR}/usr/include/X11/ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
+
 define Package/xorg-server-X11R7.2/Default
   SECTION:=xorg-server
   CATEGORY:=Xorg
@@ -78,9 +82,6 @@ $(call Package/xorg-server-X11R7.2/Default)
   DEPENDS:=xorg-server-X11R7.2
 endef
 
-EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/X11/GL -I${STAGING_DIR}/usr/include/X11/dri/ -I${STAGING_DIR}/usr/include/X11/ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-
 define Build/Configure
 	(cd $(PKG_BUILD_DIR) \
 		$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
@@ -89,7 +90,6 @@ define Build/Configure
 		$(CONFIGURE_ARGS_XTRA) \
 		$(CONFIGURE_ARGS) \
 		--with-default-font-path=built-ins \
-		as_ac_File=no \
 		);
 endef
 
diff --git a/XOrg/server/xorg-server-X11R7.2/patches/100-sgml-cross.patch b/XOrg/server/xorg-server-X11R7.2/patches/100-sgml-cross.patch
deleted file mode 100644
index e3b4bd2a5..000000000
--- a/XOrg/server/xorg-server-X11R7.2/patches/100-sgml-cross.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xorg-server-X11R7.2-1.2.0.orig/configure	2007-09-09 20:43:17.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/configure	2007-09-09 21:55:49.000000000 +0200
-@@ -26114,23 +26114,10 @@
- 
- XORG_SGML_PATH=$prefix/share/sgml
- HAVE_DEFS_ENT=
-+eval "$as_ac_File=no"
-+echo "$as_me:$LINENO: skipping checking for $XORG_SGML_PATH/X11/defs.ent" >&5
-+echo $ECHO_N "skipping checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6
- 
--as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
--echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6
--if eval "test \"\${$as_ac_File+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  test "$cross_compiling" = yes &&
--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
--   { (exit 1); exit 1; }; }
--if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
--  eval "$as_ac_File=yes"
--else
--  eval "$as_ac_File=no"
--fi
--fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
- if test `eval echo '${'$as_ac_File'}'` = yes; then
diff --git a/XOrg/server/xorg-server-X11R7.2/patches/110-uclibc-lm.patch b/XOrg/server/xorg-server-X11R7.2/patches/110-uclibc-lm.patch
deleted file mode 100644
index 56bd78d05..000000000
--- a/XOrg/server/xorg-server-X11R7.2/patches/110-uclibc-lm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/utils/gtf/Makefile.in xorg-server-X11R7.2-1.2.0/hw/xfree86/utils/gtf/Makefile.in
---- xorg-server-X11R7.2-1.2.0.orig/hw/xfree86/utils/gtf/Makefile.in	2007-09-14 21:23:18.000000000 +0200
-+++ xorg-server-X11R7.2-1.2.0/hw/xfree86/utils/gtf/Makefile.in	2007-09-14 21:23:42.000000000 +0200
-@@ -576,7 +576,7 @@
- xpconfigdir = @xpconfigdir@
- gtf_SOURCES = gtf.c
- gtf_CFLAGS = $(XORG_CFLAGS)
--gtf_LDADD = -lm
-+gtf_LDADD = -lm -lnotimpl
- appmandir = $(APP_MAN_DIR)
- appman_PRE = gtf.man
- appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-- 
2.30.2