Commit fdbe8a31 authored by Eric Andersen's avatar Eric Andersen
Browse files

more updates to ensure subsequent packages build

parent 3a0a8791

package/xorg/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config BR2_PACKAGE_XORG 
	select BR2_PACKAGE_ZLIB

	select BR2_PACKAGE_LIBPNG

	select BR2_PACKAGE_FREETYPE

	select BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_PKGCONFIG

	help

	  The official X Window system and server.

package/xorg/xorg-config.patch

+4 −3
Original line number Diff line number Diff line 
--- xc/config/cf/host.def~	Thu May 12 15:28:01 MDT 2005

+++ xc/config/cf/host.def	Thu May 12 15:28:01 MDT 2005

@@ -0,0 +1,43 @@

@@ -0,0 +1,44 @@

+#define KDriveXServer		YES

+#define TinyXServer		YES

+#define XfbdevServer		YES
@@ -18,7 +18,8 @@ 
+#define SystemUsrLibDir	/usr/lib

+#define TkLibDir		/usr/lib

+

+#define HasExpat		NO

+#define HasExpat		YES

+#define ExpatDir		REPLACE_STAGING_DIR

+#define XprtServer		NO

+#define BuildXprintClients	NO

+#define TouchScreen		NO

package/xorg/xorg.mk

+5 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \ 
	mkfontscale/mkfontscale mkfontdir/mkfontdir \

	#xterm/xterm



XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \

XORG_LIBS:= Xft fontconfig Xrender Xaw Xmu Xt \

	SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc
@@ -97,9 +97,8 @@ $(XORG_XSERVER): $(XORG_DIR)/.configured 
	touch -c $(XORG_XSERVER)



$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)

	-mkdir -p $(STAGING_DIR)$(TARGET_LIBX)

	rm -f $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig

	ln -fs ../../../lib/pkgconfig $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig

	-mkdir -p $(STAGING_DIR)/usr/X11R6

	ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX)

	( cd $(XORG_DIR); $(MAKE) \

		DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )

	$(SED) 's,/usr/X11R6,$(STAGING_DIR)/usr/X11R6,' $(STAGING_DIR)/usr/X11R6/lib/pkgconfig/*.pc
@@ -144,7 +143,8 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) 
	touch -c $(XORG_LIBX)/libX11.so.6.2





xorg: zlib png pkgconfig freetype $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2

xorg: zlib png pkgconfig expat freetype \

	$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2



xorg-source: $(DL_DIR)/$(XORG_SOURCE)