From 3a3e9897d4e3ce7f7c6ebdf12a1f2aee3ef19dd3 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 10 Jan 2007 23:56:30 +0000
Subject: update xorg build and installation paths

---
 package/xorg/Config.in         |  2 ++
 package/xorg/xorg-config.patch |  4 ++--
 package/xorg/xorg.mk           | 13 ++++---------
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'package')

diff --git a/package/xorg/Config.in b/package/xorg/Config.in
index c334b2d50..35e8ccd23 100644
--- a/package/xorg/Config.in
+++ b/package/xorg/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_XORG
 	depends !BR2_PACKAGE_TINYX
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_PKGCONFIG
 	help
 	  The official X Window system and server.
 
diff --git a/package/xorg/xorg-config.patch b/package/xorg/xorg-config.patch
index 8f6861d8a..a2f49cf9f 100644
--- a/package/xorg/xorg-config.patch
+++ b/package/xorg/xorg-config.patch
@@ -8,8 +8,8 @@
 +#define ProjectRoot		/usr/X11R6
 +#define NothingOutsideProjectRoot	YES
 +
-+#define HasFreetype2		REPLACE_HAS_FREETYPE2
-+#define Freetype2Dir		REPLACE_STAGING_DIR/usr
++#define HasFreetype2		YES
++#define Freetype2Dir		REPLACE_STAGING_DIR
 +#define HasFontconfig		NO
 +#define HasLibpng		YES
 +#define HasZlib			YES
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index 40b2c1c59..37884c5c0 100644
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -41,13 +41,6 @@ XSERVER:=Xorg
 XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
 TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
 
-# Check if we should use FreeType2.
-ifeq ($(BR2_PACKAGE_FREETYPE),y)
-HAS_FREETYPE2=YES
-else
-HAS_FREETYPE2=NO
-endif
-
 # figure out Xorg's idea of corresponding architecture name
 ifeq ($(BR2_alpha),y)
 XARCH=Alpha
@@ -84,7 +77,6 @@ $(XORG_DIR)/.configured: $(DL_DIR)/$(XORG_SOURCE)
 	$(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ \*.patch
 	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_HOST_DEF)
-	$(SED) 's:REPLACE_HAS_FREETYPE2:$(HAS_FREETYPE2):g' $(XORG_HOST_DEF)
 	$(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF)
 	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF)
 	$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF)
@@ -106,8 +98,11 @@ $(XORG_XSERVER): $(XORG_DIR)/.configured
 
 $(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
 	( 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
 	touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
 
 $(TARGET_XSERVER): $(XORG_XSERVER)
@@ -149,7 +144,7 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER)
 	touch -c $(XORG_LIBX)/libX11.so.6.2
 
 
-xorg: zlib png $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(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-source: $(DL_DIR)/$(XORG_SOURCE)
 
-- 
cgit v1.2.3