diff options
| author | Eric Andersen <andersen@codepoet.org> | 2007-08-10 19:07:51 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2007-08-10 19:07:51 +0000 |
| commit | a7e49eb2af5d2ca6e53fb908fddfddd92696910a (patch) | |
| tree | ef6625168d47591f85f98a2014f61bc697cf2427 /package/xorg | |
| parent | 7aa1c59ebf82bd91a9e2b03178ceb4ce4fbf1b9d (diff) | |
Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't
quite work yet for me, but this clearly is a huge project and not having it
quite work on the first pass is hardly unexpected. We definately want this
stuff in buildroot.
Diffstat (limited to 'package/xorg')
| -rw-r--r-- | package/xorg/Config.in | 5 | ||||
| -rw-r--r-- | package/xorg/xorg.mk | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/xorg/Config.in b/package/xorg/Config.in index f868afdf1..a4fd012ec 100644 --- a/package/xorg/Config.in +++ b/package/xorg/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_XORG help The official X Window system and server. -comment "X.org X Window System disabled, tinyx selected" - depends on BR2_PACKAGE_TINYX - +comment "X.org 6.8.2 X Window System disabled" + depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG7 diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index 6dc3b0461..eaca344d6 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -204,7 +204,7 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/ $(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c $(TARGET_CROSS)gcc -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie -xorg: zlib png pkgconfig expat fontconfig $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \ +xorg: zlib png pkgconfig expat fontconfig libdrm $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \ $(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie xorg-source: $(DL_DIR)/$(XORG_SOURCE) $(DL_DIR)/$(DEJAVU_SOURCE) |