From: Jens Muecke Date: Thu, 25 Oct 2007 21:21:50 +0000 (+0000) Subject: make XOrg depend on DISPLAY_SUPPORT instead of TARGET_x86, see [9448] X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=ca496254a5ab8b8ae811d1147c6d9b17b1d425b6 make XOrg depend on DISPLAY_SUPPORT instead of TARGET_x86, see [9448] SVN-Revision: 9449 --- diff --git a/XOrg/app/eterm/Makefile b/XOrg/app/eterm/Makefile index 12e735f2e4..e7ff174ddc 100644 --- a/XOrg/app/eterm/Makefile +++ b/XOrg/app/eterm/Makefile @@ -28,7 +28,7 @@ endef define Package/eterm $(call Package/eterm/Default) TITLE:=eterm - DEPENDS:=+xorg-server-essentials +libXcursor +imlib2 +libast @TARGET_x86 + DEPENDS:=+xorg-server-essentials +libXcursor +imlib2 +libast @DISPLAY_SUPPORT endef define Package/esetroot diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile index b186719955..d9e0942506 100644 --- a/XOrg/app/fluxbox/Makefile +++ b/XOrg/app/fluxbox/Makefile @@ -31,7 +31,7 @@ endef define Package/fluxbox $(call Package/fluxbox/Default) - DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @TARGET_x86 + DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @DISPLAY_SUPPORT TITLE:=fluxbox window manager MENU:=1 endef diff --git a/XOrg/app/template.mk b/XOrg/app/template.mk index 7a87f03e18..38bad9a0c2 100644 --- a/XOrg/app/template.mk +++ b/XOrg/app/template.mk @@ -27,7 +27,7 @@ define Package/@NAME@ SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=@NAME@ URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile index 36b67cf169..e0a541b101 100644 --- a/XOrg/app/xcalc/Makefile +++ b/XOrg/app/xcalc/Makefile @@ -27,7 +27,7 @@ define Package/xcalc SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xcalc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile index 33cb6605fb..c3a61e340d 100644 --- a/XOrg/app/xclipboard/Makefile +++ b/XOrg/app/xclipboard/Makefile @@ -27,7 +27,7 @@ define Package/xclipboard SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xclipboard URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile index de8372e3e5..4e04df9472 100644 --- a/XOrg/app/xdm/Makefile +++ b/XOrg/app/xdm/Makefile @@ -27,7 +27,7 @@ define Package/xdm SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xdm URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile index 9db9c193c9..561f0d3a6f 100644 --- a/XOrg/app/xeyes/Makefile +++ b/XOrg/app/xeyes/Makefile @@ -27,7 +27,7 @@ define Package/xeyes SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xeyes URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile index 8749a5bd84..6d7250a6db 100644 --- a/XOrg/app/xinit/Makefile +++ b/XOrg/app/xinit/Makefile @@ -27,7 +27,7 @@ define Package/xinit SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xinit URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile index d1d5a819a8..11644740f4 100644 --- a/XOrg/app/xlogo/Makefile +++ b/XOrg/app/xlogo/Makefile @@ -27,7 +27,7 @@ define Package/xlogo SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xlogo URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xmessage/Makefile b/XOrg/app/xmessage/Makefile index cd833c0465..7e133b3ed3 100644 --- a/XOrg/app/xmessage/Makefile +++ b/XOrg/app/xmessage/Makefile @@ -27,7 +27,7 @@ define Package/xmessage SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xmessage URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile index a195db36fc..0f661cff38 100644 --- a/XOrg/app/xset/Makefile +++ b/XOrg/app/xset/Makefile @@ -27,7 +27,7 @@ define Package/xset SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xset URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile index 8dec11e1ce..4a036440a8 100644 --- a/XOrg/app/xsetroot/Makefile +++ b/XOrg/app/xsetroot/Makefile @@ -27,7 +27,7 @@ define Package/xsetroot SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} @TARGET_x86 + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xsetroot URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/app/xterm-233/Makefile b/XOrg/app/xterm-233/Makefile index cb640bbbe9..7c043cbb1f 100644 --- a/XOrg/app/xterm-233/Makefile +++ b/XOrg/app/xterm-233/Makefile @@ -22,7 +22,7 @@ define Package/xterm CATEGORY:=Xorg SUBMENU:=terminals TITLE:=xterm - DEPENDS:=+xorg-server-essentials +libncurses @TARGET_x86 + DEPENDS:=+xorg-server-essentials +libncurses @DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/driver/template.mk b/XOrg/driver/template.mk index 4efac2382b..f54a2ef4ab 100644 --- a/XOrg/driver/template.mk +++ b/XOrg/driver/template.mk @@ -21,7 +21,7 @@ define Package/@NAME@ SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @DEP@ @TARGET_x86 + DEPENDS:=+xorg-server @DEP@ @DISPLAY_SUPPORT TITLE:=@NAME@ URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-input-evdev/Makefile b/XOrg/driver/xf86-input-evdev/Makefile index 54d6bc6d9e..d9fd56cd98 100644 --- a/XOrg/driver/xf86-input-evdev/Makefile +++ b/XOrg/driver/xf86-input-evdev/Makefile @@ -21,7 +21,7 @@ define Package/xf86-input-evdev SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-input-evdev URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-input-keyboard/Makefile b/XOrg/driver/xf86-input-keyboard/Makefile index 3e404ae1a5..3225638735 100644 --- a/XOrg/driver/xf86-input-keyboard/Makefile +++ b/XOrg/driver/xf86-input-keyboard/Makefile @@ -21,7 +21,7 @@ define Package/xf86-input-keyboard SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-input-keyboard URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-input-mouse/Makefile b/XOrg/driver/xf86-input-mouse/Makefile index 523c4d6035..52a515979d 100644 --- a/XOrg/driver/xf86-input-mouse/Makefile +++ b/XOrg/driver/xf86-input-mouse/Makefile @@ -21,7 +21,7 @@ define Package/xf86-input-mouse SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-input-mouse URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-video-ati/Makefile b/XOrg/driver/xf86-video-ati/Makefile index c667ffe3ed..c34c3d970b 100644 --- a/XOrg/driver/xf86-video-ati/Makefile +++ b/XOrg/driver/xf86-video-ati/Makefile @@ -21,7 +21,7 @@ define Package/xf86-video-ati SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-video-ati URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-video-fbdev/Makefile b/XOrg/driver/xf86-video-fbdev/Makefile index 64e78c5d3e..7cc884ec85 100644 --- a/XOrg/driver/xf86-video-fbdev/Makefile +++ b/XOrg/driver/xf86-video-fbdev/Makefile @@ -21,7 +21,7 @@ define Package/xf86-video-fbdev SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-video-fbdev URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-video-i810/Makefile b/XOrg/driver/xf86-video-i810/Makefile index 63404edf5e..f341d8f06b 100644 --- a/XOrg/driver/xf86-video-i810/Makefile +++ b/XOrg/driver/xf86-video-i810/Makefile @@ -21,7 +21,7 @@ define Package/xf86-video-i810 SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server +libXvMC @TARGET_x86 + DEPENDS:=+xorg-server +libXvMC @DISPLAY_SUPPORT TITLE:=xf86-video-i810 URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-video-nv/Makefile b/XOrg/driver/xf86-video-nv/Makefile index eb0540a67c..4ddb93259a 100644 --- a/XOrg/driver/xf86-video-nv/Makefile +++ b/XOrg/driver/xf86-video-nv/Makefile @@ -21,7 +21,7 @@ define Package/xf86-video-nv SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-video-nv URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-video-vesa/Makefile b/XOrg/driver/xf86-video-vesa/Makefile index 362ae72d7e..dd69fb88d3 100644 --- a/XOrg/driver/xf86-video-vesa/Makefile +++ b/XOrg/driver/xf86-video-vesa/Makefile @@ -21,7 +21,7 @@ define Package/xf86-video-vesa SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-video-vesa URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/driver/xf86-video-vga/Makefile b/XOrg/driver/xf86-video-vga/Makefile index a67906db61..48f4f70c33 100644 --- a/XOrg/driver/xf86-video-vga/Makefile +++ b/XOrg/driver/xf86-video-vga/Makefile @@ -21,7 +21,7 @@ define Package/xf86-video-vga SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT TITLE:=xf86-video-vga URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile index 491f24be53..ed06305448 100644 --- a/XOrg/font-native/font-util/Makefile +++ b/XOrg/font-native/font-util/Makefile @@ -22,7 +22,7 @@ define Package/font-util CATEGORY:=Xorg SUBMENU:=font-utils TITLE:=misc tool to generate x fonts - DEPENDS:=+xorg-server @TARGET_x86 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile index f3ee239d7d..f3383002cb 100644 --- a/XOrg/font/encodings/Makefile +++ b/XOrg/font/encodings/Makefile @@ -21,7 +21,7 @@ define Package/encodings SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=encodings URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-alias/Makefile b/XOrg/font/font-alias/Makefile index 3eb085d51a..4db472e126 100644 --- a/XOrg/font/font-alias/Makefile +++ b/XOrg/font/font-alias/Makefile @@ -21,7 +21,7 @@ define Package/font-alias SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-alias URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-bh-75dpi/Makefile b/XOrg/font/font-bh-75dpi/Makefile index 6618f58262..3eb9e1de3b 100644 --- a/XOrg/font/font-bh-75dpi/Makefile +++ b/XOrg/font/font-bh-75dpi/Makefile @@ -21,7 +21,7 @@ define Package/font-bh-75dpi SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-bh-75dpi URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-cursor-misc/Makefile b/XOrg/font/font-cursor-misc/Makefile index 1ad0b8c5f5..78a14ac707 100644 --- a/XOrg/font/font-cursor-misc/Makefile +++ b/XOrg/font/font-cursor-misc/Makefile @@ -21,7 +21,7 @@ define Package/font-cursor-misc SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-cursor-misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-daewoo-misc/Makefile b/XOrg/font/font-daewoo-misc/Makefile index e7dec18742..4f9b08e10a 100644 --- a/XOrg/font/font-daewoo-misc/Makefile +++ b/XOrg/font/font-daewoo-misc/Makefile @@ -21,7 +21,7 @@ define Package/font-daewoo-misc SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-daewoo-misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-dec-misc/Makefile b/XOrg/font/font-dec-misc/Makefile index a7a41b39d3..dc3b137d59 100644 --- a/XOrg/font/font-dec-misc/Makefile +++ b/XOrg/font/font-dec-misc/Makefile @@ -21,7 +21,7 @@ define Package/font-dec-misc SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-dec-misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-ibm-type1/Makefile b/XOrg/font/font-ibm-type1/Makefile index fd4b07b064..21650ff8ff 100644 --- a/XOrg/font/font-ibm-type1/Makefile +++ b/XOrg/font/font-ibm-type1/Makefile @@ -21,7 +21,7 @@ define Package/font-ibm-type1 SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-ibm-type1 URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-isas-misc/Makefile b/XOrg/font/font-isas-misc/Makefile index a6f7039dcb..5ea32e1958 100644 --- a/XOrg/font/font-isas-misc/Makefile +++ b/XOrg/font/font-isas-misc/Makefile @@ -21,7 +21,7 @@ define Package/font-isas-misc SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-isas-misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-jis-misc/Makefile b/XOrg/font/font-jis-misc/Makefile index 90b875fb5f..b4c23c5562 100644 --- a/XOrg/font/font-jis-misc/Makefile +++ b/XOrg/font/font-jis-misc/Makefile @@ -21,7 +21,7 @@ define Package/font-jis-misc SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-jis-misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-micro-misc/Makefile b/XOrg/font/font-micro-misc/Makefile index b22182e819..2403de5e63 100644 --- a/XOrg/font/font-micro-misc/Makefile +++ b/XOrg/font/font-micro-misc/Makefile @@ -21,7 +21,7 @@ define Package/font-micro-misc SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-micro-misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-misc-cyrillic/Makefile b/XOrg/font/font-misc-cyrillic/Makefile index 435dded3fd..a87239023b 100644 --- a/XOrg/font/font-misc-cyrillic/Makefile +++ b/XOrg/font/font-misc-cyrillic/Makefile @@ -21,7 +21,7 @@ define Package/font-misc-cyrillic SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-misc-cyrillic URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-misc-misc/Makefile b/XOrg/font/font-misc-misc/Makefile index acb4b76f37..d5c16531dd 100644 --- a/XOrg/font/font-misc-misc/Makefile +++ b/XOrg/font/font-misc-misc/Makefile @@ -26,7 +26,7 @@ endef define Package/font-base $(call Package/font-misc-misc/Default) - DEPENDS:=+xorg-server +font-util @TARGET_x86 + DEPENDS:=+xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-base URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/font-xfree86-type1/Makefile b/XOrg/font/font-xfree86-type1/Makefile index 2ca102c38e..5688116673 100644 --- a/XOrg/font/font-xfree86-type1/Makefile +++ b/XOrg/font/font-xfree86-type1/Makefile @@ -21,7 +21,7 @@ define Package/font-xfree86-type1 SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:= +xorg-server +font-util @TARGET_x86 + DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=font-xfree86-type1 URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/font/template.mk b/XOrg/font/template.mk index 7eed063e78..a3c69aff47 100644 --- a/XOrg/font/template.mk +++ b/XOrg/font/template.mk @@ -21,7 +21,7 @@ define Package/@NAME@ SECTION:=xorg-font CATEGORY:=Xorg SUBMENU:=font - DEPENDS:=@DEP@ +xorg-server +font-util @TARGET_x86 + DEPENDS:=@DEP@ +xorg-server +font-util @DISPLAY_SUPPORT TITLE:=@NAME@ URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/headers/native/Makefile b/XOrg/headers/native/Makefile index b774595afc..800c31c305 100644 --- a/XOrg/headers/native/Makefile +++ b/XOrg/headers/native/Makefile @@ -20,7 +20,7 @@ define Package/xorg-headers-native SUBMENU:=headers TITLE:=xorg-headers-native URL:=http://xorg.freedesktop.org/ - DEPENDS:=@TARGET_x86 + DEPENDS:=@DISPLAY_SUPPORT endef define Build/Prepare diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk-1.2.10/Makefile index d6f43ccf0f..cdc7d5c82a 100644 --- a/XOrg/lib/gtk-1.2.10/Makefile +++ b/XOrg/lib/gtk-1.2.10/Makefile @@ -33,7 +33,7 @@ define Package/gtk-1.2.10 CATEGORY:=Xorg SUBMENU:=framework TITLE:=GTK+ 1.2.10 package - DEPENDS:=+glib1 @TARGET_x86 + DEPENDS:=+glib1 @DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile index 027f4e6c96..bb5895195a 100644 --- a/XOrg/lib/gtk-2.8.20/Makefile +++ b/XOrg/lib/gtk-2.8.20/Makefile @@ -27,7 +27,7 @@ define Package/gtk-2.8.20 CATEGORY:=Xorg SUBMENU:=framework TITLE:=GTK+ 2.8.20 package - DEPENDS:=+cairo +pango +libjpeg +atk +libtiff @TARGET_x86 + DEPENDS:=+cairo +pango +libjpeg +atk +libtiff @DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile index 30a1ee02e1..fd02923a6e 100644 --- a/XOrg/lib/libICE/Makefile +++ b/XOrg/lib/libICE/Makefile @@ -21,7 +21,7 @@ define Package/libICE SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +xproto +xtrans @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +xproto +xtrans @DISPLAY_SUPPORT TITLE:=libICE URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile index 6c6a7c40e2..37a38676b0 100644 --- a/XOrg/lib/libSM/Makefile +++ b/XOrg/lib/libSM/Makefile @@ -21,7 +21,7 @@ define Package/libSM SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libICE @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libICE @DISPLAY_SUPPORT TITLE:=libSM URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile index df54b76fb1..99c0d38cc6 100644 --- a/XOrg/lib/libX11/Makefile +++ b/XOrg/lib/libX11/Makefile @@ -21,7 +21,7 @@ define Package/libX11 SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +bigreqsproto +xproto +xextproto +libXau +xtrans +xcmiscproto +libXdmcp +xf86bigfontproto +kbproto +inputproto @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +bigreqsproto +xproto +xextproto +libXau +xtrans +xcmiscproto +libXdmcp +xf86bigfontproto +kbproto +inputproto @DISPLAY_SUPPORT TITLE:=libX11 URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile index db08458df7..573dd6ad05 100644 --- a/XOrg/lib/libXau/Makefile +++ b/XOrg/lib/libXau/Makefile @@ -21,7 +21,7 @@ define Package/libXau SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +xproto @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +xproto @DISPLAY_SUPPORT TITLE:=libXau URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile index 53213f12d3..7810586f37 100644 --- a/XOrg/lib/libXaw/Makefile +++ b/XOrg/lib/libXaw/Makefile @@ -21,7 +21,7 @@ define Package/libXaw SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libXmu +libXpm +libXau +libXdmcp @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libXmu +libXpm +libXau +libXdmcp @DISPLAY_SUPPORT TITLE:=libXaw URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile index 7f4d88f46f..5d2bcee998 100644 --- a/XOrg/lib/libXcursor/Makefile +++ b/XOrg/lib/libXcursor/Makefile @@ -21,7 +21,7 @@ define Package/libXcursor SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +libXrender +libXfixes @TARGET_x86 + DEPENDS:=+xorg-headers-native +libXrender +libXfixes @DISPLAY_SUPPORT TITLE:=libXcursor URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile index 9c8d73c9d2..3c768c41bd 100644 --- a/XOrg/lib/libXdmcp/Makefile +++ b/XOrg/lib/libXdmcp/Makefile @@ -21,7 +21,7 @@ define Package/libXdmcp SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +xproto @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +xproto @DISPLAY_SUPPORT TITLE:=libXdmcp URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile index 7e60cdf0c3..360d8e36de 100644 --- a/XOrg/lib/libXext/Makefile +++ b/XOrg/lib/libXext/Makefile @@ -21,7 +21,7 @@ define Package/libXext SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +xproto +xextproto +libXau +libX11 @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +xproto +xextproto +libXau +libX11 @DISPLAY_SUPPORT TITLE:=libXext URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile index 11646dd45c..513fee13fd 100644 --- a/XOrg/lib/libXfixes/Makefile +++ b/XOrg/lib/libXfixes/Makefile @@ -21,7 +21,7 @@ define Package/libXfixes SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT TITLE:=libXfixes URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile index 32f0840699..b0b8ec6942 100644 --- a/XOrg/lib/libXfont/Makefile +++ b/XOrg/lib/libXfont/Makefile @@ -21,7 +21,7 @@ define Package/libXfont SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +zlib +libfontenc +fontcacheproto +fontsproto +libfreetype @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +zlib +libfontenc +fontcacheproto +fontsproto +libfreetype @DISPLAY_SUPPORT TITLE:=libXfont URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile index 9fbbc396a5..8d1b765795 100644 --- a/XOrg/lib/libXmu/Makefile +++ b/XOrg/lib/libXmu/Makefile @@ -21,7 +21,7 @@ define Package/libXmu SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXmu URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile index 38ee6aae9f..395fe070ff 100644 --- a/XOrg/lib/libXpm/Makefile +++ b/XOrg/lib/libXpm/Makefile @@ -21,7 +21,7 @@ define Package/libXpm SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXpm URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile index 65e7ef06e0..ad9ef22463 100644 --- a/XOrg/lib/libXrandr/Makefile +++ b/XOrg/lib/libXrandr/Makefile @@ -21,7 +21,7 @@ define Package/libXrandr SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libXext +libXrender +randrproto +renderproto +xextproto +libX11 @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libXext +libXrender +randrproto +renderproto +xextproto +libX11 @DISPLAY_SUPPORT TITLE:=libXrandr URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile index 2fa8b6eef3..a294936667 100644 --- a/XOrg/lib/libXrender/Makefile +++ b/XOrg/lib/libXrender/Makefile @@ -21,7 +21,7 @@ define Package/libXrender SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT TITLE:=libXrender URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile index 5cfb89e410..fb8f352ec8 100644 --- a/XOrg/lib/libXt/Makefile +++ b/XOrg/lib/libXt/Makefile @@ -21,7 +21,7 @@ define Package/libXt SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libSM @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libSM @DISPLAY_SUPPORT TITLE:=libXt URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile index d76c00f232..5d5e807b97 100644 --- a/XOrg/lib/libXv/Makefile +++ b/XOrg/lib/libXv/Makefile @@ -21,7 +21,7 @@ define Package/libXv SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libXext +videoproto @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libXext +videoproto @DISPLAY_SUPPORT TITLE:=libXv URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile index e4f9872970..f617619938 100644 --- a/XOrg/lib/libXvMC/Makefile +++ b/XOrg/lib/libXvMC/Makefile @@ -21,7 +21,7 @@ define Package/libXvMC SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libXext +videoproto +libXv @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +libXext +videoproto +libXv @DISPLAY_SUPPORT TITLE:=libXvMC URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile index ca51782952..fd382f1f7c 100644 --- a/XOrg/lib/libXxf86misc/Makefile +++ b/XOrg/lib/libXxf86misc/Makefile @@ -21,7 +21,7 @@ define Package/libXxf86misc SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXxf86misc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile index e00b3d41c7..b780a61774 100644 --- a/XOrg/lib/libXxf86vm/Makefile +++ b/XOrg/lib/libXxf86vm/Makefile @@ -21,7 +21,7 @@ define Package/libXxf86vm SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXxf86vm URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile index 964a21157d..a2cdbc940f 100644 --- a/XOrg/lib/libfontenc/Makefile +++ b/XOrg/lib/libfontenc/Makefile @@ -21,7 +21,7 @@ define Package/libfontenc SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +xproto +zlib @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros +xproto +zlib @DISPLAY_SUPPORT TITLE:=libfontenc URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile index ea26cbf7de..848c415a40 100644 --- a/XOrg/lib/libxkbfile/Makefile +++ b/XOrg/lib/libxkbfile/Makefile @@ -21,7 +21,7 @@ define Package/libxkbfile SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libxkbfile URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/libxkbui/Makefile b/XOrg/lib/libxkbui/Makefile index 057146e569..7c41bb4834 100644 --- a/XOrg/lib/libxkbui/Makefile +++ b/XOrg/lib/libxkbui/Makefile @@ -21,7 +21,7 @@ define Package/libxkbui SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libxkbui URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/template.mk b/XOrg/lib/template.mk index 86b449b35c..9d4bd68546 100644 --- a/XOrg/lib/template.mk +++ b/XOrg/lib/template.mk @@ -21,7 +21,7 @@ define Package/@NAME@ SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @DEP@ @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DEP@ @DISPLAY_SUPPORT TITLE:=@NAME@ URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile index 80bd5c86fc..13f1dc7901 100644 --- a/XOrg/lib/xtrans/Makefile +++ b/XOrg/lib/xtrans/Makefile @@ -21,7 +21,7 @@ define Package/xtrans SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros @TARGET_x86 + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=xtrans URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/meta/xorg-server-essentials/Makefile b/XOrg/meta/xorg-server-essentials/Makefile index 219ded7c46..14d0f2bff4 100644 --- a/XOrg/meta/xorg-server-essentials/Makefile +++ b/XOrg/meta/xorg-server-essentials/Makefile @@ -29,7 +29,7 @@ define Package/xorg-server-essentials +xf86-input-evdev \ +xf86-input-keyboard \ +xinit \ - @TARGET_x86 + @DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/misc/Mesa/Makefile b/XOrg/misc/Mesa/Makefile index 5ee32c7c46..138c91da85 100644 --- a/XOrg/misc/Mesa/Makefile +++ b/XOrg/misc/Mesa/Makefile @@ -22,7 +22,7 @@ define Package/Mesa CATEGORY:=Xorg SUBMENU:=misc TITLE:=OpenGL compatible 3-D graphics library - DEPENDS:=@TARGET_x86 + DEPENDS:=@DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/misc/libdrm/Makefile b/XOrg/misc/libdrm/Makefile index f8e2161528..6c81556bf9 100644 --- a/XOrg/misc/libdrm/Makefile +++ b/XOrg/misc/libdrm/Makefile @@ -22,7 +22,7 @@ define Package/libdrm CATEGORY:=Xorg SUBMENU:=misc TITLE:=library for direct rendering - DEPENDS:=@TARGET_x86 + DEPENDS:=@DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/misc/x-bkgd-images/Makefile b/XOrg/misc/x-bkgd-images/Makefile index d60458d479..5281283e73 100644 --- a/XOrg/misc/x-bkgd-images/Makefile +++ b/XOrg/misc/x-bkgd-images/Makefile @@ -19,7 +19,7 @@ define Package/x-bkgd-images CATEGORY:=Xorg SUBMENU:=misc TITLE:=Background images for X - DEPENDS:=@TARGET_x86 + DEPENDS:=@DISPLAY_SUPPORT endef define Build/Configure diff --git a/XOrg/proto/applewmproto/Makefile b/XOrg/proto/applewmproto/Makefile index 72b9e93780..ddcbe00465 100644 --- a/XOrg/proto/applewmproto/Makefile +++ b/XOrg/proto/applewmproto/Makefile @@ -20,7 +20,7 @@ define Package/applewmproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=applewmproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/bigreqsproto/Makefile b/XOrg/proto/bigreqsproto/Makefile index 915dcb6dcc..dd5bf54d12 100644 --- a/XOrg/proto/bigreqsproto/Makefile +++ b/XOrg/proto/bigreqsproto/Makefile @@ -20,7 +20,7 @@ define Package/bigreqsproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=bigreqsproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/calibrateproto/Makefile b/XOrg/proto/calibrateproto/Makefile index e284cd6f64..8ae52427e4 100644 --- a/XOrg/proto/calibrateproto/Makefile +++ b/XOrg/proto/calibrateproto/Makefile @@ -19,7 +19,7 @@ define Package/calibrateproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:=@TARGET_x86 + DEPENDS:=@DISPLAY_SUPPORT TITLE:=calibrateproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/compositeproto/Makefile b/XOrg/proto/compositeproto/Makefile index 5489868582..dd94f55d06 100644 --- a/XOrg/proto/compositeproto/Makefile +++ b/XOrg/proto/compositeproto/Makefile @@ -20,7 +20,7 @@ define Package/compositeproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=compositeproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/damageproto/Makefile b/XOrg/proto/damageproto/Makefile index 6c671e6f43..0590667a21 100644 --- a/XOrg/proto/damageproto/Makefile +++ b/XOrg/proto/damageproto/Makefile @@ -20,7 +20,7 @@ define Package/damageproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=damageproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/dmxproto/Makefile b/XOrg/proto/dmxproto/Makefile index a1ef96be95..bc710361bf 100644 --- a/XOrg/proto/dmxproto/Makefile +++ b/XOrg/proto/dmxproto/Makefile @@ -20,7 +20,7 @@ define Package/dmxproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=dmxproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/evieext/Makefile b/XOrg/proto/evieext/Makefile index 3d39c0d6db..4b083c3046 100644 --- a/XOrg/proto/evieext/Makefile +++ b/XOrg/proto/evieext/Makefile @@ -20,7 +20,7 @@ define Package/evieext SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=evieext URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/fixesproto/Makefile b/XOrg/proto/fixesproto/Makefile index 7beb8eeb3e..3fb9812fe0 100644 --- a/XOrg/proto/fixesproto/Makefile +++ b/XOrg/proto/fixesproto/Makefile @@ -20,7 +20,7 @@ define Package/fixesproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=fixesproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/fontcacheproto/Makefile b/XOrg/proto/fontcacheproto/Makefile index 7301fda95a..bdf8bfff88 100644 --- a/XOrg/proto/fontcacheproto/Makefile +++ b/XOrg/proto/fontcacheproto/Makefile @@ -20,7 +20,7 @@ define Package/fontcacheproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=fontcacheproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/fontsproto/Makefile b/XOrg/proto/fontsproto/Makefile index 221d443918..62c54289eb 100644 --- a/XOrg/proto/fontsproto/Makefile +++ b/XOrg/proto/fontsproto/Makefile @@ -20,7 +20,7 @@ define Package/fontsproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=fontsproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/glproto/Makefile b/XOrg/proto/glproto/Makefile index 94d7bb7a1f..ebc3fc022c 100644 --- a/XOrg/proto/glproto/Makefile +++ b/XOrg/proto/glproto/Makefile @@ -20,7 +20,7 @@ define Package/glproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=glproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/inputproto/Makefile b/XOrg/proto/inputproto/Makefile index b81c87d96b..43f7c6db27 100644 --- a/XOrg/proto/inputproto/Makefile +++ b/XOrg/proto/inputproto/Makefile @@ -20,7 +20,7 @@ define Package/inputproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=inputproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/kbproto/Makefile b/XOrg/proto/kbproto/Makefile index 584d518b3f..014b755c35 100644 --- a/XOrg/proto/kbproto/Makefile +++ b/XOrg/proto/kbproto/Makefile @@ -20,7 +20,7 @@ define Package/kbproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=kbproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/printproto/Makefile b/XOrg/proto/printproto/Makefile index f6c26d08d4..7c04074fec 100644 --- a/XOrg/proto/printproto/Makefile +++ b/XOrg/proto/printproto/Makefile @@ -20,7 +20,7 @@ define Package/printproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=printproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/randrproto/Makefile b/XOrg/proto/randrproto/Makefile index b244891d48..ea262ffdc1 100644 --- a/XOrg/proto/randrproto/Makefile +++ b/XOrg/proto/randrproto/Makefile @@ -20,7 +20,7 @@ define Package/randrproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=randrproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/recordproto/Makefile b/XOrg/proto/recordproto/Makefile index 8109dacae1..755d4354d9 100644 --- a/XOrg/proto/recordproto/Makefile +++ b/XOrg/proto/recordproto/Makefile @@ -20,7 +20,7 @@ define Package/recordproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=recordproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/renderproto/Makefile b/XOrg/proto/renderproto/Makefile index 6ac8b91365..28a41088ba 100644 --- a/XOrg/proto/renderproto/Makefile +++ b/XOrg/proto/renderproto/Makefile @@ -20,7 +20,7 @@ define Package/renderproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=renderproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/resourceproto/Makefile b/XOrg/proto/resourceproto/Makefile index ec0e19bbe6..03bde5cd74 100644 --- a/XOrg/proto/resourceproto/Makefile +++ b/XOrg/proto/resourceproto/Makefile @@ -20,7 +20,7 @@ define Package/resourceproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=resourceproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/scrnsaverproto/Makefile b/XOrg/proto/scrnsaverproto/Makefile index 50faccf863..083aeceb68 100644 --- a/XOrg/proto/scrnsaverproto/Makefile +++ b/XOrg/proto/scrnsaverproto/Makefile @@ -20,7 +20,7 @@ define Package/scrnsaverproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=scrnsaverproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/template.mk b/XOrg/proto/template.mk index 924339aba0..a93069c920 100644 --- a/XOrg/proto/template.mk +++ b/XOrg/proto/template.mk @@ -20,7 +20,7 @@ define Package/@NAME@ SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:=@DEP@ @TARGET_x86 + DEPENDS:=@DEP@ @DISPLAY_SUPPORT TITLE:=@NAME@ URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/trapproto/Makefile b/XOrg/proto/trapproto/Makefile index b6601dd3db..117328d3d7 100644 --- a/XOrg/proto/trapproto/Makefile +++ b/XOrg/proto/trapproto/Makefile @@ -20,7 +20,7 @@ define Package/trapproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=trapproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/videoproto/Makefile b/XOrg/proto/videoproto/Makefile index d234d1f786..3c0c7e5a53 100644 --- a/XOrg/proto/videoproto/Makefile +++ b/XOrg/proto/videoproto/Makefile @@ -20,7 +20,7 @@ define Package/videoproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=videoproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/windowswmproto/Makefile b/XOrg/proto/windowswmproto/Makefile index 5d40b13441..018c5fd8b4 100644 --- a/XOrg/proto/windowswmproto/Makefile +++ b/XOrg/proto/windowswmproto/Makefile @@ -20,7 +20,7 @@ define Package/windowswmproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=windowswmproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xcmiscproto/Makefile b/XOrg/proto/xcmiscproto/Makefile index 54bf619e28..b72ef9c21c 100644 --- a/XOrg/proto/xcmiscproto/Makefile +++ b/XOrg/proto/xcmiscproto/Makefile @@ -20,7 +20,7 @@ define Package/xcmiscproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xcmiscproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xextproto/Makefile b/XOrg/proto/xextproto/Makefile index 8207dca1e1..c67aadbada 100644 --- a/XOrg/proto/xextproto/Makefile +++ b/XOrg/proto/xextproto/Makefile @@ -20,7 +20,7 @@ define Package/xextproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xextproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xf86bigfontproto/Makefile b/XOrg/proto/xf86bigfontproto/Makefile index 721ec0cbc9..9f33250f80 100644 --- a/XOrg/proto/xf86bigfontproto/Makefile +++ b/XOrg/proto/xf86bigfontproto/Makefile @@ -20,7 +20,7 @@ define Package/xf86bigfontproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xf86bigfontproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xf86dgaproto/Makefile b/XOrg/proto/xf86dgaproto/Makefile index 2309d0423c..a91cf32dc2 100644 --- a/XOrg/proto/xf86dgaproto/Makefile +++ b/XOrg/proto/xf86dgaproto/Makefile @@ -20,7 +20,7 @@ define Package/xf86dgaproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xf86dgaproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xf86driproto/Makefile b/XOrg/proto/xf86driproto/Makefile index 4d0a81fb28..3721315337 100644 --- a/XOrg/proto/xf86driproto/Makefile +++ b/XOrg/proto/xf86driproto/Makefile @@ -20,7 +20,7 @@ define Package/xf86driproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xf86driproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xf86miscproto/Makefile b/XOrg/proto/xf86miscproto/Makefile index 867cbc65c9..b64431132f 100644 --- a/XOrg/proto/xf86miscproto/Makefile +++ b/XOrg/proto/xf86miscproto/Makefile @@ -20,7 +20,7 @@ define Package/xf86miscproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xf86miscproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xf86rushproto/Makefile b/XOrg/proto/xf86rushproto/Makefile index 2548d4e120..ba2c0c2985 100644 --- a/XOrg/proto/xf86rushproto/Makefile +++ b/XOrg/proto/xf86rushproto/Makefile @@ -20,7 +20,7 @@ define Package/xf86rushproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xf86rushproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xf86vidmodeproto/Makefile b/XOrg/proto/xf86vidmodeproto/Makefile index 23a22c3615..fd90798e56 100644 --- a/XOrg/proto/xf86vidmodeproto/Makefile +++ b/XOrg/proto/xf86vidmodeproto/Makefile @@ -20,7 +20,7 @@ define Package/xf86vidmodeproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xf86vidmodeproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xineramaproto/Makefile b/XOrg/proto/xineramaproto/Makefile index c04d5dbb66..66fbdbf5a1 100644 --- a/XOrg/proto/xineramaproto/Makefile +++ b/XOrg/proto/xineramaproto/Makefile @@ -20,7 +20,7 @@ define Package/xineramaproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xineramaproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xproto/Makefile b/XOrg/proto/xproto/Makefile index 4a530068df..daaefce768 100644 --- a/XOrg/proto/xproto/Makefile +++ b/XOrg/proto/xproto/Makefile @@ -20,7 +20,7 @@ define Package/xproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xproto URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/proto/xproxymanagementprotocol/Makefile b/XOrg/proto/xproxymanagementprotocol/Makefile index 2571cae9fc..bb3dc247c5 100644 --- a/XOrg/proto/xproxymanagementprotocol/Makefile +++ b/XOrg/proto/xproxymanagementprotocol/Makefile @@ -20,7 +20,7 @@ define Package/xproxymanagementprotocol SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=xproxymanagementprotocol URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile index beb1faf8bc..a7e89971bb 100644 --- a/XOrg/server/xorg-server-X11R7.2/Makefile +++ b/XOrg/server/xorg-server-X11R7.2/Makefile @@ -74,7 +74,7 @@ DEPENDS_SERVER:=+calibrateproto \ +libXpm \ +libnotimpl \ +Mesa \ - @TARGET_x86 + @DISPLAY_SUPPORT DEPENDS_KDRIVE:=+calibrateproto \ +compositeproto \ @@ -92,7 +92,7 @@ DEPENDS_KDRIVE:=+calibrateproto \ +libXrandr \ +xtrans \ +libX11 \ - @TARGET_x86 + @DISPLAY_SUPPORT define Package/xorg-server/config config XORG_BUILD_KDRIVE diff --git a/XOrg/utils/template.mk b/XOrg/utils/template.mk index 3504b3be1e..989393b134 100644 --- a/XOrg/utils/template.mk +++ b/XOrg/utils/template.mk @@ -20,7 +20,7 @@ define Package/@NAME@ SECTION:=xorg-utils CATEGORY:=Xorg SUBMENU:=utils - DEPENDS:=@DEP@ @TARGET_x86 + DEPENDS:=@DEP@ @DISPLAY_SUPPORT TITLE:=${PKG_NAME} URL:=http://xorg.freedesktop.org/ endef diff --git a/XOrg/utils/util-macros/Makefile b/XOrg/utils/util-macros/Makefile index ea8f4e2e8d..180b53ff19 100644 --- a/XOrg/utils/util-macros/Makefile +++ b/XOrg/utils/util-macros/Makefile @@ -20,7 +20,7 @@ define Package/util-macros SECTION:=xorg-utils CATEGORY:=Xorg SUBMENU:=utils - DEPENDS:= @TARGET_x86 + DEPENDS:= @DISPLAY_SUPPORT TITLE:=${PKG_NAME} URL:=http://xorg.freedesktop.org/ endef