bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up of XOrg-server package

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8936 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2007-09-21 19:30:53 +00:00
parent 4fb489d7bf
commit 8689dd5f45
8 changed files with 4 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XOrg/server/xorg-server-X11R7.2/120-xorgcfg.patch
View File

@ -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@

13
XOrg/server/xorg-server-X11R7.2/130-xorgconfig.patch
View File

@ -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 \

11
XOrg/server/xorg-server-X11R7.2/140-xfree86.patch
View File

@ -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)

12
XOrg/server/xorg-server-X11R7.2/150-vfb.patch
View File

@ -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@

12
XOrg/server/xorg-server-X11R7.2/160-xnest.patch
View File

@ -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 \

8
XOrg/server/xorg-server-X11R7.2/Makefile
View File

@ -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

29
XOrg/server/xorg-server-X11R7.2/patches/100-sgml-cross.patch
View File

@ -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

12
XOrg/server/xorg-server-X11R7.2/patches/110-uclibc-lm.patch
View File

@ -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@)