From: nico Date: Fri, 11 Nov 2011 17:40:30 +0000 (+0000) Subject: packages: move Xorg category to its own feed, move X-related packages as well X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=3ea3f122b9a8a2472016f1cb2d8386b62918ca31;p=packages.git packages: move Xorg category to its own feed, move X-related packages as well git-svn-id: svn://svn.openwrt.org/openwrt/packages@28952 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/Xorg/app/dillo/Makefile b/Xorg/app/dillo/Makefile deleted file mode 100644 index ad2f51f82..000000000 --- a/Xorg/app/dillo/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dillo -PKG_REV:=cc974615ae39 -PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=hg -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://hg.dillo.org/dillo -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/dillo - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - TITLE:=Dillo2 - URL:=http://fltk.org/ - DEPENDS:=+libXft +libstdcpp +libpthread +zlib +fltk2 +libjpeg +libpng $(ICONV_DEPENDS) -endef - -define Package/dillo/description - Dillo is a web browser project completely written in C. - Dillo aims to be a multi-platform browser alternative that - is small, stable, developer-friendly, usable, fast, and - extensible. - - Note: This is the fltk2 based dillo. -endef - -EXTRA_CPPFLAGS+=-I$(ICONV_PREFIX)/include -EXTRA_LDFLAGS+=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/Configure - (cd $(PKG_BUILD_DIR); ./autogen.sh ); - $(call Build/Configure/Default) -endef - -define Build/Install - DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install -endef - -define Package/dillo/install - $(INSTALL_DIR) $(1)/etc $(1)/usr/share/applications $(1)/usr/share/icons - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dillo $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dpid $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dpidc $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/dillo $(1)/usr/lib/ - $(CP) ./files/dillo.png $(1)/usr/share/icons/ - $(INSTALL_DATA) ./files/dillo.desktop $(1)/usr/share/applications/ -endef - -$(eval $(call BuildPackage,dillo)) diff --git a/Xorg/app/dillo/files/dillo.desktop b/Xorg/app/dillo/files/dillo.desktop deleted file mode 100644 index ed31c1b11..000000000 --- a/Xorg/app/dillo/files/dillo.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -GenericName=Web Browser -GenericName[lt]=Web naršyklė -Name=Dillo -Comment=Lightweight browser -Comment[lt]=Labai paprasta naršyklė -MimeType=text/html;text/xml;application/xhtml+xml; -Exec=dillo -Terminal=false -Type=Application -Categories=Application;Network; -Icon=/usr/share/icons/dillo.png diff --git a/Xorg/app/dillo/files/dillo.png b/Xorg/app/dillo/files/dillo.png deleted file mode 100644 index bcb89a30e..000000000 Binary files a/Xorg/app/dillo/files/dillo.png and /dev/null differ diff --git a/Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch b/Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch deleted file mode 100644 index 3dcf47e29..000000000 --- a/Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- dillo-rcc974615ae39.orig/configure.in 2009-03-09 15:40:08.000000000 +0100 -+++ dillo-rcc974615ae39/configure.in 2009-03-09 15:52:42.000000000 +0100 -@@ -145,14 +145,10 @@ - dnl - dnl For debugging and to be user friendly - AC_MSG_CHECKING([FLTK2]) --if sh -c "fltk2-config --version" >/dev/null 2>&1 --then AC_MSG_RESULT(yes) -- LIBFLTK_CXXFLAGS=`fltk2-config --cxxflags` -- LIBFLTK_CFLAGS=`fltk2-config --cflags` -- LIBFLTK_LIBS=`fltk2-config --use-images --ldflags` --else AC_MSG_RESULT(no) -- AC_ERROR(FLTK2 must be installed!) --fi -+AC_MSG_RESULT(yes) -+ LIBFLTK_CXXFLAGS="-I. -I/usr/include/freetype2 -Wno-non-virtual-dtor" -+ LIBFLTK_CFLAGS="-I." -+ LIBFLTK_LIBS="-L./lib -Wl,-rpath,/usr/local/lib -lfltk2_images -lfltk2_images -lfltk2 -lX11 -lXi -lXft -lpthread -lm -lXext -lsupc++" - - - dnl ---------------- diff --git a/Xorg/app/eterm/Makefile b/Xorg/app/eterm/Makefile deleted file mode 100644 index b1f0b2697..000000000 --- a/Xorg/app/eterm/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=eterm -PKG_VERSION:=0.9.4 -PKG_RELEASE:=2 - -PKG_SOURCE:=Eterm-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.eterm.org/download/ -PKG_BUILD_DIR:=$(BUILD_DIR)/Eterm-$(PKG_VERSION) -PKG_MD5SUM:=b8869ee9c9b9516231af9eefa595cee3 - -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/eterm/Default - SECTION:=xorg-extra - CATEGORY:=Xorg - SUBMENU:=terminals - -endef - -define Package/eterm -$(call Package/eterm/Default) - TITLE:=eterm - DEPENDS:=+libX11 +libXcursor +imlib2 +libast $(ICONV_DEPENDS) -endef - -define Package/esetroot -$(call Package/eterm/Default) - TITLE:=esetroot - DEPENDS:=eterm -endef - -CONFIGURE_ARGS += \ - --with-imlib=$(STAGING_DIR)/usr/ - -CONFIGURE_VARS += \ - LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)\ - CPPFLAGS="$(TARGET_CPPFLAGS) -I$(ICONV_PREFIX)/include/" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib/" - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install -endef - -define Package/eterm/install - $(INSTALL_DIR) $(1)/usr/{bin,lib} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Eterm $(1)/usr/bin -endef - -define Package/esetroot/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Esetroot $(1)/usr/bin -endef - -$(eval $(call BuildPackage,esetroot)) -$(eval $(call BuildPackage,eterm)) diff --git a/Xorg/app/eterm/patches/010-dont-add-host-paths.patch b/Xorg/app/eterm/patches/010-dont-add-host-paths.patch deleted file mode 100644 index a66efae2e..000000000 --- a/Xorg/app/eterm/patches/010-dont-add-host-paths.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure b/configure -index c2c0c91..321e0fb 100755 ---- a/configure -+++ b/configure -@@ -26704,10 +26704,10 @@ else - fi - - --CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` -+CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"` - CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` - CFLAGS=${CFLAGS--O} --LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` -+LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"` - LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` - LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" - diff --git a/Xorg/app/gtkperf/Makefile b/Xorg/app/gtkperf/Makefile deleted file mode 100644 index 9a5ad5695..000000000 --- a/Xorg/app/gtkperf/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gtkperf -PKG_VERSION:=0.40 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=@SF/gtkperf -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME) -PKG_MD5SUM:=4331dde4bb83865e15482885fcb0cc53 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -define Package/gtkperf - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+gtk2 - TITLE:=gtkperf - URL:=http://gtkperf.sourceforge.net -endef - -define Package/gtkperf/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin -endef - -$(eval $(call BuildPackage,gtkperf)) diff --git a/Xorg/app/gtkperf/patches/000-disable-autotools.patch b/Xorg/app/gtkperf/patches/000-disable-autotools.patch deleted file mode 100644 index 8e2cb80e8..000000000 --- a/Xorg/app/gtkperf/patches/000-disable-autotools.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ruN gtkperf.orig/Makefile.in gtkperf/Makefile.in ---- gtkperf.orig/Makefile.in 2005-06-07 18:09:49.000000000 +0200 -+++ gtkperf/Makefile.in 2009-10-14 12:29:30.000000000 +0200 -@@ -40,10 +40,10 @@ - - top_builddir = . - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -+ACLOCAL = /bin/true -+AUTOCONF = /bin/true -+AUTOMAKE = /bin/true -+AUTOHEADER = /bin/true - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -Binary files gtkperf.orig/.Makefile.in.swp and gtkperf/.Makefile.in.swp differ diff --git a/Xorg/app/gtkperf/patches/010-change-layout.patch b/Xorg/app/gtkperf/patches/010-change-layout.patch deleted file mode 100644 index ab90329b6..000000000 --- a/Xorg/app/gtkperf/patches/010-change-layout.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- gtkperf/src/interface.c 2005-06-07 18:15:24.000000000 +0200 -+++ gtkperf.orig/src/interface.c 2009-10-15 12:17:43.000000000 +0200 -@@ -44,12 +44,13 @@ - GtkWidget *vbox_main; - GtkWidget *vbox_info; - GtkWidget *hbox1; -+ GtkWidget *hbox2; - GtkWidget *button_clear; - GtkWidget *label8; - GtkObject *spinbutton_count_adj; - GtkWidget *button_start; - GtkWidget *alignment1; -- GtkWidget *hbox2; -+ GtkWidget *hbox_start; - GtkWidget *image1; - GtkWidget *label6; - GtkWidget *scrolledwindow1; -@@ -91,8 +92,8 @@ - appdata->window_main = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (appdata->window_main), - _("GtkPerf")); -- gtk_window_set_default_size (GTK_WINDOW (appdata->window_main), 500, -- 300); -+ gtk_window_set_default_size (GTK_WINDOW (appdata->window_main), 320, -+ 240); - gtk_widget_show(appdata->window_main); - - #endif -@@ -115,6 +116,9 @@ - hbox1 = gtk_hbox_new (FALSE, 10); - gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox_info), hbox1, FALSE, TRUE, 4); -+ hbox2 = gtk_hbox_new (FALSE, 10); -+ gtk_widget_show (hbox2); -+ gtk_box_pack_start (GTK_BOX (vbox_info), hbox2, FALSE, TRUE, 4); - - button_clear = gtk_button_new_from_stock ("gtk-clear"); - gtk_widget_show (button_clear); -@@ -134,7 +138,7 @@ - gtk_widget_set_size_request (appdata->spinbutton_count, 100, -1); - appdata->combobox_testtype = gtk_combo_box_new_text (); - gtk_widget_show (appdata->combobox_testtype); -- gtk_box_pack_start (GTK_BOX (hbox1), appdata->combobox_testtype, TRUE, -+ gtk_box_pack_start (GTK_BOX (hbox2), appdata->combobox_testtype, TRUE, - TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (appdata->combobox_testtype), - _("Test All")); -@@ -169,23 +173,23 @@ - - button_start = gtk_button_new (); - gtk_widget_show (button_start); -- gtk_box_pack_start (GTK_BOX (hbox1), button_start, FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (hbox2), button_start, FALSE, FALSE, 0); - - alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment1); - gtk_container_add (GTK_CONTAINER (button_start), alignment1); - -- hbox2 = gtk_hbox_new (FALSE, 2); -- gtk_widget_show (hbox2); -- gtk_container_add (GTK_CONTAINER (alignment1), hbox2); -+ hbox_start = gtk_hbox_new (FALSE, 2); -+ gtk_widget_show (hbox_start); -+ gtk_container_add (GTK_CONTAINER (alignment1), hbox_start); - image1 = gtk_image_new_from_stock ("gtk-execute", - GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image1); -- gtk_box_pack_start (GTK_BOX (hbox2), image1, FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (hbox_start), image1, FALSE, FALSE, 0); - - label6 = gtk_label_new_with_mnemonic (_("Start")); - gtk_widget_show (label6); -- gtk_box_pack_start (GTK_BOX (hbox2), label6, FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (hbox_start), label6, FALSE, FALSE, 0); - - scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow1); diff --git a/Xorg/app/matchbox-keyboard/Makefile b/Xorg/app/matchbox-keyboard/Makefile deleted file mode 100644 index 5ca8915e4..000000000 --- a/Xorg/app/matchbox-keyboard/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=matchbox-keyboard -PKG_REV:=2111 -PKG_VERSION:=svn$(PKG_REV) -PKG_RELEASE:=1 - -PKG_SOURCE:=matchbox-keyboard-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://svn.o-hand.com/repos/matchbox/trunk/matchbox-keyboard -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -define Package/matchbox-keyboard - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - TITLE:=matchbox-keyboard - MAINTAINER:=Michael Buesch - URL:=http://matchbox-project.org/?p=1 - DEPENDS:=+libfakekey +cairo +gtk2 +libexpat -endef - -define Package/matchbox-keyboard/description - Virtual keyboard -endef - -EXTRA_LDFLAGS:=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/matchbox-keyboard/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share $(1)/usr/share/applications \ - $(1)/usr/share/matchbox-keyboard $(1)/usr/share/pixmaps - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/applications/inputmethods/matchbox-keyboard.desktop \ - $(1)/usr/share/applications/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/matchbox-keyboard/* \ - $(1)/usr/share/matchbox-keyboard/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/pixmaps/* \ - $(1)/usr/share/pixmaps/ -endef - -$(eval $(call BuildPackage,matchbox-keyboard)) diff --git a/Xorg/app/packages b/Xorg/app/packages deleted file mode 100644 index f08db70c4..000000000 --- a/Xorg/app/packages +++ /dev/null @@ -1,9 +0,0 @@ -xcalc-1.0.2|+libX11+libXaw -xclipboard-1.0.1|+libX11 -xdm-1.1.6|+libX11 -xeyes-1.0.1|+libX11 -xinit-1.0.5|+libX11 -xlogo-1.0.1|+libX11 -xmessage-1.0.2|+libX11 -xset-1.0.3|+libX11 -xsetroot-1.0.2|+libX11 diff --git a/Xorg/app/pwrtray/Makefile b/Xorg/app/pwrtray/Makefile deleted file mode 100644 index 221711644..000000000 --- a/Xorg/app/pwrtray/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -#LOCAL_SRC:=1 - -PKG_NAME:=pwrtray -PKG_REV:=f9b63119a568803fad582dc0796af91bb087919c -PKG_VERSION:=2 -PKG_RELEASE:=1 - -ifeq ($(LOCAL_SRC),) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=git://git.bu3sch.de/pwrtray.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -endif - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_pwrtray-backend \ - CONFIG_PACKAGE_pwrtray - -include $(INCLUDE_DIR)/package.mk - -define Package/pwrtray-common - MAINTAINER:=Michael Buesch - URL:=http://bu3sch.de/gitweb?p=pwrtray.git;a=summary -endef - -define Package/pwrtray-backend - $(call Package/pwrtray-common) - SECTION:=utils - CATEGORY:=Utilities - TITLE:=System power control daemon - DEPENDS:=+FEATURE_drawing-backend_libX11:libX11 -endef - -define Package/pwrtray-backend/description - Tiny system power control daemon. -endef - -define Package/pwrtray - $(call Package/pwrtray-common) - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - TITLE:=Frontend to pwrtray-backend daemon - DEPENDS:=+pwrtray-backend +qt4 +qt4-gui -endef - -define Package/pwrtray/description - Small system-tray frontend to the power control daemon. -endef - -EXTRA_CFLAGS:= \ - -I$(PKG_BUILD_DIR)/tray/moc - -EXTRA_LDFLAGS:= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib/ - -MAKE_VARS+= \ - MOC="$(STAGING_DIR_HOST)/bin/moc" \ - STRIP="$(STRIP)" \ - QT_INCDIR="$(STAGING_DIR)/usr/include" \ - QT_LIBDIR="$(STAGING_DIR)/usr/lib" \ - PREFIX=/usr \ - $(if $(CONFIG_PACKAGE_libX11),FEATURE_XLOCK=y,FEATURE_XLOCK=n) \ - FEATURE_XEVREP=n \ - $(if $(CONFIG_PACKAGE_pwrtray),FEATURE_TRAY=y,FEATURE_TRAY=n) - -MAKE_FLAGS+= \ - V=1 - -define Build/Prepare - $(if $(LOCAL_SRC), \ - $(CP) ./files/src/* $(PKG_BUILD_DIR)/ \ - , \ - $(call Build/Prepare/Default) \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) clean - $(call Build/Compile/Default) -endef - -define Package/pwrtray-backend/install - $(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/bin $(1)/usr/share - $(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-backend $(1)/usr/bin/ - $(if $(CONFIG_PACKAGE_libX11),$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-xlock $(1)/usr/bin/) - $(if $(CONFIG_PACKAGE_pwrtray),$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray $(1)/usr/bin/) - $(if $(CONFIG_PACKAGE_pwrtray),$(CP) $(PKG_INSTALL_DIR)/usr/share/pwrtray $(1)/usr/share/) - [ -e $(1)/etc/pwrtray-backendrc ] || \ - $(INSTALL_DATA) ./files/etc/pwrtray-backendrc $(1)/etc/ -endef - -$(eval $(call BuildPackage,pwrtray-backend)) -$(eval $(call BuildPackage,pwrtray)) diff --git a/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend b/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend deleted file mode 100755 index e13893935..000000000 --- a/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2010 OpenWrt.org - -START=99 - -start() { - [ -x /usr/bin/pwrtray-backend ] && /usr/bin/pwrtray-backend -B -f -} - -stop() { - killall -q pwrtray-backend -} diff --git a/Xorg/app/pwrtray/files/etc/pwrtray-backendrc b/Xorg/app/pwrtray/files/etc/pwrtray-backendrc deleted file mode 100644 index 4ef6550f5..000000000 --- a/Xorg/app/pwrtray/files/etc/pwrtray-backendrc +++ /dev/null @@ -1,22 +0,0 @@ -# pwrtray-backend configuration - -[BACKLIGHT] -# List of auto-dimming steps. -# idle-seconds/brightness-percent idle-seconds/brightness-percent ... -# idle-seconds value must be growing. -autodim_steps=15/65 20/50 25/25 30/10 35/0 -# Default maximum brightness value for the autodimmer, in percent. -autodim_default_max=75 -# Enable auto-dimming by default? -autodim_default_on=1 -# Force backlight to autodim-max, if on AC and autodim is enabled? -# This effectively disables autodim if not on battery power. -autodim_max_on_ac=0 - -[SCREEN] -# Framebuffer device for screen blanking -fbdev=/dev/fb0 - -[XEVREP] -# X11 input event reporter grace period (in milliseconds) -grace_period=2000 diff --git a/Xorg/app/qwo/Makefile b/Xorg/app/qwo/Makefile deleted file mode 100644 index a01a1cc40..000000000 --- a/Xorg/app/qwo/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=qwo -PKG_VERSION:=0.3 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://mirrors.zerg.biz/nongnu/qwo/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4a3cfc9ad505c60cdf0d896f0323aab2 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/qwo - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXext +libXau +libXtst +imlib2 - TITLE:=qwo - URL:=http://www.nongnu.org/qwo/ -endef - -define Package/qwo/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/qwo $(1)/usr/share/applications - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/qwo/* \ - $(1)/usr/share/qwo/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/qwo/qwo.desktop \ - $(1)/usr/share/applications/ -endef - -$(eval $(call BuildPackage,qwo)) diff --git a/Xorg/app/rxvt/Makefile b/Xorg/app/rxvt/Makefile deleted file mode 100644 index 29504dfcc..000000000 --- a/Xorg/app/rxvt/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rxvt -PKG_RELEASE:=2 -PKG_VERSION:=2.7.10 - -PKG_SOURCE_URL:=@SF/rxvt -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=302c5c455e64047b02d1ef19ff749141 - -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL:=1 - -#TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/rxvt - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXext +libXau +libXtst +imlib2 - TITLE:=rxvt - URL:=http://rxvt.sourceforge.net -endef - -define Package/rxvt/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/applications $(1)/usr/share/icons - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ - $(INSTALL_DATA) \ - ./files/rxvt.desktop \ - $(1)/usr/share/applications/rxvt.desktop - $(INSTALL_DATA) \ - ./files/icon.png \ - $(1)/usr/share/icons/rxvt.png -endef - -$(eval $(call BuildPackage,rxvt)) diff --git a/Xorg/app/rxvt/files/icon.png b/Xorg/app/rxvt/files/icon.png deleted file mode 100644 index 9206d2ff0..000000000 Binary files a/Xorg/app/rxvt/files/icon.png and /dev/null differ diff --git a/Xorg/app/rxvt/files/rxvt.desktop b/Xorg/app/rxvt/files/rxvt.desktop deleted file mode 100644 index 8ea2eb362..000000000 --- a/Xorg/app/rxvt/files/rxvt.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -GenericName=Terminal -Name=rxvt -Encoding=UTF-8 -Version=1.0 -Comment=Terminal Emulator -StartupNotify=false -Exec=rxvt -Icon=/usr/share/icons/rxvt.png -Terminal=false -Type=Application -SingleInstance=true -Categories=Utility diff --git a/Xorg/app/template.mk b/Xorg/app/template.mk deleted file mode 100644 index fb3325c8b..000000000 --- a/Xorg/app/template.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=@BASE_NAME@ -PKG_NAME:=@NAME@ -PKG_RELEASE:=2 -PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ - -include $(INCLUDE_DIR)/package.mk - -define Package/@NAME@ - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=@DISPLAY_SUPPORT - TITLE:=@NAME@ - URL:=http://xorg.freedesktop.org/ -endef - -CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Build/Compile - DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install -endef - -define Package/@NAME@/install - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - rm -rf $(1)/usr/man/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,@NAME@)) diff --git a/Xorg/app/xcalc/Makefile b/Xorg/app/xcalc/Makefile deleted file mode 100644 index a00c4074d..000000000 --- a/Xorg/app/xcalc/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xcalc -PKG_VERSION:=1.0.2 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=d31a99795b9668f047aa11bf36df6df0 - -include $(INCLUDE_DIR)/package.mk - -define Package/xcalc - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libXaw - TITLE:=xcalc - URL:=http://xorg.freedesktop.org/ -endef - -CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Build/Compile - DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install -endef - -define Package/xcalc/install - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - rm -rf $(1)/usr/man/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,xcalc)) diff --git a/Xorg/app/xclipboard/Makefile b/Xorg/app/xclipboard/Makefile deleted file mode 100644 index 9f0035a83..000000000 --- a/Xorg/app/xclipboard/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xclipboard -PKG_VERSION:=1.0.1 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=2c6ecedb10dc51adbb64c95f22fd99c2 - -include $(INCLUDE_DIR)/package.mk - -define Package/xclipboard - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libXaw - TITLE:=xclipboard - URL:=http://xorg.freedesktop.org/ -endef - -CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Build/Compile - DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install -endef - -define Package/xclipboard/install - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - rm -rf $(1)/usr/man/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,xclipboard)) diff --git a/Xorg/app/xdm/Makefile b/Xorg/app/xdm/Makefile deleted file mode 100644 index 14d87d840..000000000 --- a/Xorg/app/xdm/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xdm -PKG_VERSION:=1.1.8 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=cc1816bc62a3722ad509373b0b7f30fe - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xdm - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXmu +libXau +libXaw - TITLE:=xdm - URL:=http://xorg.freedesktop.org/ -endef - -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib - -define Build/Configure - $(call Build/Configure/Default, \ - --without-pam \ - --with-random-device=/dev/urandom \ - --disable-dynamic-greeter \ - --disable-xprint \ - ) -endef - -define Package/xdm/install - $(INSTALL_DIR) $(1)/usr/{bin,lib/X11/xdm,share/X11/app-defaults} - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/X11/xdm/{X*,chooser,GiveConsole,TakeConsole,xdm-config,pixmaps} \ - $(1)/usr/lib/X11/xdm/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/app-defaults/* \ - $(1)/usr/share/X11/app-defaults/ -endef - -$(eval $(call BuildPackage,xdm)) diff --git a/Xorg/app/xeyes/Makefile b/Xorg/app/xeyes/Makefile deleted file mode 100644 index 29f3e27f4..000000000 --- a/Xorg/app/xeyes/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xeyes -PKG_VERSION:=1.0.1 -PKG_RELEASE:=3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=033f14f7c4e30d1f4edbb22d5ef86883 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xeyes - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXt +libXext +libXmu - TITLE:=xeyes - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xeyes/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin -endef - -$(eval $(call BuildPackage,xeyes)) diff --git a/Xorg/app/xine-ui/Makefile b/Xorg/app/xine-ui/Makefile deleted file mode 100644 index db57e9919..000000000 --- a/Xorg/app/xine-ui/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xine-ui -PKG_VERSION:=0.99.4 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/xine -PKG_MD5SUM:=90ea1f76747e9788a30a73e7f4a76cf6 - -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xine-ui - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - TITLE:=xine user interface - DEPENDS:=+xine-lib +libpng +curl +libXv +libXt +libICE +libXxf86vm +libpng +libfreetype $(ICONV_DEPENDS) - URL:=http://www.xine-project.org/ -endef - -CONFIGURE_VARS+= \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ - X_LIBS="" \ - X_CFLAGS="" - -EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -CONFIGURE_ARGS+= \ - --x-includes="$(STAGING_DIR)/usr/include" \ - --x-libraries="$(STAGING_DIR)/usr/lib" \ - --without-aalib \ - --without-libcaca \ - --disable-lirc \ - --without-readline \ - --disable-shm \ - --disable-xft - -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - X_LIBS="$(TARGET_LDFLAGS) -lfreetype" \ - X_CFLAGS="" - $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR) -endef - -define Package/xine-ui/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/xine \ - $(PKG_INSTALL_DIR)/usr/share/pixmaps \ - $(1)/usr/share/ -endef - -$(eval $(call BuildPackage,xine-ui)) diff --git a/Xorg/app/xine-ui/patches/100-cflags.patch b/Xorg/app/xine-ui/patches/100-cflags.patch deleted file mode 100644 index 797f8b3ce..000000000 --- a/Xorg/app/xine-ui/patches/100-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xine-ui-0.99.4/configure -=================================================================== ---- xine-ui-0.99.4.orig/configure 2007-12-23 01:23:31.650316801 +0100 -+++ xine-ui-0.99.4/configure 2007-12-23 01:23:42.194917702 +0100 -@@ -31351,7 +31351,7 @@ - SYSCONF_DIR=`eval echo "$sysconfdir"` - - --INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)' -+INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit $(INTLDIR)' - - - diff --git a/Xorg/app/xine-ui/patches/110-xitk.patch b/Xorg/app/xine-ui/patches/110-xitk.patch deleted file mode 100644 index aa2ba4a52..000000000 --- a/Xorg/app/xine-ui/patches/110-xitk.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: xine-ui-0.99.4/src/xitk/xine-toolkit/xitk.c -=================================================================== ---- xine-ui-0.99.4.orig/src/xitk/xine-toolkit/xitk.c 2007-12-23 01:26:05.991112183 +0100 -+++ xine-ui-0.99.4/src/xitk/xine-toolkit/xitk.c 2007-12-23 01:26:10.819387329 +0100 -@@ -45,11 +45,6 @@ - #include - - #include -- --#ifdef __linux__ --#include --#endif -- - #include - #include - #include diff --git a/Xorg/app/xine-ui/patches/120-remove-delay.patch b/Xorg/app/xine-ui/patches/120-remove-delay.patch deleted file mode 100644 index 5d3dcc663..000000000 --- a/Xorg/app/xine-ui/patches/120-remove-delay.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xine-ui-0.99.4/configure -=================================================================== ---- xine-ui-0.99.4.orig/configure 2010-11-04 18:11:02.449000004 +0100 -+++ xine-ui-0.99.4/configure 2010-11-04 18:11:08.594998937 +0100 -@@ -31102,8 +31102,6 @@ - echo "your compiler to "\! - echo - echo "*********************************************************************" -- echo "(sleeping one minute so you can read this...)" -- sleep 60 - - CFLAGS="-O3 $CFLAGS" - DEBUG_CFLAGS="-O $DEBUG_CFLAGS" diff --git a/Xorg/app/xinit/Makefile b/Xorg/app/xinit/Makefile deleted file mode 100644 index fc1024362..000000000 --- a/Xorg/app/xinit/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xinit -PKG_VERSION:=1.0.5 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=9a2aad51042141a0e6ad066015397595 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xinit - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 - TITLE:=xinit - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xinit/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,xinit)) diff --git a/Xorg/app/xmessage/Makefile b/Xorg/app/xmessage/Makefile deleted file mode 100644 index 2f96e2e4f..000000000 --- a/Xorg/app/xmessage/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xmessage -PKG_VERSION:=1.0.2 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b4b561ef11fd184989a6062962e86748 - -include $(INCLUDE_DIR)/package.mk - -define Package/xmessage - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libXaw - TITLE:=xmessage - URL:=http://xorg.freedesktop.org/ -endef - -CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Build/Compile - DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install -endef - -define Package/xmessage/install - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - rm -rf $(1)/usr/man/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,xmessage)) diff --git a/Xorg/app/xterm/Makefile b/Xorg/app/xterm/Makefile deleted file mode 100644 index 688856018..000000000 --- a/Xorg/app/xterm/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xterm -PKG_VERSION:=242 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=ftp://mirror1.openwrt.org/ -PKG_MD5SUM:=663fa3aac8e30e4c2d4bf07c0aee4dca - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xterm - SECTION:=xorg-extra - CATEGORY:=Xorg - SUBMENU:=terminals - TITLE:=xterm - DEPENDS:=+libX11 +libncurses +libXaw -endef - -define Build/Configure -# sed -e "s%/usr/contrib/X11R6%${STAGING_DIR}/usr/lib%g" -i $(PKG_BUILD_DIR)/configure - cd $(PKG_BUILD_DIR)/; $(TARGET_CONFIGURE_OPTS) $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --host=$(GNU_TARGET_NAME) \ - --x-includes=$(STAGING_DIR)/usr/include/ \ - --x-libraries=$(STAGING_DIR)/usr/lib/ \ - LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" -endef - -define Package/xterm/install - $(INSTALL_DIR) $(1)/usr/ $(1)/usr/share/applications $(1)/usr/share/icons - $(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/usr/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/ - $(CP) ./files/xterm.desktop $(1)/usr/share/applications/ - $(CP) ./files/terminal.png $(1)/usr/share/icons/ -endef - -$(eval $(call BuildPackage,xterm)) diff --git a/Xorg/app/xterm/files/terminal.png b/Xorg/app/xterm/files/terminal.png deleted file mode 100644 index 309e04651..000000000 Binary files a/Xorg/app/xterm/files/terminal.png and /dev/null differ diff --git a/Xorg/app/xterm/files/xterm.desktop b/Xorg/app/xterm/files/xterm.desktop deleted file mode 100644 index eda286f6e..000000000 --- a/Xorg/app/xterm/files/xterm.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=XTerm -Comment=XTerm Terminal Emulator -Encoding=UTF-8 -Version=1.0 -Type=Application -Exec=xterm -Icon=terminal -Terminal=false -Categories=GTK;Application;PIM -SingleInstance=false -StartupNotify=true diff --git a/Xorg/app/xterm/patches/010-no-transform.patch b/Xorg/app/xterm/patches/010-no-transform.patch deleted file mode 100644 index a568c6479..000000000 --- a/Xorg/app/xterm/patches/010-no-transform.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 62a2882..159755b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -160,10 +160,10 @@ resize$x : $(OBJS2) - - charproc$o : main.h @CHARPROC_DEPS@ - ################################################################################ --actual_xterm = `echo xterm| sed '$(transform)'` --actual_resize = `echo resize| sed '$(transform)'` --actual_uxterm = `echo uxterm| sed '$(transform)'` --actual_k8term = `echo koi8rxterm| sed '$(transform)'` -+actual_xterm = xterm -+actual_resize = resize -+actual_uxterm = uxterm -+actual_k8term = koi8rxterm - - binary_xterm = $(actual_xterm)$x - binary_resize = $(actual_resize)$x diff --git a/Xorg/driver/xf86-input-tslib/Makefile b/Xorg/driver/xf86-input-tslib/Makefile deleted file mode 100644 index 998224592..000000000 --- a/Xorg/driver/xf86-input-tslib/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-input-tslib -PKG_VERSION:=0.0.6 -PKG_RELEASE:=3 - -PKG_SOURCE_URL:=http://www.pengutronix.de/software/xf86-input-tslib/download/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b7a4d2f11637ee3fcf432e044b1d017f - -PKG_BUILD_DEPENDS:=randrproto inputproto xproto -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -ifeq ($(CONFIG_TARGET_s3c24xx),y) - TS_POINTERCAL=om_gta02 -endif - -define Package/xf86-input-tslib - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg +tslib - TITLE:=xf86-input-tslib - URL:=http://www.pengutronix.de/software/xf86-input-tslib/ -endef - -define Package/xf86-input-tslib/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input $(1)/etc - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/tslib_drv.so \ - $(1)/usr/lib/xorg/modules/input/ - $(if $(TS_POINTERCAL), \ - $(INSTALL_DATA) \ - ./files/pointercal.$(TS_POINTERCAL) \ - $(1)/etc/pointercal \ - ) -endef - -$(eval $(call BuildPackage,xf86-input-tslib)) diff --git a/Xorg/driver/xf86-input-tslib/files/pointercal.om_gta02 b/Xorg/driver/xf86-input-tslib/files/pointercal.om_gta02 deleted file mode 100644 index 841ec7fab..000000000 Binary files a/Xorg/driver/xf86-input-tslib/files/pointercal.om_gta02 and /dev/null differ diff --git a/Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch b/Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch deleted file mode 100644 index c836359c8..000000000 --- a/Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit 69fcc78ea931f8a84497f4ee9021f4493f45a778 -Author: Lars-Peter Clausen -Date: Sun Feb 1 16:44:24 2009 +0100 - - Put #ifdef DEBUG around debug output. - -Index: xf86-input-tslib-0.0.6/src/tslib.c -=================================================================== ---- xf86-input-tslib-0.0.6.orig/src/tslib.c 2009-10-19 17:07:18.000000000 +0200 -+++ xf86-input-tslib-0.0.6/src/tslib.c 2011-01-27 22:36:41.772784019 +0100 -@@ -89,21 +89,27 @@ - static void - BellProc(int percent, DeviceIntPtr pDev, pointer ctrl, int unused) - { -+#ifdef DEBUG - ErrorF("%s\n", __FUNCTION__); -+#endif - return; - } - - static void - KeyControlProc(DeviceIntPtr pDev, KeybdCtrl * ctrl) - { -+#ifdef DEBUG - ErrorF("%s\n", __FUNCTION__); -+#endif - return; - } - - static void - PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl) - { -+#ifdef DEBUG - ErrorF("%s\n", __FUNCTION__); -+#endif - return; - } - -@@ -327,7 +333,9 @@ - int i, axiswidth, axisheight; - struct ts_priv *priv; - -+#ifdef DEBUG - ErrorF("%s\n", __FUNCTION__); -+#endif - pInfo = device->public.devicePrivate; - priv = pInfo->private; - -@@ -431,7 +439,9 @@ - xf86TslibUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - { - struct ts_priv *priv = (struct ts_priv *)(pInfo->private); -+#ifdef DEBUG - ErrorF("%s\n", __FUNCTION__); -+#endif - xf86TslibControlProc(pInfo->dev, DEVICE_OFF); - ts_close(priv->ts); - xfree(pInfo->private); diff --git a/Xorg/driver/xf86-video-glamo/Makefile b/Xorg/driver/xf86-video-glamo/Makefile deleted file mode 100644 index f1b1bc7e1..000000000 --- a/Xorg/driver/xf86-video-glamo/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-video-glamo -PKG_VERSION:=20091029 -PKG_REV:=15954340b4b7aaf6ab850c149c2f75c1555d9360 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=git://git.openmoko.org/git/xf86-video-glamo.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) - -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto videoproto -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xf86-video-glamo - TITLE:=xf86-video-glamo - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - URL:=http://git.openmoko.org/?p=xf86-video-glamo.git - DEPENDS:=@DISPLAY_SUPPORT @arm||armeb @TARGET_s3c24xx +xserver-xorg -endef - -define Package/xf86-video-glamo/description - xorg video driver for the smedia glamo 3362 chip. -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR) && autoreconf --force --install) - $(call Build/Configure/Default, \ - --disable-jbt6k74-set-state \ - --enable-engine-ioctls \ - ) -endef - -define Package/xf86-video-glamo/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/glamo_drv.so \ - $(1)/usr/lib/xorg/modules/drivers/ -endef - -$(eval $(call BuildPackage,xf86-video-glamo)) diff --git a/Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch b/Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch deleted file mode 100644 index 8e5c32404..000000000 --- a/Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/glamo-engine.h b/src/glamo-engine.h -index 0664341..92a5ed5 100644 ---- a/src/glamo-engine.h -+++ b/src/glamo-engine.h -@@ -23,6 +23,7 @@ - - #ifdef HAVE_ENGINE_IOCTLS - #include -+#include - - #define GLAMOEngine glamo_engine - #define GLAMO_ENGINE_ALL __NUM_GLAMO_ENGINES diff --git a/Xorg/font/dejavu-fonts-ttf/Makefile b/Xorg/font/dejavu-fonts-ttf/Makefile deleted file mode 100644 index e971baf68..000000000 --- a/Xorg/font/dejavu-fonts-ttf/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=dejavu-fonts-ttf -PKG_VERSION:=2.23 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=@SF/dejavu -PKG_MD5SUM:=ff871dff0b3e8a11cd5c54478f11073f - -include $(INCLUDE_DIR)/package.mk - -FILES:= \ - DejaVuSans-BoldOblique \ - DejaVuSans-Bold \ - DejaVuSansCondensed-BoldOblique \ - DejaVuSansCondensed-Bold \ - DejaVuSansCondensed-Oblique \ - DejaVuSansCondensed \ - DejaVuSans-ExtraLight \ - DejaVuSansMono-BoldOblique \ - DejaVuSansMono-Bold \ - DejaVuSansMono-Oblique \ - DejaVuSansMono \ - DejaVuSans-Oblique \ - DejaVuSans \ - DejaVuSerif-BoldItalic \ - DejaVuSerif-Bold \ - DejaVuSerifCondensed-BoldItalic \ - DejaVuSerifCondensed-Bold \ - DejaVuSerifCondensed-Italic \ - DejaVuSerifCondensed \ - DejaVuSerif-Italic \ - DejaVuSerif - -define PartGen -define Package/dejavu-fonts-ttf-$(1) - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - TITLE:=$(1) - DEPENDS:=dejavu-fonts-ttf -endef -endef - -define Package/dejavu-fonts-ttf - TITLE:=dejavu-fonts-ttf - SECTION:=xorg-font - SUBMENU:=font - CATEGORY:=Xorg - URL:=http://dejavu.sourceforge.net/ - DEPENDS:=@DISPLAY_SUPPORT -endef - -define Package/dejavu-fonts-ttf/install - true -endef - -$(foreach file,$(FILES),$(eval $(call PartGen,$(file)))) - -define Build/Compile - true -endef - -define Build/Configure - true -endef - -define PartInstall -define Package/dejavu-fonts-ttf-$(1)/install - $(INSTALL_DIR) \ - $$(1)/usr/share/fonts/ttf-dejavu - - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/ttf/$(1).ttf \ - $$(1)/usr/share/fonts/ttf-dejavu/ -endef -endef - -$(foreach file,$(FILES),$(eval $(call PartInstall,$(file)))) - -$(eval $(call BuildPackage,dejavu-fonts-ttf)) -$(foreach file,$(FILES),$(eval $(call BuildPackage,dejavu-fonts-ttf-$(file)))) - diff --git a/Xorg/font/liberation-fonts-ttf/Makefile b/Xorg/font/liberation-fonts-ttf/Makefile deleted file mode 100644 index 99c032594..000000000 --- a/Xorg/font/liberation-fonts-ttf/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=liberation-fonts -PKG_RELEASE:=1 -PKG_VERSION:=1.04 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://fedorahosted.org/releases/l/i/liberation-fonts/ -PKG_MD5SUM:=4846797ef0fc70b0cbaede2514677c58 - -include $(INCLUDE_DIR)/package.mk - -define Package/liberation-fonts-ttf - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - TITLE:=liberation-fonts-ttf - URL:=https://fedorahosted.org/liberation-fonts/ -endef - -define Build/Compile - true -endef - -define Build/Configure - true -endef - -define Package/liberation-fonts-ttf/install - $(INSTALL_DIR) $(1)/usr/share/fonts/truetype/liberation - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/*.ttf \ - $(1)/usr/share/fonts/truetype/liberation/ -endef - -$(eval $(call BuildPackage,liberation-fonts-ttf)) - diff --git a/Xorg/generate.sh b/Xorg/generate.sh deleted file mode 100755 index 87359c808..000000000 --- a/Xorg/generate.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -for d in `find . -name packages | grep driver`; do - cd `dirname $d` - echo "Entering "`dirname $d` - for p in `cat packages`; do - _NAME=${p%%|*} - NAME=${_NAME%-*} - BASE_NAME=${NAME%%-*} - VER=${_NAME##*-} - DEP=`echo ${p##*|} | sed "s/+/ +/g"` - echo generating Makefile for ${NAME}-${VER} with deps : ${DEP} - rm -f ${NAME}/Makefile - if [ -e ${NAME}/patches ]; then - rm -f ${NAME}/patches/* - fi - if [ "$1" = "gen" ]; then - if [ ! -e ${NAME} ]; then - mkdir ${NAME} - fi - sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile - if [ -d `pwd`/patches/${NAME} ]; then - if [ ! -d ${NAME}/patches ]; then - mkdir ${NAME}/patches - fi - cp -r `pwd`/patches/${NAME}/* ${NAME}/patches/ - fi - fi - done - cd - > /dev/null -done diff --git a/Xorg/lib/atk/Makefile b/Xorg/lib/atk/Makefile deleted file mode 100644 index c6be1fd5a..000000000 --- a/Xorg/lib/atk/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=atk -PKG_VERSION:=1.22.0 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.22/ -PKG_MD5SUM:=06a2b39a22d5ca35c47435da6b9643ac - -PKG_FIXUP:=libtool - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/atk - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Accesibility library for gtk+ apps - DEPENDS:=+glib2 -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib,include} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ -endef - -define Package/atk/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,atk)) diff --git a/Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch b/Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch deleted file mode 100644 index 301bf39b6..000000000 --- a/Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- atk-1.22.0.orig/configure.in 2008-03-10 08:27:08.000000000 +0100 -+++ atk-1.22.0/configure.in 2010-12-10 16:06:39.479379673 +0100 -@@ -178,7 +178,7 @@ - - AC_CHECK_FUNCS(bind_textdomain_codeset) - --GTK_DOC_CHECK([1.0]) -+#GTK_DOC_CHECK([1.0]) - - # define a MAINT-like variable REBUILD which is set if Perl - # and awk are found, so autogenerated sources can be rebuilt diff --git a/Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch b/Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch deleted file mode 100644 index d5c66751e..000000000 --- a/Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- atk-1.22.0.orig/Makefile.in 2008-03-10 08:30:11.000000000 +0100 -+++ atk-1.22.0/Makefile.in 2010-12-10 16:10:24.239380634 +0100 -@@ -243,7 +243,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = atk tests docs po -+SUBDIRS = atk - EXTRA_DIST = \ - MAINTAINERS \ - atk-uninstalled.pc.in \ ---- atk-1.22.0.orig/Makefile.am 2007-12-17 17:36:22.000000000 +0100 -+++ atk-1.22.0/Makefile.am 2010-12-10 16:17:15.255377279 +0100 -@@ -1,6 +1,6 @@ - # Process this file with automake to create Makefile.in. - --SUBDIRS=atk tests docs po -+SUBDIRS=atk - - EXTRA_DIST = \ - MAINTAINERS \ ---- atk-1.22.0.orig/Makefile.in 2010-12-10 18:56:15.011379161 +0100 -+++ atk-1.22.0/Makefile.in 2010-12-10 18:57:34.439378866 +0100 -@@ -486,7 +486,7 @@ - distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) -- $(mkdir_p) $(distdir)/. $(distdir)/atk $(distdir)/docs $(distdir)/po -+ $(mkdir_p) $(distdir)/. $(distdir)/atk - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ -diff -ruN atk-1.22.0/configure.in atk-1.22.0.mod//configure.in ---- atk-1.22.0/configure.in 2010-12-10 19:11:38.335379754 +0100 -+++ atk-1.22.0.mod//configure.in 2010-12-10 19:08:56.155380379 +0100 -@@ -197,14 +197,10 @@ - - AC_CONFIG_FILES([ - Makefile --po/Makefile.in - atk.pc - atk-uninstalled.pc - atk/Makefile - atk/atk.rc --tests/Makefile --docs/Makefile --docs/version.xml - atk.spec - atk-zip.sh - ]) diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile deleted file mode 100644 index bd695612d..000000000 --- a/Xorg/lib/cairo/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=cairo -PKG_VERSION:=1.8.8 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://cairographics.org/releases/ -PKG_MD5SUM:=d3e1a1035ae563812d4dd44a74fb0dd0 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL:=1 - -define Package/cairo - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Multi-platform 2D graphics library - DEPENDS:=+fontconfig +libpng +libexpat +pixman \ - +FEATURE_drawing-backend_DirectFB:directfb \ - +FEATURE_drawing-backend_libX11:libX11 - URL:=http://cairographics.org/ -endef - -define Package/cairo/description -Cairo is a 2D graphics library. The cairo API provides operations similar -to the drawing operators of PostScript and PDF. Operations in cairo -include stroking and filling cubic Bézier splines, transforming and -compositing translucent images, and antialiased text rendering. All -drawing operations can be transformed by any affine transformation -(scale, rotation, shear, etc.). -endef - -CONFIGURE_VARS+=FONTCONFIG_LIBS="-lfreetype -lfontconfig -lz -lexpat" - -CONFIGURE_ARGS+= \ - --enable-freetype=yes \ - --disable-win32 \ - --enable-xlib-xrender=no \ - $(if $(CONFIG_FEATURE_drawing-backend_DirectFB), --enable-directfb, --disable-directfb) \ - $(if $(CONFIG_FEATURE_drawing-backend_libX11), --enable-xlib --with-x, --disable-xlib --without-x) - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ - $(INSTALL_DIR) $(1)/usr/include/cairo/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/cairo/* $(1)/usr/include/cairo/ -endef - -define Package/cairo/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,cairo)) diff --git a/Xorg/lib/cairomm/Makefile b/Xorg/lib/cairomm/Makefile deleted file mode 100644 index ced2c9aed..000000000 --- a/Xorg/lib/cairomm/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=cairomm -PKG_VERSION:=1.8.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://cairographics.org/releases/ -PKG_MD5SUM:=559afbc47484ba3fad265e38a3dafe90 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/cairomm - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Multi-platform 2D graphics library - DEPENDS:=+libsigcxx +cairo - URL:=http://cairographics.org/cairomm/ -endef - -define Package/cairomm/description -c++-bindings for cairo -endef - -define Build/InstallDev - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/pkgconfig \ - $(1)/usr/include - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/* \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ -endef - -define Package/cairomm/install - $(INSTALL_DIR) \ - $(1)/usr/lib/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,cairomm)) diff --git a/Xorg/lib/fltk2/Makefile b/Xorg/lib/fltk2/Makefile deleted file mode 100644 index 85cbc673b..000000000 --- a/Xorg/lib/fltk2/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fltk2 -PKG_REV:=6671 -PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://svn.easysw.com/public/fltk/fltk/trunk -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_FIXUP:=libtool -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/fltk2 - SECTION:=xorg-framework - CATEGORY:=Xorg - SUBMENU:=framework - TITLE:=Fltk2 - URL:=http://fltk.org/ - DEPENDS:=+libXi +libstdcpp +libfreetype -endef - -define Package/fltk2/description - FLTK (pronounced ) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation. -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR); autoconf ); - $(call Build/Configure/Default, --disable-jpeg --disable-zlib --disable-png --disable-gl --disable-xinerama --enable-shared --x-libraries=$(STAGING_DIR)/usr/lib --x-includes=$(STAGING_DIR)/usr/include) -endef - -define Build/Compile - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) all -endef - -define Build/Install - DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/fltk $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fltk2-config $(1)/usr/bin/ -endef - -define Package/fltk2/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,fltk2)) diff --git a/Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests b/Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests deleted file mode 100644 index 1bb8a3d72..000000000 --- a/Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests +++ /dev/null @@ -1,11 +0,0 @@ ---- fltk2/Makefile 2009-01-02 01:41:31.000000000 +0100 -+++ fltk2/Makefile 2009-01-02 01:40:36.000000000 +0100 -@@ -25,7 +25,7 @@ - - include makeinclude - --DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test -+DIRS = src $(LOCALIMAGES) images - - all: makeinclude - for dir in $(DIRS); do\ diff --git a/Xorg/lib/fltk2/patches/001-be-verbose b/Xorg/lib/fltk2/patches/001-be-verbose deleted file mode 100644 index 2ca500a08..000000000 --- a/Xorg/lib/fltk2/patches/001-be-verbose +++ /dev/null @@ -1,12 +0,0 @@ ---- fltk2/makeinclude.in 2009-01-02 02:28:29.000000000 +0100 -+++ fltk2/makeinclude.in 2009-01-02 02:28:43.000000000 +0100 -@@ -114,9 +114,6 @@ - CAT1EXT = @CAT1EXT@ - CAT3EXT = @CAT3EXT@ - --# Be quiet when building... --.SILENT: -- - # Build commands and filename extensions... - .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) - diff --git a/Xorg/lib/fltk2/patches/002-honor-cppflags b/Xorg/lib/fltk2/patches/002-honor-cppflags deleted file mode 100644 index 618d14aa2..000000000 --- a/Xorg/lib/fltk2/patches/002-honor-cppflags +++ /dev/null @@ -1,26 +0,0 @@ -Index: fltk2-r6671/makeinclude.in -=================================================================== ---- fltk2-r6671.orig/makeinclude.in 2010-11-03 02:16:42.106000002 +0100 -+++ fltk2-r6671/makeinclude.in 2010-11-03 02:16:43.163002267 +0100 -@@ -54,6 +54,7 @@ - - # flags for C++ compiler: - OPTIM = @OPTIM@ -+CPPFLAGS = @CPPFLAGS@ - CFLAGS = $(OPTIM) @CFLAGS@ - CXXFLAGS = $(OPTIM) @CXXFLAGS@ - -@@ -124,11 +125,11 @@ - - .c.o: - echo Compiling $<... -- $(CC) -I.. -I../fltk/compat $(CFLAGS) -c $< -+ $(CC) $(CPPFLAGS) -I.. -I../fltk/compat $(CFLAGS) -c $< - - .cxx.o: - echo Compiling $<... -- $(CXX) -I.. -I../fltk/compat $(CXXFLAGS) -c $< -+ $(CXX) $(CPPFLAGS) -I.. -I../fltk/compat $(CXXFLAGS) -c $< - - .man.0 .man.1 .man.3: - echo Formatting $<... diff --git a/Xorg/lib/fltk2/patches/100-compile-fixes.patch b/Xorg/lib/fltk2/patches/100-compile-fixes.patch deleted file mode 100644 index e52df797e..000000000 --- a/Xorg/lib/fltk2/patches/100-compile-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: fltk2-r6671/src/filename_list.cxx -=================================================================== ---- fltk2-r6671.orig/src/filename_list.cxx 2010-11-03 02:17:17.243001500 +0100 -+++ fltk2-r6671/src/filename_list.cxx 2010-11-03 02:24:13.400999350 +0100 -@@ -62,6 +62,9 @@ - // This version is when we define our own scandir (WIN32 and perhaps - // some Unix systems): - int n = scandir(d, list, 0, sort); -+#elif defined(__UCLIBC_MAJOR__) && \ -+ __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && __UCLIBC_SUBLEVEL__ >= 31 -+ int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); - #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__) - int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); - #elif defined(__hpux) || defined(__CYGWIN__) diff --git a/Xorg/lib/gtk1/Makefile b/Xorg/lib/gtk1/Makefile deleted file mode 100644 index 70e331440..000000000 --- a/Xorg/lib/gtk1/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gtk1 -PKG_VERSION:=1.2.10 -PKG_RELEASE:=2 - -PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNOME/gtk+/1.2/ -PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-1.2.10 -PKG_MD5SUM:=4d5cb2fc7fb7830e4af9747a36bfce20 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL=1 - -CONFIGURE_ARGS_XTRA+=--x-includes=$(STAGING_DIR)/usr/include/ \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --with-glib-prefix=$(STAGING_DIR)/usr/ \ - --enable-static=yes \ - --enable-static=yes - -EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -EXTRA_LDFLAGS+=-lglib -lgmodule - -define Package/gtk1 - SECTION:=xorg-framework - CATEGORY:=Xorg - SUBMENU:=framework - TITLE:=GTK+ 1.2.10 package - DEPENDS:=+glib1 +libX11 +libXt - URL:=http://www.gtk.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(INSTALL_DIR) $(2)/bin - mv $(1)/usr/bin/gtk-config $(2)/bin/ - $(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config - $(SED) \ - 's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",g' \ - $(2)/bin/gtk-config -endef - -$(eval $(call BuildPackage,gtk1)) diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile deleted file mode 100644 index 6da640e4e..000000000 --- a/Xorg/lib/gtk2/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gtk2 -PKG_VERSION:=2.17.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/gtk+/2.17 -PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION) -PKG_MD5SUM:=a1a1f0b66a240c31cb2733643f9170ba - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups) - -# We can _either_ compile gtk2 with directfb-support _or_ against libX11 (libX11 is preferred when both libs are selected) - -define Package/gtk2 - SECTION:=xorg-framework - CATEGORY:=Xorg - SUBMENU:=framework - TITLE:=GTK+-2.0 - DEPENDS:=@DISPLAY_SUPPORT +cairo +pango +libpng +libjpeg +atk +libtiff +glib2 \ - +FEATURE_drawing-backend_DirectFB:directfb \ - +FEATURE_drawing-backend_libX11:libX11 \ - +FEATURE_drawing-backend_libX11:libXext \ - +FEATURE_drawing-backend_libX11:libXrender \ - +FEATURE_drawing-backend_libX11:libXfixes \ - +FEATURE_drawing-backend_libX11:libXrandr \ - +FEATURE_drawing-backend_libX11:libXcursor \ - +FEATURE_drawing-backend_libX11:libXdamage \ - +FEATURE_drawing-backend_libX11:libXcomposite \ - +FEATURE_drawing-backend_libX11:libXi - URL:=http://www.gtk.org/ -endef - -define Package/gtk2-cups - SECTION:=xorg-framework - CATEGORY:=Xorg - SUBMENU:=framework - TITLE:=CUPS print backend for GTK+-2.0 - DEPENDS:=gtk2 +cups -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shm \ - --disable-xkb \ - --disable-glibtest \ - --disable-gdiplus \ - --disable-xinerama \ - --without-libjasper \ - --without-xinput \ - $(if $(CONFIG_FEATURE_drawing-backend_DirectFB),--with-gdktarget=directfb,) \ - $(if $(CONFIG_FEATURE_drawing-backend_libX11),--with-x --with-gdktarget=x11,--without-x) \ - $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \ - gio_can_sniff=no \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include} - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/gtk2/install - $(INSTALL_DIR) $(1)/etc/gtk-2.0 - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/etc/gtk-2.0/* \ - $(1)/etc/gtk-2.0/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - - $(foreach d,engines immodules loaders, \ - $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/$(d); \ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/$(d)/*.so \ - $(1)/usr/lib/gtk-2.0/2.10.0/$(d)/;\ - ) - $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-{file,lpr}.so \ - $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ - - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,gtk-update-icon-cache} \ - $(1)/usr/bin/ - - $(INSTALL_DIR) $(1)/usr/share/themes/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/themes/* \ - $(1)/usr/share/themes/ - - $(INSTALL_DIR) $(1)/etc/init.d/ - $(INSTALL_BIN) ./files/gdk-pixbuf-query-loaders.init $(1)/etc/init.d/gdk-pixbuf-query-loaders -endef - -define Package/gtk2-cups/install - $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so \ - $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ -endef - -$(eval $(call BuildPackage,gtk2)) -$(eval $(call BuildPackage,gtk2-cups)) diff --git a/Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init b/Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init deleted file mode 100755 index f4efb0ccc..000000000 --- a/Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2007 OpenWrt.org - -START=99 -FILE=/etc/gtk-2.0/gdk-pixbuf.loaders - -start() { - if [ ! -e ${FILE} ]; then - mkdir -p $(dirname ${FILE}) - gdk-pixbuf-query-loaders > ${FILE} - fi -} diff --git a/Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch b/Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch deleted file mode 100644 index 04580d07a..000000000 --- a/Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.17.0.orig/configure.in 2009-05-04 06:43:43.000000000 +0200 -+++ gtk+-2.17.0/configure.in 2010-12-10 16:28:28.359377713 +0100 -@@ -1929,7 +1929,7 @@ - # Checks for gtk-doc and docbook-tools - ################################################## - --GTK_DOC_CHECK([1.11]) -+#GTK_DOC_CHECK([1.11]) - - AC_CHECK_PROG(DB2HTML, db2html, true, false) - AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) diff --git a/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch b/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch deleted file mode 100644 index 3181882e2..000000000 --- a/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ruN gtk+-2.17.0.orig/Makefile.am gtk+-2.17.0/Makefile.am ---- gtk+-2.17.0.orig/Makefile.am 2009-05-03 18:39:14.000000000 +0200 -+++ gtk+-2.17.0/Makefile.am 2009-10-16 23:53:15.000000000 +0200 -@@ -1,8 +1,8 @@ - ## Makefile.am for GTK+ - include $(top_srcdir)/Makefile.decl - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib --SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib -+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros - - # require automake 1.4 - AUTOMAKE_OPTIONS = 1.7 -diff -ruN gtk+-2.17.0.orig/Makefile.in gtk+-2.17.0/Makefile.in ---- gtk+-2.17.0.orig/Makefile.in 2009-05-04 06:45:42.000000000 +0200 -+++ gtk+-2.17.0/Makefile.in 2009-10-16 23:53:07.000000000 +0200 -@@ -523,8 +523,8 @@ - && DISPLAY=:$$XID && export DISPLAY - - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib --SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib -+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros - - # require automake 1.4 - AUTOMAKE_OPTIONS = 1.7 diff --git a/Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch b/Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch deleted file mode 100644 index 712194808..000000000 --- a/Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch +++ /dev/null @@ -1,207 +0,0 @@ ---- gtk+-2.17.0.orig/Makefile.in 2010-12-09 01:26:16.995377995 +0100 -+++ gtk+-2.17.0/Makefile.in 2010-12-10 16:30:00.283378413 +0100 -@@ -407,95 +407,7 @@ - config.h.win32 \ - makefile.msc \ - gtk-zip.sh.in \ -- sanitize-la.sh \ -- po/README.translators \ -- po/po2tbl.sed.in \ -- examples/aspectframe/Makefile \ -- examples/aspectframe/aspectframe.c \ -- examples/Makefile \ -- examples/README.1ST \ -- examples/extract.awk \ -- examples/extract.sh \ -- examples/arrow/Makefile \ -- examples/arrow/arrow.c \ -- examples/base/Makefile \ -- examples/base/base.c \ -- examples/buttonbox/Makefile \ -- examples/buttonbox/buttonbox.c \ -- examples/buttons/Makefile \ -- examples/buttons/buttons.c \ -- examples/buttons/info.xpm \ -- examples/calendar/Makefile \ -- examples/calendar/calendar.c \ -- examples/clist/Makefile \ -- examples/clist/clist.c \ -- examples/entry/Makefile \ -- examples/entry/entry.c \ -- examples/eventbox/Makefile \ -- examples/eventbox/eventbox.c \ -- examples/filesel/Makefile \ -- examples/filesel/filesel.c \ -- examples/gtkdial/Makefile \ -- examples/gtkdial/dial_test.c \ -- examples/gtkdial/gtkdial.c \ -- examples/gtkdial/gtkdial.h \ -- examples/helloworld/Makefile \ -- examples/helloworld/helloworld.c \ -- examples/helloworld2/Makefile \ -- examples/helloworld2/helloworld2.c \ -- examples/label/Makefile \ -- examples/label/label.c \ -- examples/list/Makefile \ -- examples/list/list.c \ -- examples/menu/Makefile \ -- examples/menu/menu.c \ -- examples/menu/itemfactory.c \ -- examples/notebook/Makefile \ -- examples/notebook/notebook.c \ -- examples/packbox/Makefile \ -- examples/packbox/packbox.c \ -- examples/paned/Makefile \ -- examples/paned/paned.c \ -- examples/pixmap/Makefile \ -- examples/pixmap/pixmap.c \ -- examples/progressbar/Makefile \ -- examples/progressbar/progressbar.c \ -- examples/radiobuttons/Makefile \ -- examples/radiobuttons/radiobuttons.c \ -- examples/rangewidgets/Makefile \ -- examples/rangewidgets/rangewidgets.c \ -- examples/rulers/Makefile \ -- examples/rulers/rulers.c \ -- examples/scribble-simple/Makefile \ -- examples/scribble-simple/scribble-simple.c \ -- examples/scribble-xinput/Makefile \ -- examples/scribble-xinput/scribble-xinput.c \ -- examples/scrolledwin/Makefile \ -- examples/scrolledwin/scrolledwin.c \ -- examples/selection/Makefile \ -- examples/selection/gettargets.c \ -- examples/selection/setselection.c \ -- examples/statusbar/Makefile \ -- examples/statusbar/statusbar.c \ -- examples/table/Makefile \ -- examples/table/table.c \ -- examples/text/Makefile \ -- examples/text/text.c \ -- examples/tictactoe/Makefile \ -- examples/tictactoe/tictactoe.c \ -- examples/tictactoe/tictactoe.h \ -- examples/tictactoe/ttt_test.c \ -- examples/tree/Makefile \ -- examples/tree/tree.c \ -- examples/wheelbarrow/Makefile \ -- examples/wheelbarrow/wheelbarrow.c \ -- examples/fixed/fixed.c \ -- examples/fixed/Makefile \ -- examples/frame/frame.c \ -- examples/frame/Makefile \ -- examples/spinbutton/spinbutton.c \ -- examples/spinbutton/Makefile \ -- examples/find-examples.sh -+ sanitize-la.sh - - TEST_PROGS = - -@@ -803,7 +715,7 @@ - distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) -- $(mkinstalldirs) $(distdir)/. $(distdir)/contrib/gdk-pixbuf-xlib $(distdir)/demos/gtk-demo $(distdir)/docs/reference/gdk $(distdir)/docs/reference/gdk-pixbuf $(distdir)/docs/reference/gtk $(distdir)/examples $(distdir)/examples/arrow $(distdir)/examples/aspectframe $(distdir)/examples/base $(distdir)/examples/buttonbox $(distdir)/examples/buttons $(distdir)/examples/calendar $(distdir)/examples/clist $(distdir)/examples/entry $(distdir)/examples/eventbox $(distdir)/examples/filesel $(distdir)/examples/fixed $(distdir)/examples/frame $(distdir)/examples/gtkdial $(distdir)/examples/helloworld $(distdir)/examples/helloworld2 $(distdir)/examples/label $(distdir)/examples/list $(distdir)/examples/menu $(distdir)/examples/notebook $(distdir)/examples/packbox $(distdir)/examples/paned $(distdir)/examples/pixmap $(distdir)/examples/progressbar $(distdir)/examples/radiobuttons $(distdir)/examples/rangewidgets $(distdir)/examples/rulers $(distdir)/examples/scribble-simple $(distdir)/examples/scribble-xinput $(distdir)/examples/scrolledwin $(distdir)/examples/selection $(distdir)/examples/spinbutton $(distdir)/examples/statusbar $(distdir)/examples/table $(distdir)/examples/text $(distdir)/examples/tictactoe $(distdir)/examples/tree $(distdir)/examples/wheelbarrow $(distdir)/gdk-pixbuf $(distdir)/gdk/win32/rc $(distdir)/gtk $(distdir)/po $(distdir)/po-properties -+ $(mkinstalldirs) $(distdir)/. $(distdir)/contrib/gdk-pixbuf-xlib $(distdir)/gdk-pixbuf $(distdir)/gdk/win32/rc $(distdir)/gtk - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ ---- gtk+-2.17.0.orig/Makefile.am 2010-12-09 01:26:16.995377995 +0100 -+++ gtk+-2.17.0/Makefile.am 2010-12-10 16:30:30.555380813 +0100 -@@ -29,95 +29,7 @@ - config.h.win32 \ - makefile.msc \ - gtk-zip.sh.in \ -- sanitize-la.sh \ -- po/README.translators \ -- po/po2tbl.sed.in \ -- examples/aspectframe/Makefile \ -- examples/aspectframe/aspectframe.c \ -- examples/Makefile \ -- examples/README.1ST \ -- examples/extract.awk \ -- examples/extract.sh \ -- examples/arrow/Makefile \ -- examples/arrow/arrow.c \ -- examples/base/Makefile \ -- examples/base/base.c \ -- examples/buttonbox/Makefile \ -- examples/buttonbox/buttonbox.c \ -- examples/buttons/Makefile \ -- examples/buttons/buttons.c \ -- examples/buttons/info.xpm \ -- examples/calendar/Makefile \ -- examples/calendar/calendar.c \ -- examples/clist/Makefile \ -- examples/clist/clist.c \ -- examples/entry/Makefile \ -- examples/entry/entry.c \ -- examples/eventbox/Makefile \ -- examples/eventbox/eventbox.c \ -- examples/filesel/Makefile \ -- examples/filesel/filesel.c \ -- examples/gtkdial/Makefile \ -- examples/gtkdial/dial_test.c \ -- examples/gtkdial/gtkdial.c \ -- examples/gtkdial/gtkdial.h \ -- examples/helloworld/Makefile \ -- examples/helloworld/helloworld.c \ -- examples/helloworld2/Makefile \ -- examples/helloworld2/helloworld2.c \ -- examples/label/Makefile \ -- examples/label/label.c \ -- examples/list/Makefile \ -- examples/list/list.c \ -- examples/menu/Makefile \ -- examples/menu/menu.c \ -- examples/menu/itemfactory.c \ -- examples/notebook/Makefile \ -- examples/notebook/notebook.c \ -- examples/packbox/Makefile \ -- examples/packbox/packbox.c \ -- examples/paned/Makefile \ -- examples/paned/paned.c \ -- examples/pixmap/Makefile \ -- examples/pixmap/pixmap.c \ -- examples/progressbar/Makefile \ -- examples/progressbar/progressbar.c \ -- examples/radiobuttons/Makefile \ -- examples/radiobuttons/radiobuttons.c \ -- examples/rangewidgets/Makefile \ -- examples/rangewidgets/rangewidgets.c \ -- examples/rulers/Makefile \ -- examples/rulers/rulers.c \ -- examples/scribble-simple/Makefile \ -- examples/scribble-simple/scribble-simple.c \ -- examples/scribble-xinput/Makefile \ -- examples/scribble-xinput/scribble-xinput.c \ -- examples/scrolledwin/Makefile \ -- examples/scrolledwin/scrolledwin.c \ -- examples/selection/Makefile \ -- examples/selection/gettargets.c \ -- examples/selection/setselection.c \ -- examples/statusbar/Makefile \ -- examples/statusbar/statusbar.c \ -- examples/table/Makefile \ -- examples/table/table.c \ -- examples/text/Makefile \ -- examples/text/text.c \ -- examples/tictactoe/Makefile \ -- examples/tictactoe/tictactoe.c \ -- examples/tictactoe/tictactoe.h \ -- examples/tictactoe/ttt_test.c \ -- examples/tree/Makefile \ -- examples/tree/tree.c \ -- examples/wheelbarrow/Makefile \ -- examples/wheelbarrow/wheelbarrow.c \ -- examples/fixed/fixed.c \ -- examples/fixed/Makefile \ -- examples/frame/frame.c \ -- examples/frame/Makefile \ -- examples/spinbutton/spinbutton.c \ -- examples/spinbutton/Makefile \ -- examples/find-examples.sh -+ sanitize-la.sh - - GDKTARGET=@gdktarget@ - diff --git a/Xorg/lib/gtk2/patches/100-compile_fix.patch b/Xorg/lib/gtk2/patches/100-compile_fix.patch deleted file mode 100644 index c855a9d70..000000000 --- a/Xorg/lib/gtk2/patches/100-compile_fix.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1126,12 +1126,6 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -- - EXTRA_DIST += \ - $(STOCK_ICONS) \ - $(GENERATED_ICONS) \ ---- a/gtk/Makefile.in -+++ b/gtk/Makefile.in -@@ -2970,12 +2970,6 @@ - done \ - && touch stamp-icons - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -- - install-data-local: - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Xorg/lib/gtkmm/Makefile b/Xorg/lib/gtkmm/Makefile deleted file mode 100644 index 6c3febb69..000000000 --- a/Xorg/lib/gtkmm/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gtkmm -PKG_VERSION:=2.16.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.16 -PKG_MD5SUM:=a82e3b5b93008421ff67df16d1e51ec2 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/gtkmm - SECTION:=xorg-framework - CATEGORY:=Xorg - SUBMENU:=framework - TITLE:=GTK+-2.0 - DEPENDS:=+gtk2 +cairomm +pangomm +glibmm - URL:=http://www.gtkmm.org/ -endef - -CONFIGURE_ARGS+= --disable-docs --disable-demos - -define Build/InstallDev - $(INSTALL_DIR) \ - $(1)/usr/lib/pkgconfig \ - $(1)/usr/include - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/* \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/gtkmm/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,gtkmm)) diff --git a/Xorg/lib/gtkmm/patches/001-automake-compat.patch b/Xorg/lib/gtkmm/patches/001-automake-compat.patch deleted file mode 100644 index 61f9ef05b..000000000 --- a/Xorg/lib/gtkmm/patches/001-automake-compat.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -119,15 +119,15 @@ AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl - SUN make does not work for building gtkmm. - Please install GNU make.])) - --# This macro is installed by glibmm -+# This macro is installed by mm-macros - # Doxygen needs the path to the installed perl. --GLIBMM_CHECK_PERL([5.6.0]) -+MM_CHECK_PERL([5.6.0]) - - ######################################################################### - # Function checks - ######################################################################### - --AC_CHECK_FUNC(mkfifo, AC_DEFINE(HAVE_MKFIFO)) -+AC_CHECK_FUNC(mkfifo, AC_DEFINE([HAVE_MKFIFO], [], [Define if mkfifo is available])) - - # functions used in demos/gtk-demo. Undefined in config.h. - AC_LANG_PUSH(C++) ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,5 @@ -+ACLOCAL_AMFLAGS = -I scripts -+ - if GTKMM_ATKMM_ENABLED - ATK_SUBDIR=atk - else diff --git a/Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch b/Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch deleted file mode 100644 index 0cddb4aab..000000000 --- a/Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- a/configure -+++ b/configure -@@ -22179,10 +22179,7 @@ fi - AUTOHEADER=':' - - --ac_config_files="$ac_config_files Makefile gdk/Makefile gdk/gdkmm-2.4.pc gdk/src/Makefile gdk/gdkmm/Makefile gdk/gdkmm/private/Makefile gtk/Makefile gtk/gtkmm-2.4.pc gtk/src/Makefile gtk/gtkmm/Makefile gtk/gtkmm/private/Makefile tools/Makefile tools/m4/Makefile tools/extra_defs_gen/Makefile" -- -- --ac_config_files="$ac_config_files tests/Makefile tests/child_widget/Makefile tests/child_widget2/Makefile tests/child_widget_managed/Makefile tests/refcount_dialog/Makefile tests/dialog/Makefile tests/dialog_deletethis/Makefile tests/delete_cpp_child/Makefile tests/main_with_options/Makefile tests/menu_destruction/Makefile tests/property_notification/Makefile tests/scrolledwindow/Makefile tests/wrap_existing/Makefile" -+ac_config_files="$ac_config_files Makefile gdk/Makefile gdk/gdkmm-2.4.pc gdk/src/Makefile gdk/gdkmm/Makefile gdk/gdkmm/private/Makefile gtk/Makefile gtk/gtkmm-2.4.pc gtk/src/Makefile gtk/gtkmm/Makefile gtk/gtkmm/private/Makefile" - - - ac_config_files="$ac_config_files scripts/Makefile" -@@ -22870,22 +22867,6 @@ do - "gtk/src/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/src/Makefile" ;; - "gtk/gtkmm/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/Makefile" ;; - "gtk/gtkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/private/Makefile" ;; -- "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; -- "tools/m4/Makefile") CONFIG_FILES="$CONFIG_FILES tools/m4/Makefile" ;; -- "tools/extra_defs_gen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/extra_defs_gen/Makefile" ;; -- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; -- "tests/child_widget/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget/Makefile" ;; -- "tests/child_widget2/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget2/Makefile" ;; -- "tests/child_widget_managed/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget_managed/Makefile" ;; -- "tests/refcount_dialog/Makefile") CONFIG_FILES="$CONFIG_FILES tests/refcount_dialog/Makefile" ;; -- "tests/dialog/Makefile") CONFIG_FILES="$CONFIG_FILES tests/dialog/Makefile" ;; -- "tests/dialog_deletethis/Makefile") CONFIG_FILES="$CONFIG_FILES tests/dialog_deletethis/Makefile" ;; -- "tests/delete_cpp_child/Makefile") CONFIG_FILES="$CONFIG_FILES tests/delete_cpp_child/Makefile" ;; -- "tests/main_with_options/Makefile") CONFIG_FILES="$CONFIG_FILES tests/main_with_options/Makefile" ;; -- "tests/menu_destruction/Makefile") CONFIG_FILES="$CONFIG_FILES tests/menu_destruction/Makefile" ;; -- "tests/property_notification/Makefile") CONFIG_FILES="$CONFIG_FILES tests/property_notification/Makefile" ;; -- "tests/scrolledwindow/Makefile") CONFIG_FILES="$CONFIG_FILES tests/scrolledwindow/Makefile" ;; -- "tests/wrap_existing/Makefile") CONFIG_FILES="$CONFIG_FILES tests/wrap_existing/Makefile" ;; - "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - "MSVC_Net2005/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/Makefile" ;; - "MSVC_Net2005/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/gendef/Makefile" ;; ---- a/configure.in -+++ b/configure.in -@@ -405,26 +405,6 @@ AC_CONFIG_FILES([ - gtk/src/Makefile - gtk/gtkmm/Makefile - gtk/gtkmm/private/Makefile -- -- tools/Makefile -- tools/m4/Makefile -- tools/extra_defs_gen/Makefile --]) -- --AC_CONFIG_FILES([ -- tests/Makefile -- tests/child_widget/Makefile -- tests/child_widget2/Makefile -- tests/child_widget_managed/Makefile -- tests/refcount_dialog/Makefile -- tests/dialog/Makefile -- tests/dialog_deletethis/Makefile -- tests/delete_cpp_child/Makefile -- tests/main_with_options/Makefile -- tests/menu_destruction/Makefile -- tests/property_notification/Makefile -- tests/scrolledwindow/Makefile -- tests/wrap_existing/Makefile - ]) - - AC_CONFIG_FILES([ ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,7 +6,7 @@ else - ATK_SUBDIR= - endif - --SUBDIRS = tools $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2005 MSVC_Net2008 win32_installer -+SUBDIRS = $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ MSVC_Net2005 MSVC_Net2008 win32_installer - DIST_SUBDIRS = $(SUBDIRS) scripts - - EXTRA_DIST = build_shared/Makefile_build.am_fragment \ ---- a/Makefile.in -+++ b/Makefile.in -@@ -213,7 +213,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @GTKMM_ATKMM_ENABLED_FALSE@ATK_SUBDIR = - @GTKMM_ATKMM_ENABLED_TRUE@ATK_SUBDIR = atk --SUBDIRS = tools $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2005 MSVC_Net2008 win32_installer -+SUBDIRS = $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ MSVC_Net2005 MSVC_Net2008 win32_installer - DIST_SUBDIRS = $(SUBDIRS) scripts - EXTRA_DIST = build_shared/Makefile_build.am_fragment \ - build_shared/Makefile_build_gensrc.am_fragment \ diff --git a/Xorg/lib/hippo-canvas/Makefile b/Xorg/lib/hippo-canvas/Makefile deleted file mode 100644 index 696cfeee1..000000000 --- a/Xorg/lib/hippo-canvas/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# -# Copyright (C) 2008-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=hippo-canvas -PKG_VERSION:=0.3.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.3/ -PKG_MD5SUM:=9a0f64eb0258a3e8ba710eff9798a7d0 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk --include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) - -PKG_INSTALL:=1 - -EXTRA_CFLAGS += \ - -I$(INTL_PREFIX)/include \ - -I$(STAGING_DIR)/usr/include/libcroco-0.6 \ - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_hippo-canvas CONFIG_PACKAGE_python-hippo-canvas) - -define Package/hippo-canvas/Default - URL:=http://developer.mugshot.org/wiki/Hippo_Canvas - DEPENDS:=@FEATURE_drawing-backend_libX11 -endef - -define Package/hippo-canvas -$(call Package/hippo-canvas/Default) - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Hippo Canvas - DEPENDS+=+librsvg +gtk2 +cairo +libcroco +pango -endef - -define Package/hippo-canvas/description -The Hippo Canvas is a Cairo/GObject/GTK+ based canvas, written in C with -support for flexible layout, CSS styling, and initial work on animations. -endef - -define Package/python-hippo-canvas -$(call Package/hippo-canvas/Default) - SECTION:=lang-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Python bindings for hippo canvas - DEPENDS+=+python-mini +PACKAGE_python-hippo-canvas:python-gtk +PACKAGE_python-hippo-canvas:pycairo +hippo-canvas -endef - -define Build/Configure - $(call Build/Configure/Default, \ - $(if $(CONFIG_PACKAGE_python-hippo-canvas), \ - --enable-python, \ - --disable-python \ - ) \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(INSTALL_DIR) $(1)/usr/include/hippo-canvas-1/hippo/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/hippo-canvas-1/hippo/* \ - $(1)/usr/include/hippo-canvas-1/hippo/ -endef - -define Package/hippo-canvas/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -define Package/python-hippo-canvas/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/*.so* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call BuildPackage,hippo-canvas)) -$(eval $(call BuildPackage,python-hippo-canvas)) diff --git a/Xorg/lib/hippo-canvas/patches/010-use-python-config b/Xorg/lib/hippo-canvas/patches/010-use-python-config deleted file mode 100644 index 26ad36f26..000000000 --- a/Xorg/lib/hippo-canvas/patches/010-use-python-config +++ /dev/null @@ -1,17 +0,0 @@ ---- hippo-canvas-0.3.0.orig/configure 2008-09-30 22:18:23.000000000 +0200 -+++ hippo-canvas-0.3.0/configure 2008-09-30 22:41:16.000000000 +0200 -@@ -20486,10 +20486,14 @@ - echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -+if test -x "$PYTHON-config"; then -+PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` -+else - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi -+fi - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" diff --git a/Xorg/lib/imlib2/Makefile b/Xorg/lib/imlib2/Makefile deleted file mode 100644 index 569567f37..000000000 --- a/Xorg/lib/imlib2/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=imlib2 -PKG_VERSION:=1.4.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/enlightenment -PKG_MD5SUM:=20d59c7cda06742015baade6f5975415 - -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL=1 - -define Package/imlib2 - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Image library - DEPENDS:=+libX11 +giflib +libtiff +libjpeg +gtk1 +libfreetype +libXext - URL:=http://docs.enlightenment.org/api/imlib2/html/ -endef - -TARGET_CFLAGS += "-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Build/Configure - $(call Build/Configure/Default, \ - --x-includes="$(STAGING_DIR)/usr/include/X11" \ - --x-libraries="$(STAGING_DIR)/usr/lib/" \ - --disable-gtktest \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{include,lib/pkgconfig} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*,a} \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(INSTALL_DIR) $(2)/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/imlib2-config \ - $(2)/bin/ - $(SED) \ - 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ - $(2)/bin/imlib2-config -endef - -define Package/imlib2/install - $(INSTALL_DIR) $(1)/usr/lib/imlib2/{loaders,filters} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/imlib2/filters/*.so* \ - $(1)/usr/lib/imlib2/filters - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/imlib2/loaders/*.so* \ - $(1)/usr/lib/imlib2/loaders -endef - -$(eval $(call BuildPackage,imlib2)) diff --git a/Xorg/lib/libast/Makefile b/Xorg/lib/libast/Makefile deleted file mode 100644 index 08b64a68f..000000000 --- a/Xorg/lib/libast/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libast -PKG_VERSION:=0.7 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.eterm.org/download/ -PKG_MD5SUM:=a9ec3b2da317f35869316e6d9571d296 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libast - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libast - DEPENDS:=+libpcre \ - +FEATURE_drawing-backend_libX11:libX11 \ - +FEATURE_drawing-backend_libX11:libXt -endef - -CONFIGURE_ARGS+= \ - --with-regexp="pcre" \ - --without-imlib \ - -ifneq ($(CONFIG_FEATURE_drawing-backend_libX11),) - CONFIGURE_ARGS+= \ - --with-x \ - --x-includes="$(STAGING_DIR)/usr/include" \ - --x-libraries="$(STAGING_DIR)/usr/lib" -else - CONFIGURE_ARGS+= \ - --without-x -endif - -CONFIGURE_VARS+= \ - dps_cv_snprintf_bug=0 \ - dps_cv_vsnprintf_bug=0 \ - dps_cv_symlink_open_bug=0 \ - -EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include $(2)/bin - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libast.{la,so*} $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(2)/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(SED) "s,-I/usr/include,,g" $(2)/bin/libast-config - $(SED) "s,-L/usr/lib,,g" $(2)/bin/libast-config - $(SED) "s,-L/usr/X11R6/lib,,g" $(2)/bin/libast-config -endef - -define Package/libast/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libast.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libast)) diff --git a/Xorg/lib/libast/patches/010-dont-add-host-paths.patch b/Xorg/lib/libast/patches/010-dont-add-host-paths.patch deleted file mode 100644 index 1d602a828..000000000 --- a/Xorg/lib/libast/patches/010-dont-add-host-paths.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/configure -+++ b/configure -@@ -27152,10 +27152,10 @@ fi; - - - -- CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` -+ CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"` - CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` - CFLAGS=${CFLAGS--O} -- LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` -+ LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"` - LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` - LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" - ---- a/libast.m4 -+++ b/libast.m4 -@@ -398,10 +398,10 @@ dnl# - dnl# LibAST macro for flag post-processing - dnl# - AC_DEFUN([AST_FLAGS], [ -- CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` -+ CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"` - CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` - CFLAGS=${CFLAGS--O} -- LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` -+ LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"` - LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` - LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" - ]) diff --git a/Xorg/lib/libast/patches/100-configure.patch b/Xorg/lib/libast/patches/100-configure.patch deleted file mode 100644 index 6ca1be64c..000000000 --- a/Xorg/lib/libast/patches/100-configure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure -+++ b/configure -@@ -23906,7 +23906,7 @@ else - - mkdir conftest.d - if test "$cross_compiling" = yes; then -- dps_cv_symlink_open_buf=3 -+ dps_cv_symlink_open_bug=3 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ ---- a/libast.m4 -+++ b/libast.m4 -@@ -573,7 +573,7 @@ int main(void) - dps_cv_symlink_open_bug=1 - fi - ], -- dps_cv_symlink_open_buf=3) -+ dps_cv_symlink_open_bug=3) - rm -rf conftest.d - ]) - case "$dps_cv_symlink_open_bug" in diff --git a/Xorg/lib/libdrm/Makefile b/Xorg/lib/libdrm/Makefile deleted file mode 100644 index 87dd985e1..000000000 --- a/Xorg/lib/libdrm/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libdrm -PKG_VERSION:=2.3.1 -PKG_RELEASE:=3 - -PKG_SOURCE_URL:=http://dri.freedesktop.org/libdrm -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=620fe7dd02c3236c3e9881a3a238173d - -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -define Package/libdrm - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:= - TITLE:=libdrm - URL:=http://dri.freedesktop.org/ -endef - -CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb - -define Build/Compile - $(call $(PKG_NAME)/Compile) - make -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf -endef - -define Package/libdrm/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,libdrm)) diff --git a/Xorg/lib/libfakekey/Makefile b/Xorg/lib/libfakekey/Makefile deleted file mode 100644 index f41e333a2..000000000 --- a/Xorg/lib/libfakekey/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libfakekey -PKG_REV:=2111 -PKG_VERSION:=svn$(PKG_REV) -PKG_RELEASE:=1 - -PKG_SOURCE:=libfakekey-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://svn.o-hand.com/repos/matchbox/trunk/libfakekey -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -define Package/libfakekey - SECTION:=xorg-lib - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libfakekey - MAINTAINER:=Michael Buesch - URL:=http://matchbox-project.org/?p=1 - DEPENDS:=+libX11 +libXtst -endef - -define Package/libfakekey/description - X11 keyboard faking library -endef - -EXTRA_LDFLAGS:=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/fakekey $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/fakekey/fakekey.h \ - $(1)/usr/include/fakekey/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*{.so,.a}* $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libfakekey.pc \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libfakekey/install - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libfakekey)) diff --git a/Xorg/lib/libmatchbox/Makefile b/Xorg/lib/libmatchbox/Makefile deleted file mode 100644 index 1c7d7062c..000000000 --- a/Xorg/lib/libmatchbox/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libmatchbox -PKG_RELEASE:=2 -PKG_VERSION:=1.9 -PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=9f73e7515cc4679171a5db180dc1343b -PKG_FIXUP:=libtool - -EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/ - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -PKG_INSTALL:=1 - -define Package/libmatchbox - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXft +libpng +libjpeg +libXext +pango +check - TITLE:=libmatchbox - URL:=http://matchbox-project.org -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-pango \ - --enable-jpeg \ - --enable-png \ - --enable-Xft \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/libmb - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/libmb/*.h \ - $(1)/usr/include/libmb/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libmb.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libmatchbox/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libmb.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libmatchbox)) diff --git a/Xorg/lib/librsvg/Makefile b/Xorg/lib/librsvg/Makefile deleted file mode 100644 index be0291d90..000000000 --- a/Xorg/lib/librsvg/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=librsvg -PKG_VERSION:=2.22.3 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22 -PKG_MD5SUM:=c4ec4fdb2b1842e221ca39127e85682d -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -PKG_INSTALL=1 - -EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -L$(ICONV_PREFIX)/lib/ \ - -L$(INTL_PREFIX)/lib/ - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_librsvg CONFIG_PACKAGE_librsvg-pixbuf-loader) - -define Package/librsvg - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=SVG rendering library - URL:=http://librsvg.sourceforge.net/ - DEPENDS:=+cairo +libxml2 +glib2 +libcroco +pango +gtk2 -endef - -define Package/librsvg-pixbuf-loader - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=SVG rendering library - URL:=http://librsvg.sourceforge.net/ - DEPENDS:=librsvg -endef - -define Package/librsvg/description -librsvg is a high performance SVG rendering library associated with the Gnome Project. -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --disable-gtk-theme \ - --disable-mozilla-plugin \ - --with-croco \ - $(if $(CONFIG_PACKAGE_librsvg-pixbuf-loader), \ - --enable-pixbuf-loader,\ - --disable-pixbuf-loader \ - ) \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ - $(INSTALL_DIR) $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ -endef - -define Package/librsvg/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -define Package/librsvg-pixbuf-loader/install - $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/loaders - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/loaders/*.so* \ - $(1)/usr/lib/gtk-2.0/2.10.0/loaders -endef - -$(eval $(call BuildPackage,librsvg)) -$(eval $(call BuildPackage,librsvg-pixbuf-loader)) diff --git a/Xorg/lib/libxcb/Makefile b/Xorg/lib/libxcb/Makefile deleted file mode 100644 index 6698b7af4..000000000 --- a/Xorg/lib/libxcb/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libxcb -PKG_VERSION:=1.1 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ -PKG_MD5SUM:=9310b02433273d75d42f10da3c7455aa -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xcbproto libpthread-stubs - -include $(INCLUDE_DIR)/package.mk - -PROTOS:=composite damage dpms glx randr record render res screensaver shape \ - shm sync xevie xf86dri xfixes xinerama xprint xtest xvmc xv - -define Package/libxcb - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libxcb - DEPENDS:=+libXau +libXdmcp - URL:=http://xcb.freedesktop.org/ -endef - -define Package/libxcb/description -libxcb provides an interface to the X Window System protocol, which -replaces the current Xlib interface. -endef - -define Package/libxcb-xlib - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libxcb-xlib - DEPENDS:=+libxcb -endef - -define Package/libxcb-proto/Default -define Package/libxcb-$(1) - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libxcb-$(1) - DEPENDS:=+libxcb -endef -endef - -$(foreach proto,$(PROTOS),$(eval $(call Package/libxcb-proto/Default,$(proto)))) - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/xcb} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/xcb/* \ - $(1)/usr/include/xcb/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libxcb/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libxcb.so* \ - $(1)/usr/lib/ -endef - -define Package/libxcb-xlib/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libxcb-xlib.so* \ - $(1)/usr/lib/ -endef - -define Package/libxcb-proto/install/Default -define Package/libxcb-$(1)/install - $(INSTALL_DIR) $$(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libxcb-$(1).so* \ - $$(1)/usr/lib/ -endef -endef - -$(foreach proto,$(PROTOS),$(eval $(call Package/libxcb-proto/install/Default,$(proto)))) - -$(eval $(call BuildPackage,libxcb)) -$(eval $(call BuildPackage,libxcb-xlib)) -$(foreach proto,$(PROTOS),$(eval $(call BuildPackage,libxcb-$(proto)))) diff --git a/Xorg/lib/mesa/Makefile b/Xorg/lib/mesa/Makefile deleted file mode 100644 index 57db41d58..000000000 --- a/Xorg/lib/mesa/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=Mesa -PKG_RELEASE:=2 -PKG_VERSION:=7.2 - -PKG_SOURCE_URL:=@SF/mesa3d -PKG_SOURCE:=$(PKG_NAME)Lib-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=04d379292e023df0b0266825cb0dbde5 -PKG_FIXUP:=libtool -PKG_BUILD_DEPENDS:=glproto - -include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL:=1 - -define Package/libgl-mesa - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext +libXfixes +libXdamage +libXxf86vm +libdrm +libexpat - TITLE:=Mesa OpenGL library - URL:=http://mesa3d.org -endef - -define Package/libglu-mesa - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libgl-mesa - TITLE:=Mesa OpenGL utility library - URL:=http://mesa3d.org -endef - -define Package/libgl-mesa-dri/Default -define Package/libgl-mesa-dri-$(1) - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=libgl-mesa @DISPLAY_SUPPORT $(if $(findstring swrast,$(1)),,@TARGET_x86) - TITLE:=mesa dri $(1) - URL:=http://mesa3d.org -endef -endef - -DRIDRIVERS:=i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \ - savage sis tdfx trident unichrome ffb swrast - -$(foreach dri,$(DRIDRIVERS),$(eval $(call Package/libgl-mesa-dri/Default,$(dri)))) - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_libgl-mesa \ - CONFIG_PACKAGE_libglu-mesa \ - $(foreach dri,$(DRIDRIVERS),CONFIG_PACKAGE_libgl-mesa-dri-$(dri))) - -define Build/Configure - $(call Build/Configure/Default, \ - --disable-glw \ - --with-driver=dri \ - --with-dri-drivers="$(foreach dri,$(DRIDRIVERS),$(if $(CONFIG_PACKAGE_libgl-mesa-dri-$(dri)),$(dri)))" \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{include/GL,lib/pkgconfig} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/GL/* \ - $(1)/usr/include/GL - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig -endef - -define Package/libgl-mesa/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libGL.so* \ - $(1)/usr/lib/ -endef - -define Package/libglu-mesa/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libGLU.so* \ - $(1)/usr/lib/ -endef - -define Package/libgl-mesa-dri/install/Default -define Package/libgl-mesa-dri-$(1)/install - $(INSTALL_DIR) $$(1)/usr/lib/dri/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/dri/$(1)_dri.so* \ - $$(1)/usr/lib/dri -endef -endef - -$(foreach dri,$(DRIDRIVERS),$(eval $(call Package/libgl-mesa-dri/install/Default,$(dri)))) - -$(eval $(call BuildPackage,libgl-mesa)) -$(eval $(call BuildPackage,libglu-mesa)) -$(foreach dri,$(DRIDRIVERS),$(eval $(call BuildPackage,libgl-mesa-dri-$(dri)))) diff --git a/Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch b/Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch deleted file mode 100644 index 9fe4116f4..000000000 --- a/Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: Mesa-7.2/src/glu/glu.pc.in -=================================================================== ---- Mesa-7.2.orig/src/glu/glu.pc.in 2008-08-25 16:46:42.000000000 +0200 -+++ Mesa-7.2/src/glu/glu.pc.in 2011-01-27 19:29:13.220654415 +0100 -@@ -1,7 +1,7 @@ --prefix=@INSTALL_DIR@ --exec_prefix=${prefix} --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INC_DIR@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: glu - Description: Mesa OpenGL Utility library -Index: Mesa-7.2/src/glw/glw.pc.in -=================================================================== ---- Mesa-7.2.orig/src/glw/glw.pc.in 2008-08-25 16:46:42.000000000 +0200 -+++ Mesa-7.2/src/glw/glw.pc.in 2011-01-27 19:29:28.723225782 +0100 -@@ -1,7 +1,7 @@ --prefix=@INSTALL_DIR@ --exec_prefix=${prefix} --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INC_DIR@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: glw - Description: Mesa OpenGL widget library -Index: Mesa-7.2/src/mesa/drivers/dri/dri.pc.in -=================================================================== ---- Mesa-7.2.orig/src/mesa/drivers/dri/dri.pc.in 2008-08-25 16:46:43.000000000 +0200 -+++ Mesa-7.2/src/mesa/drivers/dri/dri.pc.in 2011-01-27 19:29:49.747288575 +0100 -@@ -1,8 +1,8 @@ --prefix=@INSTALL_DIR@ --exec_prefix=${prefix} --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INC_DIR@ --dridriverdir=@DRI_DRIVER_DIR@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+dridriverdir=@DRI_DRIVER_INSTALL_DIR@ - - Name: dri - Description: Direct Rendering Infrastructure -Index: Mesa-7.2/src/mesa/gl.pc.in -=================================================================== ---- Mesa-7.2.orig/src/mesa/gl.pc.in 2008-08-25 16:46:44.000000000 +0200 -+++ Mesa-7.2/src/mesa/gl.pc.in 2011-01-27 19:30:13.700079977 +0100 -@@ -1,7 +1,7 @@ --prefix=@INSTALL_DIR@ --exec_prefix=${prefix} --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INC_DIR@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: gl - Description: Mesa OpenGL library -Index: Mesa-7.2/configure -=================================================================== ---- Mesa-7.2.orig/configure 2008-09-13 22:45:59.000000000 +0200 -+++ Mesa-7.2/configure 2011-01-27 19:27:08.622125839 +0100 -@@ -8858,7 +8858,7 @@ - LDFLAGS="$_SAVE_LDFLAGS" - CPPFLAGS="$_SAVE_CPPFLAGS" - --ac_config_files="$ac_config_files configs/autoconf" -+ac_config_files="$ac_config_files configs/autoconf src/glu/glu.pc src/glw/glw.pc src/mesa/drivers/dri/dri.pc src/mesa/gl.pc" - - - ac_config_commands="$ac_config_commands configs" -@@ -9435,6 +9435,10 @@ - for ac_config_target in $ac_config_targets - do - case $ac_config_target in -+ "src/glu/glu.pc") CONFIG_FILES="$CONFIG_FILES src/glu/glu.pc" ;; -+ "src/glw/glw.pc") CONFIG_FILES="$CONFIG_FILES src/glw/glw.pc" ;; -+ "src/mesa/drivers/dri/dri.pc") CONFIG_FILES="$CONFIG_FILES src/mesa/drivers/dri/dri.pc" ;; -+ "src/mesa/gl.pc") CONFIG_FILES="$CONFIG_FILES src/mesa/gl.pc" ;; - "configs/autoconf") CONFIG_FILES="$CONFIG_FILES configs/autoconf" ;; - "configs") CONFIG_COMMANDS="$CONFIG_COMMANDS configs" ;; - diff --git a/Xorg/lib/packages b/Xorg/lib/packages deleted file mode 100644 index 031006832..000000000 --- a/Xorg/lib/packages +++ /dev/null @@ -1,23 +0,0 @@ -libfontenc-1.0.4|+xproto+zlib -libICE-1.0.4|+xproto+xtrans -libSM-1.0.3|+xproto+xtrans+libICE -_libX11-1.1.5|+bigreqsproto+xproto+xextproto+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto+libXau -libXau-1.0.4|+xproto -libXaw-1.0.4|+xproto+libX11+libXext+xextproto+libXt+libXmu+libXpm+printproto+libXau -libXcursor-1.1.9|+libXrender+libXfixes -libXdmcp-1.0.2|+xproto -libXext-1.0.4|+xproto+xextproto+libX11+libXau -libXfixes-4.0.3|+xproto+fixesproto+xextproto+libX11 -libXfont-1.3.3|+zlib+xproto+xtrans+libfontenc+fontcacheproto+fontsproto+libfreetype -libxkbfile-1.0.5|+libX11+kbproto -libXmu-1.0.4|+libXt+libXext+xextproto -libXpm-3.5.7|+xproto+libX11 -libXrandr-1.2.3|+libXext+libXrender+randrproto+renderproto+xextproto+libX11 -libXrender-0.9.4|+libX11+renderproto -libXt-1.0.5|+libSM+libX11+xproto+kbproto -libXtst-1.0.3|+libX11+libXext+recordproto+xextproto+inputproto -libXv-1.0.4|+libXext+videoproto -libXvMC-1.0.4|+libXext+videoproto+libXv -libXxf86misc-1.0.1|+xproto+libX11+xextproto+libXext+xf86miscproto -libXxf86vm-1.0.2|+xproto+libX11+xextproto+libXext+xf86vidmodeproto -xtrans-1.2.1| diff --git a/Xorg/lib/pango/Makefile b/Xorg/lib/pango/Makefile deleted file mode 100644 index 693b47ecb..000000000 --- a/Xorg/lib/pango/Makefile +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pango -PKG_VERSION:=1.28.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.28/ -PKG_MD5SUM:=3f3989700f04e9117d30544a9078b3a0 - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=0 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/pango - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Text layout and rendering library - DEPENDS:=+cairo +glib2 +fontconfig +libfreetype \ - +FEATURE_drawing-backend_libX11:libX11 \ - +FEATURE_drawing-backend_libX11:libXft - URL:=http://www.pango.org/ -endef - -define Package/pango/description -Pango is a library for layout and rendering of text, with an emphasis -on internationalization. Pango can be used anywhere that text layout -is needed; however, most of the work on Pango so far has been done using -the GTK+ widget toolkit as a test platform. Pango forms the core of text -and font handling for GTK+-2.x. -endef - -CONFIGURE_ARGS += \ - $(if $(CONFIG_PACKAGE_libX11), --with-x, --without-x) - -CONFIGURE_VARS += \ - CXX="$(TARGET_CC)" - -define Build/InstallDev - $(INSTALL_DIR) \ - $(1)/usr/lib/pkgconfig \ - $(1)/usr/lib/pango/1.6.0/modules \ - $(1)/usr/include - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \ - $(1)/usr/lib/pango/1.6.0/modules/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ - $(1)/usr/lib/pkgconfig - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ -endef - -define Package/pango/install - $(INSTALL_DIR) \ - $(1)/usr/lib/pango/1.6.0/modules \ - $(1)/usr/bin \ - $(1)/etc/init.d - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \ - $(1)/usr/lib/pango/1.6.0/modules/ - - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/pango-querymodules \ - $(1)/usr/bin/ - - $(INSTALL_BIN) \ - ./files/pango-querymodules.init \ - $(1)/etc/init.d/pango-querymodules -endef - -$(eval $(call BuildPackage,pango)) diff --git a/Xorg/lib/pango/files/pango-querymodules.init b/Xorg/lib/pango/files/pango-querymodules.init deleted file mode 100755 index f7f56e5ca..000000000 --- a/Xorg/lib/pango/files/pango-querymodules.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2007 OpenWrt.org - -START=99 -FILE=/etc/pango/pango.modules - -start() { - if [ ! -e ${FILE} ]; then - mkdir -p $(dirname ${FILE}) - pango-querymodules > ${FILE} - fi -} diff --git a/Xorg/lib/pangomm/Makefile b/Xorg/lib/pangomm/Makefile deleted file mode 100644 index 40ed5d6c6..000000000 --- a/Xorg/lib/pangomm/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pangomm -PKG_VERSION:=2.26.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.26/ -PKG_MD5SUM:=37f54dc8e6cb73ed923b22f313352156 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/pangomm - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Text layout and rendering library - DEPENDS:=+glibmm +cairomm +pango - URL:=http://www.pango.org/ -endef - -CONFIGURE_ARGS+= --disable-documentation - -define Package/pangomm/description -c++-bindings for pango -endef - -define Build/InstallDev - $(INSTALL_DIR) \ - $(1)/usr/lib/pkgconfig \ - $(1)/usr/lib/pangomm/1.6.0/modules \ - $(1)/usr/include - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/* \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ -endef - -define Package/pangomm/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,pangomm)) diff --git a/Xorg/lib/pixman/Makefile b/Xorg/lib/pixman/Makefile deleted file mode 100644 index c34e4e2cf..000000000 --- a/Xorg/lib/pixman/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pixman -PKG_RELEASE:=1 -PKG_VERSION:=0.16.2 - -PKG_SOURCE_URL:=http://cairographics.org/releases/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=02bd3669f53c404c19980d5efb6f86fb - -PKG_FIXUP:=libtool - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/pixman - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=pixman - URL:=http://cairographics.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --disable-gtk \ - --disable-arm-simd \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1) -endef - -define Package/pixman/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,pixman)) diff --git a/Xorg/lib/qt4/Config.in b/Xorg/lib/qt4/Config.in deleted file mode 100644 index d33e5d936..000000000 --- a/Xorg/lib/qt4/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -if PACKAGE_qt4-gui - -choice - prompt "qt4 window system" - default QT4_WS_QWS - -config QT4_WS_QWS - bool "QWS window system" - depends on FEATURE_drawing-backend_DirectFB - help - Use QT4's internal QWS window system. - -config QT4_WS_X11 - bool "X11 window system" - depends on FEATURE_drawing-backend_libX11 - help - Use X11 - -endchoice - -endif diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile deleted file mode 100644 index b01f13d6c..000000000 --- a/Xorg/lib/qt4/Makefile +++ /dev/null @@ -1,789 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -# TODO: -# - test/add xcb support -# - handle plugins in a granular way (find out which packages should provide which plugins) - -include $(TOPDIR)/rules.mk - -PKG_NAME:=qt4 -PKG_VERSION:=4.7.0 -PKG_RELEASE:=1 -PKG_MD5SUM:=3a2f25b9b115037277f4fb759194a7a5 - -PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=ftp://ftp.qt.nokia.com/qt/source -PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_QT4_WS_QWS \ - CONFIG_QT4_WS_X11 \ - CONFIG_PACKAGE_directfb \ - CONFIG_PACKAGE_qt4-demos \ - CONFIG_PACKAGE_qt4-examples \ - CONFIG_PACKAGE_qt4-svg \ - CONFIG_PACKAGE_qt4-qt3support \ - CONFIG_PACKAGE_qt4-dbus \ - CONFIG_PACKAGE_qt4-phonon \ - CONFIG_PACKAGE_qt4-sqlite \ - CONFIG_PACKAGE_qt4-mysql \ - CONFIG_PACKAGE_qt4-webkit \ - CONFIG_PACKAGE_qt4-script \ - CONFIG_PACKAGE_qt4-scriptools \ - CONFIG_PACKAGE_qt4-openssl - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk --include $(if $(DUMP),,./files/qmake.mk) - -# this should be moved to a more generic place later, as other packages are configured different as well depending on available nptl support -ifeq ($(CONFIG_USE_GLIBC),y) - NPTL:=y -endif -ifeq ($(CONFIG_USE_EGLIBC),y) - NPTL:=y -endif -ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y) - NPTL:=y -endif - -define Package/qt4/config - source "$(SOURCE)/Config.in" -endef - -define Package/qt4/Default - SECTION:=xorg-framework - CATEGORY:=Xorg - SUBMENU:=framework - TITLE:=qt4 - DEPENDS:=qt4 - DEFAULT:=m if PACKAGE_qt4-gui && ALL - URL:=http://qt.nokia.com/ -endef - -define Package/qt4 - $(call Package/qt4/Default) - DEPENDS:=+zlib +libstdcpp @!LINUX_2_4 -endef - -define Package/qt4-gui - $(call Package/qt4/Default) - DEFAULT:= - DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \ - +FEATURE_drawing-backend_libX11:libX11 \ - +FEATURE_drawing-backend_libX11:libXext @DISPLAY_SUPPORT - TITLE+=(gui) -endef - -define Package/qt4-demos - $(call Package/qt4/Default) - TITLE+=(demos) - DEPENDS+=+qt4-gui -endef - -define Package/qt4-examples - $(call Package/qt4/Default) - TITLE+=(examples) - DEPENDS+=+qt4-gui +qt4-svg -endef - -define Package/qt4-network - $(call Package/qt4/Default) - TITLE+=(network) -endef - -define Package/qt4-sqlite - $(call Package/qt4/Default) - TITLE+=(sqlite) - DEPENDS+=+libsqlite3 -endef - -define Package/qt4-mysql - $(call Package/qt4/Default) - TITLE+=(mysql) - DEPENDS+=+libmysqlclient -endef - -define Package/qt4-openssl - $(call Package/qt4/Default) - TITLE+=(openssl) - DEPENDS+=+libopenssl -endef - -#define Package/qt4-multimedia -# $(call Package/qt4/Default) -# TITLE+=(multimedia) -#endef - -#define Package/qt4-audio-backend -# $(call Package/qt4/Default) -# TITLE+=(audio-backend) -#endef - -define Package/qt4-phonon - $(call Package/qt4/Default) - TITLE+=(phonon) - DEPENDS+=+qt4-gui +qt4-xml +qt4-dbus +qt4-network -endef - -#define Package/qt4-phonon-backend -# $(call Package/qt4/Default) -# TITLE+=(phonon-backend) -#endef - -define Package/qt4-svg - $(call Package/qt4/Default) - TITLE+=(svg) - DEPENDS+=+qt4-gui +qt4-network -endef - -define Package/qt4-webkit - $(call Package/qt4/Default) - TITLE+=(webkit) - DEPENDS+=@USE_GLIBC||@USE_EGLIBC||@UCLIBC_VERSION_0_9_32 +libsqlite3 +qt4-phonon +qt4-dbus +qt4-xml +qt4-gui +qt4-network # versions of uclibc prior 0.9.32 do not have nptl support -endef - -define Package/qt4-script - $(call Package/qt4/Default) - TITLE+=(script) - DEPENDS+=@USE_GLIBC||@USE_EGLIBC||@UCLIBC_VERSION_0_9_32 # versions of uclibc prior 0.9.32 do not have nptl support -endef - -define Package/qt4-scripttools - $(call Package/qt4/Default) - TITLE+=(scripttools) - DEPENDS+=+qt4-script +qt4-gui +qt4-network -endef - -#define Package/qt4-accessibility -# $(call Package/qt4/Default) -# TITLE+=(accessibility) -#endef - -#define Package/qt4-javascript-jit -# $(call Package/qt4/Default) -# TITLE+=(javascript-jit) -#endef - -#define Package/qt4-cups -# $(call Package/qt4/Default) -# TITLE+=(cups) -#endef - -define Package/qt4-dbus - $(call Package/qt4/Default) - TITLE+=(dbus) - DEPENDS+=+libdbus +qt4-xml -endef - -#define Package/qt4-gtkstyle -# $(call Package/qt4/Default) -# TITLE+=(gtkstyle) -#endef - -#define Package/qt4-glib -# $(call Package/qt4/Default) -# TITLE+=(glib) -#endef - -define Package/qt4-qt3support - $(call Package/qt4/Default) - TITLE+=(qt3support) - DEPENDS+=+qt4-gui +qt4-xml -endef - -define Package/qt4-declarative - $(call Package/qt4/Default) - TITLE+=(declarative) - DEPENDS+=+qt4-script +qt4-xml +qt4-gui +qt4-network -endef - -define Package/qt4-xml - $(call Package/qt4/Default) - TITLE+=(xml) -endef - -### -define Package/qt4-drivers-mouse/Default - $(call Package/qt4/Default) - TITLE+=mousedrivers - DEPENDS+=@QT4_WS_QWS -endef - -define Package/qt4-drivers-mouse-tpmousedriver - $(call Package/qt4-drivers-mouse/Default) - TITLE+=tpmousedriver -endef - -define Package/qt4-drivers-mouse-pcmousedriver - $(call Package/qt4-drivers-mouse/Default) - TITLE+=pcmousedriver -endef - -define Package/qt4-drivers-mouse-tslibmousedriver - $(call Package/qt4-drivers-mouse/Default) - TITLE+=tslibmousedriver - DEPENDS+=+tslib -endef - -### -define Package/qt4-drivers-gfx/Default - $(call Package/qt4/Default) - TITLE+=gfxdrivers - DEPENDS+=@QT4_WS_QWS -endef - -define Package/qt4-drivers-gfx-directfb - $(call Package/qt4-drivers-gfx/Default) - TITLE+=directfb - DEPENDS+=@FEATURE_drawing-backend_DirectFB +FEATURE_drawing-backend_DirectFB:directfb -endef - -define Package/qt4-drivers-gfx-linuxfb - $(call Package/qt4-drivers-gfx/Default) - TITLE+=linuxfb -endef - -define Package/qt4-drivers-gfx-vnc - $(call Package/qt4-drivers-gfx/Default) - TITLE+=VNC -endef - -### -define Package/qt4-drivers-kbd/Default - $(call Package/qt4/Default) - TITLE+=kbddrivers - DEPENDS+=@QT4_WS_QWS -endef - - -TARGET_INCDIRS+=$(STAGING_DIR)/include $(STAGING_DIR)/usr/include $(TOOLCHAIN_DIR)/include $(TOOLCHAIN_DIR)/usr/include -TARGET_LIBDIRS+=$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib $(TOOLCHAIN_DIR)/lib $(TOOLCHAIN_DIR)/usr/lib -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib,-rpath-link=$(PKG_BUILD_DIR)/lib -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/freetype2 -I$(PKG_BUILD_DIR)/include - -ifeq ($(CONFIG_QT4_WS_QWS),y) - FILEPFX:=qws- -endif -ifeq ($(CONFIG_QT4_WS_X11),y) - FILEPFX:=x11- -endif -ifeq ($(CONFIG_PACKAGE_qt4-gui),) - # If GUI is disabled, we use the X11 prefix. That's good enough, for now. - # The X11 files also work for non-GUI. - FILEPFX:=x11- -endif - -define Build/Configure - # NOTES: - # demos/examples: which demos are going to be built depends on which features are going to to be compiled into qt - # linuxfb/directfb: since directfb is not much overhead compared to plain framebuffer, force using directfb - # do not use fontconfig as it doesn't work anyway for qte - # bindir: bindir is where the host tools (qmake, moc, rcc, uic) will get installed into - they are just used on the host and not goig to be packaged - mkdir -p $(PKG_BUILD_DIR)/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ - $(CP) ./files/$(FILEPFX)qmake.conf $(PKG_BUILD_DIR)/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++/qmake.conf - $(CP) ./files/$(FILEPFX)qplatformdefs.h $(PKG_BUILD_DIR)/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++/qplatformdefs.h - ( cd $(PKG_BUILD_DIR) ; \ - TARGET_CC="$(TARGET_CROSS)gcc" \ - TARGET_CXX="$(TARGET_CROSS)g++" \ - TARGET_AR="$(TARGET_CROSS)ar cqs" \ - TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ - TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ - TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ - TARGET_INCDIRS="$(TARGET_INCDIRS)" \ - TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ - CFLAGS= \ - CXXFLAGS= \ - LDFLAGS= \ - STAGING_DIR="$(STAGING_DIR)" \ - STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ - ./configure \ - -arch $(ARCH) \ - -prefix $(CONFIGURE_PREFIX) \ - -bindir $(CONFIGURE_PREFIX)/bin \ - -libdir $(CONFIGURE_PREFIX)/lib \ - -datadir $(CONFIGURE_PREFIX)/share/Qt \ - -plugindir $(CONFIGURE_PREFIX)/lib/Qt/plugins \ - -demosdir $(CONFIGURE_PREFIX)/share/Qt/demos \ - -examplesdir $(CONFIGURE_PREFIX)/share/Qt/examples \ - -sysconfdir /etc/Qt \ - -no-rpath \ - -force-pkg-config \ - -continue \ - -nomake tools \ - $(if $(CONFIG_PACKAGE_qt4-demos),-make,-nomake) demos \ - $(if $(CONFIG_PACKAGE_qt4-examples),-make,-nomake) examples \ - -nomake docs \ - -nomake translations \ - -xplatform $(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ \ - -platform linux-g++ \ - $(if $(CONFIG_QT4_WS_X11),-x11,-embedded) \ - -release \ - -confirm-license \ - -opensource \ - -no-mmx \ - -no-3dnow \ - -no-sse \ - -no-sse2 \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libjpeg \ - -system-freetype \ - -system-sqlite \ - $(if $(CONFIG_PACKAGE_qt4-sqlite),-plugin-sql-sqlite) \ - $(if $(CONFIG_PACKAGE_qt4-mysql),-plugin-sql-mysql) \ - -no-decoration-styled \ - -no-decoration-windows \ - -no-decoration-default \ - -verbose \ - -no-multimedia \ - -no-audio-backend \ - $(if $(CONFIG_PACKAGE_qt4-phonon),-phonon,-no-phonon) \ - -no-phonon-backend \ - $(if $(CONFIG_PACKAGE_qt4-svg),-svg,-no-svg) \ - $(if $(CONFIG_PACKAGE_qt4-webkit),-webkit,-no-webkit) \ - -no-javascript-jit \ - $(if $(CONFIG_PACKAGE_qt4-script),-script,-no-script) \ - $(if $(CONFIG_PACKAGE_qt4-scripttools),-scripttools,-no-scripttools) \ - -no-accessibility \ - $(if $(CONFIG_PACKAGE_qt4-declarative),-declarative,-no-declarative) \ - $(if $(CONFIG_PACKAGE_qt4-openssl),-openssl -I $(STAGING_DIR)/usr/include,-no-openssl) \ - -no-nis \ - -no-cups \ - -iconv \ - $(if $(CONFIG_PACKAGE_qt4-dbus),-dbus,-no-dbus) \ - -no-gtkstyle \ - -no-nas-sound \ - -no-opengl \ - -no-openvg \ - -no-sm \ - -no-xshape \ - $(if $(CONFIG_QT4_WS_X11),-no-xsync,-xsync) \ - -no-xinerama \ - $(if $(CONFIG_QT4_WS_X11),-no-xcursor,-xcursor) \ - -no-xfixes \ - -no-xrandr \ - -no-xrender \ - -no-mitshm \ - $(if $(CONFIG_QT4_WS_X11),-no-fontconfig,-fontconfig) \ - $(if $(CONFIG_QT4_WS_X11),-no-xinput,-xinput) \ - $(if $(CONFIG_QT4_WS_X11),-no-xkb,-xkb) \ - -no-glib \ - $(if $(CONFIG_PACKAGE_qt4-qt3support),-qt3support,-no-qt3support) \ - -no-gfx-transformed \ - -no-gfx-qvfb \ - $(if $(CONFIG_PACKAGE_qt4-drivers-gfx-vnc),-plugin-gfx-vnc,-no-gfx-vnc) \ - -no-gfx-multiscreen \ - -no-gfx-qnx \ - $(if $(CONFIG_FEATURE_drawing-backend_DirectFB),$(if $(CONFIG_PACKAGE_directfb),-plugin-gfx-directfb)) \ - -plugin-gfx-linuxfb \ - -no-mouse-qvfb \ - -no-mouse-qnx \ - -qt-mouse-linuxinput \ - -plugin-mouse-linuxtp \ - -plugin-mouse-pc \ - -plugin-mouse-tslib \ - -no-kbd-qvfb \ - -no-kbd-qnx \ - -qt-kbd-tty \ - -qt-kbd-linuxinput \ - ) -endef - -define Build/Compile - # just passing results in not building 3rdparty/webkit/JavaScriptCore - # unfortunately in this particular case, makes further calls, therewith - # uses the qmake.conf which needs get the cross-compiling vars passed once again - TARGET_CC="$(TARGET_CROSS)gcc" \ - TARGET_CXX="$(TARGET_CROSS)g++" \ - TARGET_AR="$(TARGET_CROSS)ar cqs" \ - TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ - TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ - TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ - TARGET_INCDIRS="$(TARGET_INCDIRS)" \ - TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ - STAGING_DIR="$(STAGING_DIR)" \ - STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) - INSTALL_ROOT=$(PKG_INSTALL_DIR) \ - $(MAKE) -C $(PKG_BUILD_DIR) install -endef - -define Build/InstallDev - $(INSTALL_DIR) \ - $(STAGING_DIR_HOST)/bin - - # host tools (qmake, moc, rcc, uic) - $(CP) \ - $(PKG_INSTALL_DIR)/usr/bin/{qmake,moc,rcc,uic} \ - $(STAGING_DIR_HOST)/bin/ - - $(INSTALL_DIR) \ - $(1)/mk \ - $(1)/usr/share/mkspecs \ - $(1)/usr/lib/pkgconfig \ - $(1)/usr/lib \ - $(1)/usr/include \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - ./files/qmake.mk \ - $(1)/mk/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/Qt/mkspecs/* \ - $(1)/usr/share/mkspecs/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/* \ - # $(1)/usr/lib/Qt/plugins/ -endef - -define Package/qt4/install - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtCore.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/codecs/*.so \ - # $(1)/usr/lib/Qt/plugins/codecs/ -endef - -define Package/qt4-gui/install - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtGui.so* \ - $(1)/usr/lib/ - - #HACK: Qt4 requires having truetype fonts stored in /usr/lib/fonts - no subdirectories allowed, so use the dejavue set by default - ln -s \ - /usr/share/fonts/ttf-dejavu \ - $(1)/usr/lib/fonts - - # we use the dejavue font package instead - #$(INSTALL_DATA) \ - # $(PKG_INSTALL_DIR)/usr/lib/fonts/*.ttf \ - # $(1)/usr/lib/fonts/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/accessible \ - # $(1)/usr/lib/Qt/plugins/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/imageformats \ - # $(1)/usr/lib/Qt/plugins/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/inputmethods \ - # $(1)/usr/lib/Qt/plugins/ -endef - -define Package/qt4-demos/install - $(INSTALL_DIR) \ - $(1)/usr/share/Qt - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/Qt/demos \ - $(1)/usr/share/Qt/ - - $(FIND) \ - $(1) \ - -name "*.cpp" -o \ - -name "*.h" -o \ - -name "*.pro" \ - | $(XARGS) rm -endef - -define Package/qt4-examples/install - $(INSTALL_DIR) \ - $(1)/usr/share/Qt - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/Qt/examples \ - $(1)/usr/share/Qt/ - - $(FIND) \ - $(1) \ - -name "*.cpp" -o \ - -name "*.h" -o \ - -name "*.pro" \ - | $(XARGS) rm -endef - -define Package/qt4-network/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtNetwork.so* \ - $(1)/usr/lib/ -endef - -define Package/qt4-sqlite/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/sqldrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtSql.so* \ - $(1)/usr/lib/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/sqldrivers/libqsqlite.so \ - $(1)/usr/lib/Qt/plugins/sqldrivers/ -endef - -define Package/qt4-mysql/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/sqldrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtSql.so* \ - $(1)/usr/lib/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/sqldrivers/libqsqlmysql.so \ - $(1)/usr/lib/Qt/plugins/sqldrivers/ -endef - -#define Package/qt4-multimedia/install -# $(INSTALL_DIR) \ -# $(1)/usr/bin -# -# $(CP) \ -# $(PKG_INSTALL_DIR)/usr/bin/examples/* \ -# $(1)/usr/bin/ -#endef - -define Package/qt4-phonon/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libphonon.so* \ - $(1)/usr/lib/ -endef - -define Package/qt4-svg/install - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtSvg.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/iconengines \ - # $(1)/usr/lib/Qt/plugins/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/imageformats \ - # $(1)/usr/lib/Qt/plugins/ -endef - -define Package/qt4-webkit/install - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtWebKit.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/designer \ - # $(1)/usr/lib/Qt/plugins/ -endef - -define Package/qt4-script/install - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtScript.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/script \ - # $(1)/usr/lib/Qt/plugins/ -endef - -define Package/qt4-scripttools/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtScriptTools.so* \ - $(1)/usr/lib/ -endef - -define Package/qt4-dbus/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtDBus.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/bin/qdbus \ - # $(1)/usr/bin/ -endef - -define Package/qt4-qt3-support/install - $(INSTALL_DIR) \ - $(1)/usr/lib \ - $(1)/usr/lib/Qt/plugins - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQt3Support.so* \ - $(1)/usr/lib/ - - #$(CP) \ - # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/accessible \ - # $(1)/usr/lib/Qt/plugins/ -endef - -define Package/qt4-declarative/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtDeclarative.so* \ - $(1)/usr/lib/ -endef - -define Package/qt4-xml/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libQtXml.so* \ - $(1)/usr/lib/ -endef - -# plugins -# mouse drivers -define Package/qt4-drivers-mouse-tpmousedriver/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/mousedrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/mousedrivers/libqlinuxtpmousedriver.so \ - $(1)/usr/lib/Qt/plugins/mousedrivers/ -endef - -define Package/qt4-drivers-mouse-pcmousedriver/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/mousedrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/mousedrivers/libqpcmousedriver.so \ - $(1)/usr/lib/Qt/plugins/mousedrivers/ -endef - -define Package/qt4-drivers-mouse-tslibmousedriver/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/mousedrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/mousedrivers/libqtslibmousedriver.so \ - $(1)/usr/lib/Qt/plugins/mousedrivers/ -endef - -# graphics drivers -define Package/qt4-drivers-gfx-directfb/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/gfxdrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/gfxdrivers/libqdirectfbscreen.so \ - $(1)/usr/lib/Qt/plugins/gfxdrivers/ -endef - -define Package/qt4-drivers-gfx-linuxfb/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/gfxdrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/gfxdrivers/libqscreenlinuxfb.so \ - $(1)/usr/lib/Qt/plugins/gfxdrivers/ -endef - -define Package/qt4-drivers-gfx-vnc/install - $(INSTALL_DIR) \ - $(1)/usr/lib/Qt/plugins/gfxdrivers - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/gfxdrivers/libqgfxvnc.so \ - $(1)/usr/lib/Qt/plugins/gfxdrivers/ -endef - -# keyboard drivers - - - -$(eval $(call BuildPackage,qt4)) -$(eval $(call BuildPackage,qt4-gui)) -$(eval $(call BuildPackage,qt4-demos)) -$(eval $(call BuildPackage,qt4-examples)) -$(eval $(call BuildPackage,qt4-network)) -$(eval $(call BuildPackage,qt4-sqlite)) -$(eval $(call BuildPackage,qt4-mysql)) -$(eval $(call BuildPackage,qt4-openssl)) -#$(eval $(call BuildPackage,qt4-multimedia)) -#$(eval $(call BuildPackage,qt4-audio-backend)) -$(eval $(call BuildPackage,qt4-phonon)) -#$(eval $(call BuildPackage,qt4-phonon-backend)) -$(eval $(call BuildPackage,qt4-svg)) -$(eval $(call BuildPackage,qt4-webkit)) -$(eval $(call BuildPackage,qt4-script)) -$(eval $(call BuildPackage,qt4-scripttools)) -#$(eval $(call BuildPackage,qt4-accessibility)) -#$(eval $(call BuildPackage,qt4-javascript-jit)) -#$(eval $(call BuildPackage,qt4-cups)) -$(eval $(call BuildPackage,qt4-dbus)) -#$(eval $(call BuildPackage,qt4-gtkstyle)) -#$(eval $(call BuildPackage,qt4-glib)) -$(eval $(call BuildPackage,qt4-qt3support)) -$(eval $(call BuildPackage,qt4-declarative)) -$(eval $(call BuildPackage,qt4-xml)) - -$(eval $(call BuildPackage,qt4-drivers-mouse-tpmousedriver)) -$(eval $(call BuildPackage,qt4-drivers-mouse-pcmousedriver)) -$(eval $(call BuildPackage,qt4-drivers-mouse-tslibmousedriver)) - -$(eval $(call BuildPackage,qt4-drivers-gfx-directfb)) -$(eval $(call BuildPackage,qt4-drivers-gfx-linuxfb)) -$(eval $(call BuildPackage,qt4-drivers-gfx-vnc)) diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk deleted file mode 100644 index 341500869..000000000 --- a/Xorg/lib/qt4/files/qmake.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -QMAKE_PLATFORM_PREFIX:=$(if $(CONFIG_QT4_WS_QWS),qws/) -QMAKE_SPECFILE:=$(STAGING_DIR)/usr/share/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ - -TARGET_INCDIRS +=\ - $(TOOLCHAIN_DIR)/include \ - $(STAGING_DIR)/include \ - $(TOOLCHAIN_DIR)/usr/include \ - $(STAGING_DIR)/usr/include - -TARGET_LIBDIRS += \ - $(TOOLCHAIN_DIR)/lib \ - $(STAGING_DIR)/lib \ - $(TOOLCHAIN_DIR)/usr/lib \ - $(STAGING_DIR)/usr/lib - -define Build/Configure/Qmake - TARGET_CC="$(TARGET_CROSS)gcc" \ - TARGET_CXX="$(TARGET_CROSS)g++" \ - TARGET_AR="$(TARGET_CROSS)ar cqs" \ - TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ - TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ - TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ - TARGET_INCDIRS="$(TARGET_INCDIRS)" \ - TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ - TARGET_LIBS="$(TARGET_LIBS)" \ - STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ - STAGING_DIR="$(STAGING_DIR)" \ - qmake \ - -spec $(QMAKE_SPECFILE) \ - -o $(PKG_BUILD_DIR)/$(2)/Makefile \ - $(PKG_BUILD_DIR)/$(2)/$(1).pro -endef - -# we need to pass everything to $(MAKE) as well, as Makefiles may invoke qmake once again for creating further Makefiles -define Build/Compile/Default - TARGET_CC="$(TARGET_CROSS)gcc" \ - TARGET_CXX="$(TARGET_CROSS)g++" \ - TARGET_AR="$(TARGET_CROSS)ar cqs" \ - TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ - TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ - TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ - TARGET_INCDIRS="$(TARGET_INCDIRS)" \ - TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ - TARGET_LIBS="$(TARGET_LIBS)" \ - STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ - STAGING_DIR="$(STAGING_DIR)" \ - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ - $(1); -endef diff --git a/Xorg/lib/qt4/files/qws-qmake.conf b/Xorg/lib/qt4/files/qws-qmake.conf deleted file mode 100644 index 5e317dcd7..000000000 --- a/Xorg/lib/qt4/files/qws-qmake.conf +++ /dev/null @@ -1,45 +0,0 @@ -include(../../common/g++.conf) -include(../../common/linux.conf) -include(../../common/qws.conf) - -# QMAKE_{INC,LIB}DIR_QT needs to be overridden, -# as they're set to $$[QT_INSTALL_{HEADERS,LIBS}] by default -# which are compiled into the qmake binary statically -QMAKE_INCDIR_QT = $$(TARGET_INCDIRS) -QMAKE_LIBDIR_QT = $$(TARGET_LIBDIRS) -QMAKE_INCDIR = $$(TARGET_INCDIRS) -QMAKE_LIBDIR = $$(TARGET_LIBDIRS) -QMAKE_MOC = $$(STAGING_DIR_HOST)/bin/moc -QMAKE_UIC = $$(STAGING_DIR_HOST)/bin/uic -QMAKE_RCC = $$(STAGING_DIR_HOST)/bin/rcc -QMAKE_CC = $$(TARGET_CC) -QMAKE_CXX = $$(TARGET_CXX) -QMAKE_AR = $$(TARGET_AR) -QMAKE_OBJCOPY = $$(TARGET_OBJCOPY) -QMAKE_RANLIB = $$(TARGET_RANLIB) -QMAKE_CFLAGS = $$(TARGET_CFLAGS) -QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) -QMAKE_LINK = $$(TARGET_CXX) -QMAKE_LINK_C = $$(TARGET_CC) -QMAKE_LIBS = $$(TARGET_LIBS) -QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options - -#unset vars which would intefere with vars/flags passed over by OpenWrt -QMAKE_STRIP = # do not strip -QMAKE_STRIPFLAGS_LIB = # do not strip -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -QMAKE_CFLAGS_DEBUG = -QMAKE_CFLAGS_PRECOMPILE = -QMAKE_CFLAGS_USE_PRECOMPILE = -QMAKE_CXXFLAGS_WARN_ON = -QMAKE_CXXFLAGS_WARN_OFF = -QMAKE_CXXFLAGS_RELEASE = -QMAKE_CXXFLAGS_DEBUG = -QMAKE_CXXFLAGS_PRECOMPILE = -QMAKE_CXXFLAGS_USE_PRECOMPILE = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_NOUNDEF = - -load(qt_config) diff --git a/Xorg/lib/qt4/files/qws-qplatformdefs.h b/Xorg/lib/qt4/files/qws-qplatformdefs.h deleted file mode 100644 index 99e9a2792..000000000 --- a/Xorg/lib/qt4/files/qws-qplatformdefs.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../linux-g++/qplatformdefs.h" diff --git a/Xorg/lib/qt4/files/x11-qmake.conf b/Xorg/lib/qt4/files/x11-qmake.conf deleted file mode 100644 index b5a49c5f8..000000000 --- a/Xorg/lib/qt4/files/x11-qmake.conf +++ /dev/null @@ -1,50 +0,0 @@ -MAKEFILE_GENERATOR = UNIX -TARGET_PLATFORM = unix -CONFIG += qt warn_on release incremental link_prl -QT += core gui -QMAKE_INCREMENTAL_STYLE = sublib - -include(../common/g++.conf) -include(../common/linux.conf) - -# QMAKE_{INC,LIB}DIR_QT needs to be overridden, -# as they're set to $$[QT_INSTALL_{HEADERS,LIBS}] by default -# which are compiled into the qmake binary statically -QMAKE_INCDIR_QT = $$(TARGET_INCDIRS) -QMAKE_LIBDIR_QT = $$(TARGET_LIBDIRS) -QMAKE_INCDIR = $$(TARGET_INCDIRS) -QMAKE_LIBDIR = $$(TARGET_LIBDIRS) -QMAKE_MOC = $$(STAGING_DIR_HOST)/bin/moc -QMAKE_UIC = $$(STAGING_DIR_HOST)/bin/uic -QMAKE_RCC = $$(STAGING_DIR_HOST)/bin/rcc -QMAKE_CC = $$(TARGET_CC) -QMAKE_CXX = $$(TARGET_CXX) -QMAKE_AR = $$(TARGET_AR) -QMAKE_OBJCOPY = $$(TARGET_OBJCOPY) -QMAKE_RANLIB = $$(TARGET_RANLIB) -QMAKE_CFLAGS = $$(TARGET_CFLAGS) -QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) -QMAKE_LINK = $$(TARGET_CXX) -QMAKE_LINK_C = $$(TARGET_CC) -QMAKE_LIBS = $$(TARGET_LIBS) -QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options - -#unset vars which would intefere with vars/flags passed over by OpenWrt -QMAKE_STRIP = # do not strip -QMAKE_STRIPFLAGS_LIB = # do not strip -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -QMAKE_CFLAGS_DEBUG = -QMAKE_CFLAGS_PRECOMPILE = -QMAKE_CFLAGS_USE_PRECOMPILE = -QMAKE_CXXFLAGS_WARN_ON = -QMAKE_CXXFLAGS_WARN_OFF = -QMAKE_CXXFLAGS_RELEASE = -QMAKE_CXXFLAGS_DEBUG = -QMAKE_CXXFLAGS_PRECOMPILE = -QMAKE_CXXFLAGS_USE_PRECOMPILE = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_NOUNDEF = - -load(qt_config) diff --git a/Xorg/lib/qt4/files/x11-qplatformdefs.h b/Xorg/lib/qt4/files/x11-qplatformdefs.h deleted file mode 100644 index 5d22fb410..000000000 --- a/Xorg/lib/qt4/files/x11-qplatformdefs.h +++ /dev/null @@ -1 +0,0 @@ -#include "../linux-g++/qplatformdefs.h" diff --git a/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch b/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch deleted file mode 100644 index 0b2d0ef3b..000000000 --- a/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- qt-everywhere-opensource-src-4.7.0-beta1/src/network/kernel/qhostinfo_unix.cpp 2010-05-04 02:43:25.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/network/kernel/qhostinfo_unix.cpp.new 2010-06-20 14:43:48.565315801 +0200 -@@ -326,7 +326,7 @@ - - QString QHostInfo::localDomainName() - { --#if !defined(Q_OS_VXWORKS) -+#if 0 - resolveLibrary(); - if (local_res_ninit) { - // using thread-safe version ---- qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp 2010-05-04 02:43:25.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp.new 2010-06-20 14:43:48.565315801 +0200 -@@ -2499,8 +2499,8 @@ - break; - } - # endif -- if ( *res.defdname ) -- theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() ); -+// if ( *res.defdname ) -+// theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() ); - #else - res_init(); - int i; -@@ -2515,8 +2515,8 @@ - break; - } - # endif -- if ( *_res.defdname ) -- theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() ); -+// if ( *_res.defdname ) -+// theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() ); - #endif - - // the code above adds "0.0.0.0" as a name server at the slightest diff --git a/Xorg/lib/qt4/patches/200-depend-on-decoration.patch b/Xorg/lib/qt4/patches/200-depend-on-decoration.patch deleted file mode 100644 index 8e37ca836..000000000 --- a/Xorg/lib/qt4/patches/200-depend-on-decoration.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- qt/examples/qws/qws.pro 2010-02-11 16:55:17.000000000 +0100 -+++ qt/examples/qws/qws.pro.mod 2010-03-22 10:56:10.372868670 +0100 -@@ -1,7 +1,11 @@ - TEMPLATE = subdirs - # no /dev/fbX - !qnx:!vxworks:SUBDIRS = framebuffer --SUBDIRS += mousecalibration simpledecoration -+SUBDIRS += mousecalibration -+ -+!isEmpty( decorations ) { -+ SUBDIRS += simpledecoration -+} - - # install - sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/Xorg/lib/qt4/patches/300-compile-fixes.patch b/Xorg/lib/qt4/patches/300-compile-fixes.patch deleted file mode 100644 index 4282709ac..000000000 --- a/Xorg/lib/qt4/patches/300-compile-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - src/corelib/animation/qvariantanimation.h | 1 + - 1 file changed, 1 insertion(+) - ---- qt-everywhere-opensource-src-4.7.0-beta2.orig/src/corelib/animation/qvariantanimation.h -+++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/animation/qvariantanimation.h -@@ -117,6 +117,7 @@ private: - }; - - template -+static inline __attribute__((__always_inline__)) - void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress)) { - QVariantAnimation::registerInterpolator(reinterpret_cast(func), qMetaTypeId()); - } diff --git a/Xorg/lib/qt4/patches/400-do-not-pack-structs.patch b/Xorg/lib/qt4/patches/400-do-not-pack-structs.patch deleted file mode 100644 index c94cd351d..000000000 --- a/Xorg/lib/qt4/patches/400-do-not-pack-structs.patch +++ /dev/null @@ -1,263 +0,0 @@ -commit 57ad39ec62175eeea023ca802448ebb1605dca23 -Author: Andreas Kling -Date: Fri Nov 12 16:08:35 2010 +0100 - - Don't pack Harfbuzz structs, this causes unaligned access crashes. - - The memory-greediest structs have been reordered anyway, so the gain - from forcibly packing them is mostly negligible. - - Task-number: QTBUG-13395 - Reviewed-by: Thiago Macieira - -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h b/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h -index 0d7c2c2..0d631b2 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h -@@ -32,10 +32,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - typedef struct HB_GlyphItemRec_ { - HB_UInt gindex; - HB_UInt properties; -@@ -93,10 +89,6 @@ hb_buffer_add_glyph( HB_Buffer buffer, - HB_UInt properties, - HB_UInt cluster ); - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_BUFFER_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h -index 2a6d958..94e9b43 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h -@@ -33,11 +33,6 @@ - - HB_BEGIN_HEADER - -- --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - /* Attachment related structures */ - - struct HB_AttachPoint_ -@@ -126,10 +121,6 @@ _HB_GDEF_LoadMarkAttachClassDef_From_LookupFlags( HB_GDEFHeader* gdef, - HB_Lookup* lo, - HB_UShort num_lookups ); - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_GDEF_PRIVATE_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h -index f9a03dd..ccb6bf9 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h -@@ -31,10 +31,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - /* GDEF glyph properties. Note that HB_GDEF_COMPONENT has no corresponding - * flag in the LookupFlag field. */ - #define HB_GDEF_BASE_GLYPH 0x0002 -@@ -131,10 +127,6 @@ HB_Error HB_GDEF_Build_ClassDefinition( HB_GDEFHeader* gdef, - HB_UShort* glyph_array, - HB_UShort* class_array ); - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_GDEF_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h -index bccd6a2..d4e6b46 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h -@@ -39,10 +39,6 @@ - #define HB_END_HEADER /* nothing */ - #endif - --#if defined(__GNUC__) || defined(_MSC_VER) --#define HB_USE_PACKED_STRUCTS --#endif -- - HB_BEGIN_HEADER - - #ifndef FALSE -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h -index 39f3159..63ba907 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h -@@ -32,10 +32,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - /* shared tables */ - - #define VR_X_PLACEMENT_DEVICE 0 -@@ -720,10 +716,6 @@ HB_INTERNAL void - _HB_GPOS_Free_SubTable( HB_GPOS_SubTable* st, - HB_UShort lookup_type ); - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_GPOS_PRIVATE_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h -index 7eb329e..df0c3f6 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h -@@ -32,10 +32,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - typedef union HB_GSUB_SubTable_ HB_GSUB_SubTable; - - /* LookupType 1 */ -@@ -474,10 +470,6 @@ HB_INTERNAL void - _HB_GSUB_Free_SubTable( HB_GSUB_SubTable* st, - HB_UShort lookup_type ); - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_GSUB_PRIVATE_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h b/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h -index b00df44..6e452bd 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h -@@ -31,11 +31,6 @@ - - HB_BEGIN_HEADER - -- --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - /* Lookup types for glyph substitution */ - - #define HB_GSUB_LOOKUP_SINGLE 1 -@@ -139,10 +134,6 @@ HB_Error HB_GSUB_Register_Alternate_Function( HB_GSUBHeader* gsub, - HB_Error HB_GSUB_Apply_String( HB_GSUBHeader* gsub, - HB_Buffer buffer ); - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_GSUB_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open.h b/src/3rdparty/harfbuzz/src/harfbuzz-open.h -index 4ba6cf5..9ad7c98 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-open.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-open.h -@@ -30,10 +30,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - /* Use this if a feature applies to all glyphs */ - #define HB_ALL_GLYPHS 0xFFFF - -@@ -279,10 +275,6 @@ enum HB_Type_ - - typedef enum HB_Type_ HB_Type; - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif /* HARFBUZZ_OPEN_H */ -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h -index ab5c07a..470e27b 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h -@@ -34,10 +34,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - /* - using anything else than signed or unsigned for bitfields in C is non standard, - but accepted by almost all compilers. And it gives a significant reduction in -@@ -258,10 +254,6 @@ typedef struct HB_Font_ { - void *userData; - } HB_FontRec; - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - typedef struct HB_ShaperItem_ HB_ShaperItem; - - struct HB_ShaperItem_ { -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.h b/src/3rdparty/harfbuzz/src/harfbuzz-stream.h -index a155cc2..cfbfb1c 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.h -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.h -@@ -30,10 +30,6 @@ - - HB_BEGIN_HEADER - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(push, 1) --#endif -- - typedef struct HB_StreamRec_ - { - HB_Byte* base; -@@ -42,10 +38,6 @@ typedef struct HB_StreamRec_ - HB_UInt pos; - } HB_StreamRec; - --#ifdef HB_USE_PACKED_STRUCTS --#pragma pack(pop) --#endif -- - HB_END_HEADER - - #endif diff --git a/Xorg/lib/qt4/patches/500-allow-device-grabbing.patch b/Xorg/lib/qt4/patches/500-allow-device-grabbing.patch deleted file mode 100644 index 50d7aa085..000000000 --- a/Xorg/lib/qt4/patches/500-allow-device-grabbing.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qkbdlinuxinput_qws.cpp 2010-09-10 11:05:24.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qkbdlinuxinput_qws.cpp.mod 2011-04-28 21:57:04.208449828 +0200 -@@ -103,6 +103,7 @@ - QString dev = QLatin1String("/dev/input/event1"); - int repeat_delay = -1; - int repeat_rate = -1; -+ int grab = 0; - - QStringList args = device.split(QLatin1Char(':')); - foreach (const QString &arg, args) { -@@ -110,12 +111,15 @@ - repeat_delay = arg.mid(13).toInt(); - else if (arg.startsWith(QLatin1String("repeat-rate="))) - repeat_rate = arg.mid(12).toInt(); -+ else if (arg.startsWith(QLatin1String("grab="))) -+ grab = arg.mid(5).toInt(); - else if (arg.startsWith(QLatin1String("/dev/"))) - dev = arg; - } - - m_fd = QT_OPEN(dev.toLocal8Bit().constData(), O_RDWR, 0); - if (m_fd >= 0) { -+ ::ioctl(m_fd, EVIOCGRAB, grab); - if (repeat_delay > 0 && repeat_rate > 0) { - int kbdrep[2] = { repeat_delay, repeat_rate }; - ::ioctl(m_fd, EVIOCSREP, kbdrep); ---- qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qmouselinuxinput_qws.cpp 2010-09-10 11:05:24.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qmouselinuxinput_qws.cpp.mod 2011-04-28 21:57:13.358562410 +0200 -@@ -43,6 +43,7 @@ - - #include - #include -+#include - - #include - #include // overrides QT_OPEN -@@ -101,11 +102,19 @@ - setObjectName(QLatin1String("LinuxInputSubsystem Mouse Handler")); - - QString dev = QLatin1String("/dev/input/event0"); -- if (device.startsWith(QLatin1String("/dev/"))) -- dev = device; -+ int grab = 0; -+ -+ QStringList args = device.split(QLatin1Char(':')); -+ foreach (const QString &arg, args) { -+ if (arg.startsWith(QLatin1String("grab="))) -+ grab = arg.mid(5).toInt(); -+ else if (arg.startsWith(QLatin1String("/dev/"))) -+ dev = arg; -+ } - - m_fd = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0); - if (m_fd >= 0) { -+ ::ioctl(m_fd, EVIOCGRAB, grab); - m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); - connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData())); - } else { diff --git a/Xorg/lib/template.mk b/Xorg/lib/template.mk deleted file mode 100644 index e74a7e6dd..000000000 --- a/Xorg/lib/template.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=@BASE_NAME@ -PKG_NAME:=@NAME@ -PKG_RELEASE:=2 -PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ - -include $(INCLUDE_DIR)/package.mk - -define Package/@NAME@ - SECTION:=xorg-lib - CATEGORY:=Xorg - SUBMENU:=lib - DEPENDS:=@DEP@ @DISPLAY_SUPPORT - TITLE:=@NAME@ - URL:=http://xorg.freedesktop.org/ -endef - -CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb - -define Build/Compile - $(call $(PKG_NAME)/Compile) - make -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf -endef - -define Package/@NAME@/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,@NAME@)) diff --git a/Xorg/lib/tslib/Makefile b/Xorg/lib/tslib/Makefile deleted file mode 100644 index 69231829b..000000000 --- a/Xorg/lib/tslib/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tslib -PKG_VERSION:=1.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://download.berlios.de/tslib/ -PKG_MD5SUM:=92b2eb55b1e4ef7e2c0347069389390e - -PKG_INSTALL:=1 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk - -define Package/tslib - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Tslib is an abstraction layer for touchscreen panel events. - DEPENDS:=@!LINUX_2_4 - URL:=http://tslib.berlios.de/ -endef - -define Package/tslib/description - Tslib is an abstraction layer for touchscreen panel events, - as well as a filter stack for the manipulation of those events. - It was created by Russell King, of arm.linux.org.uk. - Examples of implemented filters include jitter smoothing and the calibration transform. -endef - -ifeq ($(CONFIG_TARGET_om_gta02),y) - TS_CALIBRATION:=pointercal_om_gta02 -endif - -define Build/Configure - (cd $(PKG_BUILD_DIR); ./autogen.sh ); - $(call Build/Configure/Default, --enable-malloc0returnsnull) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/tslib/install - $(INSTALL_DIR) $(1)/usr/lib/ts $(1)/usr/bin $(1)/etc - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/ts/*.so* $(1)/usr/lib/ts/ - $(INSTALL_DATA) ./files/ts.conf $(1)/etc/ - $(if $(TS_CALIBRATION),$(CP) ./files/$(TS_CALIBRATION) $(1)/etc/pointercal ) -endef - -$(eval $(call BuildPackage,tslib)) diff --git a/Xorg/lib/tslib/files/pointercal_om_gta02 b/Xorg/lib/tslib/files/pointercal_om_gta02 deleted file mode 100644 index 841ec7fab..000000000 Binary files a/Xorg/lib/tslib/files/pointercal_om_gta02 and /dev/null differ diff --git a/Xorg/lib/tslib/files/ts.conf b/Xorg/lib/tslib/files/ts.conf deleted file mode 100644 index 82f712ef4..000000000 --- a/Xorg/lib/tslib/files/ts.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=1 - -# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d -# module_raw collie - -# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 -# module_raw corgi - -# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface -# module_raw ucb1x00 - -# Uncomment if you're using an HP iPaq h3600 or similar -# module_raw h3600 - -# Uncomment if you're using a Hitachi Webpad -# module_raw mk712 - -# Uncomment if you're using an IBM Arctic II -# module_raw arctic2 - -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/Xorg/lib/tslib/patches/devfs.patch b/Xorg/lib/tslib/patches/devfs.patch deleted file mode 100644 index d7ef0a958..000000000 --- a/Xorg/lib/tslib/patches/devfs.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- tslib/tests/fbutils.c~devfs.patch -+++ tslib/tests/fbutils.c -@@ -44,8 +44,8 @@ - static unsigned colormap [256]; - int xres, yres; - --static char *defaultfbdevice = "/dev/fb0"; --static char *defaultconsoledevice = "/dev/tty"; -+static char *defaultfbdevice = "/dev/fb/0"; -+static char *defaultconsoledevice = "/dev/vc/"; - static char *fbdevice = NULL; - static char *consoledevice = NULL; - diff --git a/Xorg/lib/tslib/patches/event1.patch b/Xorg/lib/tslib/patches/event1.patch deleted file mode 100644 index 88cc3f3a2..000000000 --- a/Xorg/lib/tslib/patches/event1.patch +++ /dev/null @@ -1,80 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- tslib/tests/ts_calibrate.c~event1 -+++ tslib/tests/ts_calibrate.c -@@ -179,11 +179,7 @@ - if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { - ts = ts_open(tsdevice,0); - } else { --#ifdef USE_INPUT_API -- ts = ts_open("/dev/input/event0", 0); --#else -- ts = ts_open("/dev/touchscreen/ucb1x00", 0); --#endif /* USE_INPUT_API */ -+ ts = ts_open("/dev/input/event1", 0); - } - - if (!ts) { ---- tslib/tests/ts_print.c~event1 -+++ tslib/tests/ts_print.c -@@ -28,11 +28,7 @@ - if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { - ts = ts_open(tsdevice,0); - } else { --#ifdef USE_INPUT_API -- ts = ts_open("/dev/input/event0", 0); --#else -- ts = ts_open("/dev/touchscreen/ucb1x00", 0); --#endif /* USE_INPUT_API */ -+ ts = ts_open("/dev/input/event1", 0); - } - - if (!ts) { ---- tslib/tests/ts_test.c~event1 -+++ tslib/tests/ts_test.c -@@ -120,11 +120,7 @@ - signal(SIGTERM, sig); - - if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) { --#ifdef USE_INPUT_API -- tsdevice = strdup ("/dev/input/event0"); --#else -- tsdevice = strdup ("/dev/touchscreen/ucb1x00"); --#endif /* USE_INPUT_API */ -+ tsdevice = strdup ("/dev/input/event1"); - } - - ts = ts_open (tsdevice, 0); ---- tslib/tests/ts_print_raw.c~event1 -+++ tslib/tests/ts_print_raw.c -@@ -28,11 +28,7 @@ - if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { - ts = ts_open(tsdevice,0); - } else { --#ifdef USE_INPUT_API -- ts = ts_open("/dev/input/event0", 0); --#else -- ts = ts_open("/dev/touchscreen/ucb1x00", 0); --#endif /* USE_INPUT_API */ -+ ts = ts_open("/dev/input/event1", 0); - } - - if (!ts) { ---- tslib/tests/ts_harvest.c~event1 -+++ tslib/tests/ts_harvest.c -@@ -75,11 +75,7 @@ - signal(SIGTERM, sig); - - if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) { --#ifdef USE_INPUT_API -- tsdevice = strdup ("/dev/input/event0"); --#else -- tsdevice = strdup ("/dev/touchscreen/ucb1x00"); --#endif /* USE_INPUT_API */ -+ tsdevice = strdup ("/dev/input/event1"); - } - - ts = ts_open (tsdevice, 0); diff --git a/Xorg/lib/tslib/patches/fix_version.patch b/Xorg/lib/tslib/patches/fix_version.patch deleted file mode 100644 index d6a0ebd0f..000000000 --- a/Xorg/lib/tslib/patches/fix_version.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -Index: tslib-1.0/configure.ac -=================================================================== ---- tslib-1.0.orig/configure.ac 2006-08-24 22:02:55.000000000 +0100 -+++ tslib-1.0/configure.ac 2007-07-09 21:04:38.000000000 +0100 -@@ -2,7 +2,7 @@ - # Process this file with autoconf to produce a configure script. - - AC_PREREQ(2.57) --AC_INIT(tslib, 0.0.2, kergoth@handhelds.org) -+AC_INIT(tslib, 1.0.0, kergoth@handhelds.org) - # AC_CONFIG_AUX_DIR(config) - AM_INIT_AUTOMAKE(dist-bzip2) - AC_CONFIG_SRCDIR([src/ts_close.c]) -@@ -193,10 +193,10 @@ TS_CONF='${sysconfdir}/ts.conf' - AC_SUBST(TS_CONF) - - # Library versioning --LT_RELEASE=0.0 --LT_CURRENT=1 --LT_REVISION=1 --LT_AGE=1 -+LT_RELEASE=1.0 -+LT_CURRENT=0 -+LT_REVISION=0 -+LT_AGE=0 - AC_SUBST(LT_RELEASE) - AC_SUBST(LT_CURRENT) - AC_SUBST(LT_REVISION) diff --git a/Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch b/Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch deleted file mode 100644 index 4bd0a0553..000000000 --- a/Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch adds support for "EVIOCGRAB" on the input device, which -tells the kernel _not_ to deliver events of the touchscreen to -/dev/input/mice. - -This is probably what most people want, since unprocessed raw touchscreen -events should not be converted to emulated PS/2 mouse movements. - -Signed-off-by: Harald Welte - -Index: a/plugins/input-raw.c -=================================================================== ---- a/plugins/input-raw.c (revision 49) -+++ b/plugins/input-raw.c (working copy) -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - #include - #ifdef HAVE_UNISTD_H -@@ -33,6 +34,9 @@ - - #include "tslib-private.h" - -+#define GRAB_EVENTS_WANTED 1 -+#define GRAB_EVENTS_ACTIVE 2 -+ - struct tslib_input { - struct tslib_module_info module; - -@@ -42,6 +46,7 @@ - - int sane_fd; - int using_syn; -+ int grab_events; - }; - - static int check_fd(struct tslib_input *i) -@@ -64,6 +69,14 @@ - - if (bit & (1 << EV_SYN)) - i->using_syn = 1; -+ -+ if (i->grab_events == GRAB_EVENTS_WANTED) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) { -+ fprintf(stderr, "Unable to grab selected input device\n"); -+ return -1; -+ } -+ i->grab_events = GRAB_EVENTS_ACTIVE; -+ } - - return 0; - } -@@ -222,6 +235,15 @@ - - static int ts_input_fini(struct tslib_module_info *inf) - { -+ struct tslib_input *i = (struct tslib_input *)inf; -+ struct tsdev *ts = inf->dev; -+ -+ if (i->grab_events == GRAB_EVENTS_ACTIVE) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) { -+ fprintf(stderr, "Unable to un-grab selected input device\n"); -+ } -+ } -+ - free(inf); - return 0; - } -@@ -231,6 +253,36 @@ - .fini = ts_input_fini, - }; - -+static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ unsigned long v; -+ int err = errno; -+ -+ v = strtoul(str, NULL, 0); -+ -+ if (v == ULONG_MAX && errno == ERANGE) -+ return -1; -+ -+ errno = err; -+ switch ((int)data) { -+ case 1: -+ if (v) -+ i->grab_events = GRAB_EVENTS_WANTED; -+ break; -+ default: -+ return -1; -+ } -+ return 0; -+} -+ -+static const struct tslib_vars raw_vars[] = -+{ -+ { "grab_events", (void *)1, parse_raw_grab }, -+}; -+ -+#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0])) -+ - TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) - { - struct tslib_input *i; -@@ -245,5 +297,12 @@ - i->current_p = 0; - i->sane_fd = 0; - i->using_syn = 0; -+ i->grab_events = 0; -+ -+ if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { -+ free(i); -+ return NULL; -+ } -+ - return &(i->module); - } diff --git a/Xorg/lib/vte/Makefile b/Xorg/lib/vte/Makefile deleted file mode 100644 index dac070356..000000000 --- a/Xorg/lib/vte/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=vte -PKG_VERSION:=0.17.4 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.17 -PKG_MD5SUM:=ec6cb2668db7146eae7cfc48af98f3ed -PKG_FIXUP:=libtool - -PKG_BUILD_DEPENDS:=intltool/host - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -$(call include_mk, python-package.mk) - -PKG_INSTALL=1 - -EXTRA_CFLAGS+=-I$(INTL_PREFIX)/include - -EXTRA_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -L$(ICONV_PREFIX)/lib \ - -L$(INTL_PREFIX)/lib - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_vte CONFIG_PACKAGE_python-vte) - -define Package/vte - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Virtual Terminal Widget - URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html - DEPENDS:=+gtk2 +libncurses +libX11 -endef - -define Package/python-vte - SECTION:=lang-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Python bindings for vte - URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html - DEPENDS:=+python-mini +PACKAGE_python-vte:python-gtk +vte -endef - -define Package/vte/description - VTE is a library (libvte) implementing a terminal emulator widget for GTK+, - and a minimal sample application (vte) using that. Vte is mainly used in - gnome-terminal, but can also be used to embed a console/terminal in games, - editors, IDEs, etc. -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --without-xft2 \ - $(if $(CONFIG_PACKAGE_python-vte),--enable-python,--disable-python) \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/vte - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/vte/*.h \ - $(1)/usr/include/vte/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \ - $(1)/usr/lib - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig -endef - -define Package/vte/install - $(INSTALL_DIR) $(1)/usr/share/vte/termcap - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/vte/termcap/* \ - $(1)/usr/share/vte/termcap - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib - - $(INSTALL_DIR) $(1)/usr/lib/vte - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/lib/vte/* \ - $(1)/usr/lib/vte -endef - -define Package/python-vte/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.so* \ - $(1)$(PYTHON_PKG_DIR)/gtk-2.0 -endef - -$(eval $(call BuildPackage,vte)) -$(eval $(call BuildPackage,python-vte)) - diff --git a/Xorg/lib/vte/patches/100-compile-fixes.patch b/Xorg/lib/vte/patches/100-compile-fixes.patch deleted file mode 100644 index 273aca0a3..000000000 --- a/Xorg/lib/vte/patches/100-compile-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: vte-0.17.4/termcaps/Makefile.am -=================================================================== ---- vte-0.17.4.orig/termcaps/Makefile.am 2011-01-27 18:14:40.165998453 +0100 -+++ vte-0.17.4/termcaps/Makefile.am 2011-01-27 18:14:51.964899492 +0100 -@@ -1,6 +1,6 @@ - EXTRA_DIST = xterm xterm.baseline - termcapdir = $(pkgdatadir)/termcap --termcap_DATA = xterm $(VTE_DEFAULT_EMULATION) --$(VTE_DEFAULT_EMULATION): xterm -+termcap_DATA = $(VTE_DEFAULT_EMULATION) -+$(VTE_DEFAULT_EMULATION): - sed -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \ - -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@ diff --git a/Xorg/lib/wnck/Makefile b/Xorg/lib/wnck/Makefile deleted file mode 100644 index 975d0ad8d..000000000 --- a/Xorg/lib/wnck/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libwnck -PKG_VERSION:=2.26.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.26/ -PKG_MD5SUM:=015b5d2e65d15448fa143513fce03541 -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -PKG_BUILD_DEPENDS:=intltool/host - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_CFLAGS+=$(FPIC) -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib - -define Package/libwnck - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=Window Navigator Construction Kit - URL:=http://ftp.gnome.org/ - DEPENDS:=+libX11 +gtk2 +glib2 +libXext $(INTL_DEPENDS) -endef - -define Package/libwnck/description -Window Navigator Construction Kit -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/libwnck-1.0/libwnck/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libwnck-1.0/libwnck/* $(1)/usr/include/libwnck-1.0/libwnck/ - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ -endef - -define Package/libwnck/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libwnck)) diff --git a/Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch b/Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch deleted file mode 100644 index 9c19596c0..000000000 --- a/Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/configure -+++ b/configure -@@ -26634,7 +26634,7 @@ - done - IFS=$as_save_IFS - -- test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" -+ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="" - ;; - esac - fi -@@ -26649,14 +26649,6 @@ - - - --if test x"$GDK_PIXBUF_CSOURCE" = xno; then -- { { $as_echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5 --$as_echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;} -- { (exit 1); exit 1; }; } --fi -- -- -- - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - - ################################################## ---- a/configure.in -+++ b/configure.in -@@ -128,11 +128,7 @@ - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - AC_SUBST(GLIB_GENMARSHAL) - --AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) -- --if test x"$GDK_PIXBUF_CSOURCE" = xno; then -- AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK]) --fi -+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource) - - AC_SUBST(GDK_PIXBUF_CSOURCE) - ---- a/libwnck/Makefile.am -+++ b/libwnck/Makefile.am -@@ -163,7 +163,8 @@ - $(wnck_built_cfiles) - - inlinepixbufs.h: $(IMAGES) -- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h -+ $(if $(GDK_PIXBUF_CSOURCE),$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h) -+ touch $@ - - $(OBJECTS): inlinepixbufs.h - ---- a/libwnck/Makefile.in -+++ b/libwnck/Makefile.in -@@ -826,7 +826,8 @@ - && rm -f new-wnck-enum-types.c - - inlinepixbufs.h: $(IMAGES) -- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h -+ $(if $(GDK_PIXBUF_CSOURCE),$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h) -+ touch $@ - - $(OBJECTS): inlinepixbufs.h - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Xorg/lib/xcbproto/Makefile b/Xorg/lib/xcbproto/Makefile deleted file mode 100644 index 724e5b65e..000000000 --- a/Xorg/lib/xcbproto/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xcb-proto -PKG_VERSION:=1.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ -PKG_MD5SUM:=d9275a714e83ab9c1f9b260c6eff1609 -PKG_INSTALL:=1 - -#PKG_BUILD_DEPENDS:=python-mini/host - -include $(INCLUDE_DIR)/package.mk -#$(call include_mk, python-package.mk) - -#STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,PACKAGE_python PACKAGE_python-mini) - -define Package/xcbproto - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - BUILDONLY:=1 - TITLE:=xcbproto - URL:=http://xcb.freedesktop.org/ -endef - -#define InstallPy -# $(INSTALL_DIR) $(1)/host/lib/$(PYTHON)/site-packages/xcbgen -# $(INSTALL_DATA) \ -# $(PKG_INSTALL_DIR)/usr/lib/$(PYTHON)/site-packages/xcbgen/*.py \ -# $(1)/host/lib/$(PYTHON)/site-packages/xcbgen/ -#endef - -define Build/InstallDev -# $(call InstallPy,$(1),$(2)) - $(INSTALL_DIR) \ - $(1)/usr/lib/pkgconfig \ - $(1)/host/share/xcb - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/xcb/* \ - $(1)/host/share/xcb/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(SED) 's,datadir=/usr,datadir=$(STAGING_DIR)/host,g' $(1)/usr/lib/pkgconfig/xcb-proto.pc -endef - -$(eval $(call BuildPackage,xcbproto)) diff --git a/Xorg/lib/xine-lib/Makefile b/Xorg/lib/xine-lib/Makefile deleted file mode 100644 index 89e371480..000000000 --- a/Xorg/lib/xine-lib/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xine-lib -PKG_VERSION:=1.1.1 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/xine -PKG_MD5SUM:=b1f42602c776bb93e3cbf127e220cbfd - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -CONFIGURE_ARGS+=\ - --enable-static \ - --disable-vcd \ - --disable-imagemagick \ - --disable-flac - -XINE_LIB_FLAGS:=\ - LIBFLAC_CFLAGS="" \ - LIBFLAC_LIBS="" \ - X_CFLAGS="" \ - X_LIBS="" \ - XINE_ACFLAGS="" \ - CXXFLAGS="$(TARGET_CFLAGS)" - -CONFIGURE_VARS+=$(XINE_LIB_FLAGS) - -define Package/xine-lib - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=xine libraries - DEPENDS:=+libX11 +libXext +alsa-lib +zlib +libfreetype - URL:=http://www.xine-project.org/ -endef - -MAKE_FLAGS+=$(XINE_LIB_FLAGS) - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(SED) 's,-I$$$${prefix}/include,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/xine-config - $(SED) 's,-L$$$${exec_prefix}/lib,-L$(STAGING_DIR)/usr/lib/,g' $(1)/usr/bin/xine-config - $(INSTALL_DIR) $(2)/bin - mv $(1)/usr/bin/xine-config $(2)/bin -endef - -define Package/xine-lib/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,xine-lib)) diff --git a/Xorg/lib/xine-lib/patches/100-compile_fix.patch b/Xorg/lib/xine-lib/patches/100-compile_fix.patch deleted file mode 100644 index bbb6f0c68..000000000 --- a/Xorg/lib/xine-lib/patches/100-compile_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xine-lib-1.1.1/src/libw32dll/wine/Makefile.in -=================================================================== ---- xine-lib-1.1.1.orig/src/libw32dll/wine/Makefile.in 2008-01-14 21:28:08.000000000 +0100 -+++ xine-lib-1.1.1/src/libw32dll/wine/Makefile.in 2008-01-14 21:28:20.000000000 +0100 -@@ -74,7 +74,7 @@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles --LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ -+LTCCASCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCAS) $(AM_CCASFLAGS) \ - $(CCASFLAGS) - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/Xorg/wm/fluxbox/Makefile b/Xorg/wm/fluxbox/Makefile deleted file mode 100644 index 0adc97d1d..000000000 --- a/Xorg/wm/fluxbox/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fluxbox -PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/fluxbox -PKG_MD5SUM:=990e276ead0d04421dce4080f485caca - -EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -include $(INCLUDE_DIR)/package.mk - -CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm $(LIBGCC_S)" \ - CXXLD="$(TARGET_CC)" - -CONFIGURE_ARGS+=--disable-xmb - -define Package/fluxbox/Default - SECTION:=xorg-wm - CATEGORY:=Xorg - SUBMENU:=window manager - URL:=http://fluxbox.org/ -endef - -define Package/fluxbox -$(call Package/fluxbox/Default) - DEPENDS:=+uclibcxx +libXt +libXpm - TITLE:=fluxbox window manager - MENU:=1 -endef - -define Package/fbrun -$(call Package/fluxbox/Default) - DEPENDS:=fluxbox - TITLE:=fluxbox tool to run applications -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install -endef - -define Package/fluxbox/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/ - $(CP) files/init $(1)/usr/share/fluxbox/ - $(CP) files/menu $(1)/usr/share/fluxbox/ - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_DATA) \ - ./files/uci-defaults/x11 \ - $(1)/etc/uci-defaults/ -endef - -define Package/fbsetbg/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/ -endef - -define Package/fbsetroot/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/ -endef - -define Package/fbrun/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/ -endef - -define Package/fluxbox/postinst - #!/bin/sh - [ -n "$${IPKG_INSTROOT}" ] && exit - . /etc/functions.sh - uci_apply_defaults -endef - -$(eval $(call BuildPackage,fbrun)) -$(eval $(call BuildPackage,fluxbox)) diff --git a/Xorg/wm/fluxbox/files/init b/Xorg/wm/fluxbox/files/init deleted file mode 100644 index 74926d53a..000000000 --- a/Xorg/wm/fluxbox/files/init +++ /dev/null @@ -1,99 +0,0 @@ -session.screen0.titlebar.left: Stick -session.screen0.titlebar.right: Minimize Maximize Close -session.screen0.tab.width: 64 -session.screen0.tab.alignment: Left -session.screen0.tab.rotatevertical: True -session.screen0.tab.placement: TopLeft -session.screen0.tab.height: 16 -session.screen0.menu.alpha: 158 -session.screen0.tabs.intitlebar: false -session.screen0.toolbar.onTop: False -session.screen0.toolbar.visible: true -session.screen0.toolbar.layer: Desktop -session.screen0.toolbar.height: 0 -session.screen0.toolbar.autoHide: false -session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock -session.screen0.toolbar.maxOver: false -session.screen0.toolbar.placement: TopCenter -session.screen0.toolbar.alpha: 255 -session.screen0.toolbar.widthPercent: 100 -session.screen0.toolbar.onhead: 0 -session.screen0.window.focus.alpha: 255 -session.screen0.window.unfocus.alpha: 34 -session.screen0.iconbar.iconTextPadding: 10l -session.screen0.iconbar.wheelMode: Screen -session.screen0.iconbar.alignment: Relative -session.screen0.iconbar.usePixmap: true -session.screen0.iconbar.deiconifyMode: Follow -session.screen0.iconbar.mode: Workspace -session.screen0.iconbar.iconWidth: 70 -session.screen0.slit.direction: Vertical -session.screen0.slit.autoHide: false -session.screen0.slit.onTop: False -session.screen0.slit.layer: Dock -session.screen0.slit.alpha: 255 -session.screen0.slit.maxOver: false -session.screen0.slit.placement: BottomRight -session.screen0.slit.onhead: 0 -session.screen0.overlay.lineWidth: 1 -session.screen0.overlay.lineStyle: LineSolid -session.screen0.overlay.joinStyle: JoinMiter -session.screen0.overlay.capStyle: CapNotLast -session.screen0.edgeSnapThreshold: 0 -session.screen0.workspaceNames: one,two,three, -session.screen0.windowPlacement: RowSmartPlacement -session.screen0.windowScrollAction: -session.screen0.focusModel: ClickFocus -session.screen0.focusLastWindow: true -session.screen0.clickRaises: true -session.screen0.menuMode: Delay -session.screen0.desktopwheeling: true -session.screen0.imageDither: false -session.screen0.colPlacementDirection: TopToBottom -session.screen0.rowPlacementDirection: LeftToRight -session.screen0.resizeMode: Bottom -session.screen0.windowMenu: -session.screen0.followModel: Ignore -session.screen0.decorateTransient: false -session.screen0.strftimeFormat: %a %d %H:%M -session.screen0.workspacewarping: true -session.screen0.menuDelay: 0 -session.screen0.windowScrollReverse: false -session.screen0.workspaces: 3 -session.screen0.autoRaise: false -session.screen0.sloppywindowgrouping: true -session.screen0.reversewheeling: false -session.screen0.rootCommand: ~/.xsession -session.screen0.menuDelayClose: 0 -session.screen0.fullMaximization: false -session.screen0.tabFocusModel: ClickToTabFocus -session.screen0.focusNewWindows: true -session.screen0.antialias: true -session.screen0.showwindowposition: true -session.screen0.opaqueMove: false -session.titlebar.left: Stick -session.titlebar.right: Minimize Maximize Close -session.cacheLife: 5l -session.ignoreBorder: false -session.tabs: true -session.doubleClickInterval: 250 -session.tabsAttachArea: Window -session.iconbar: true -session.imageDither: True -session.focusTabMinWidth: 0 -session.modKey: Mod1 -session.forcePseudoTransparency: false -session.autoRaiseDelay: 250 -session.styleFile: /usr/share/fluxbox/styles/BlueNight -session.cacheMax: 200l -session.useMod1: true -session.keyFile: ~/.fluxbox/keys -session.menuFile: ~/.fluxbox/menu -session.tabPadding: 0 -session.groupFile: ~/.fluxbox/groups -session.colorsPerChannel: 4 -session.appsFile: ~/.fluxbox/apps -session.slitlistFile: ~/.fluxbox/slitlist -session.numLayers: 13 -session.opaqueMove: False -session.styleOverlay: ~/.fluxbox/overlay diff --git a/Xorg/wm/fluxbox/files/menu b/Xorg/wm/fluxbox/files/menu deleted file mode 100644 index 3357552d3..000000000 --- a/Xorg/wm/fluxbox/files/menu +++ /dev/null @@ -1,31 +0,0 @@ -[begin] (Fluxbox-OpenWrt) - [exec] (xterm) {xterm} - [exec] (vi) {xterm -e vi} - [exec] (xmms) {xmms} - [exec] (alsamixer) {xterm -e alsamixer} - [exec] (vlc) {vlc} - [exec] (xclock) {xclock} - [exec] (xmag) {xmag} - [exec] (xclock) {xclock} - [exec] (xcalc) {xcalc} - [exec] (xpdf) {xpdf} - [exec] (top) {xterm -e top} -[submenu] (fluxbox menu) - [config] (Configure) -[submenu] (System Styles) {Choose a style...} - [stylesdir] (/usr/share/fluxbox/styles) -[end] - [workspaces] (Workspace List) -[submenu] (Tools) - [exec] (fluxconf) {fluxconf} - [exec] (fluxkeys) {fluxkeys} - [exec] (fluxmenu) {fluxmenu} -[end] - [commanddialog] (Fluxbox Command) - [reconfig] (Reload config) - [restart] (Restart) - [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center} - [separator] - [exit] (Exit) -[end] -[end] diff --git a/Xorg/wm/fluxbox/files/uci-defaults/x11 b/Xorg/wm/fluxbox/files/uci-defaults/x11 deleted file mode 100644 index 3d029c0e0..000000000 --- a/Xorg/wm/fluxbox/files/uci-defaults/x11 +++ /dev/null @@ -1 +0,0 @@ -uci set x11.@desktop[0].autostart=enlightenment_start \ No newline at end of file diff --git a/Xorg/wm/fluxbox/patches/010-fix-includes.patch b/Xorg/wm/fluxbox/patches/010-fix-includes.patch deleted file mode 100644 index d07d47caf..000000000 --- a/Xorg/wm/fluxbox/patches/010-fix-includes.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc -index 21224cb..b641185 100644 ---- a/src/ClientPattern.cc -+++ b/src/ClientPattern.cc -@@ -45,6 +45,7 @@ - #endif - - // needed as well for index on some systems (e.g. solaris) -+#include - #include - - using std::string; -diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc -index 8c836cc..9f4b3eb 100644 ---- a/src/FbTk/Text.cc -+++ b/src/FbTk/Text.cc -@@ -26,6 +26,7 @@ - #include "Font.hh" - #include "Theme.hh" - -+#include - #include - - namespace FbTk { -diff --git a/src/main.cc b/src/main.cc -index afbf43e..3c3d17c 100644 ---- a/src/main.cc -+++ b/src/main.cc -@@ -45,6 +45,8 @@ - #include - #endif - -+#include -+ - #include - #include - #include diff --git a/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch b/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch deleted file mode 100644 index 73b0e2373..000000000 --- a/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- fluxbox-1.0rc3/util/fbrun/Makefile.in.orig 2007-09-17 19:52:52.000000000 +0200 -+++ fluxbox-1.0rc3/util/fbrun/Makefile.in 2007-09-17 19:53:09.000000000 +0200 -@@ -236,7 +236,7 @@ - fbrun$(EXEEXT): $(fbrun_OBJECTS) $(fbrun_DEPENDENCIES) - @rm -f fbrun$(EXEEXT) -- $(CXXLINK) $(fbrun_OBJECTS) $(fbrun_LDADD) $(LIBS) -+ $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbrun_OBJECTS) $(fbrun_LDADD) $(LDFLAGS) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) diff --git a/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch b/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch deleted file mode 100644 index 0c291bed4..000000000 --- a/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in ---- fluxbox-1.0rc3.orig/util/Makefile.in 2007-09-17 19:56:45.000000000 +0200 -+++ fluxbox-1.0rc3/util/Makefile.in 2007-09-17 19:58:11.000000000 +0200 -@@ -277,4 +277,4 @@ - fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES) - @rm -f fbsetroot$(EXEEXT) -- $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS) -+ $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS) diff --git a/Xorg/wm/matchbox-window-manager/Makefile b/Xorg/wm/matchbox-window-manager/Makefile deleted file mode 100644 index df23f97ee..000000000 --- a/Xorg/wm/matchbox-window-manager/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=matchbox-window-manager -PKG_VERSION:=1.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://matchbox-project.org/sources/$(PKG_NAME)/$(PKG_VERSION) -PKG_MD5SUM:=3e158dcf57823b55c926d95b245500fb - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -define Package/matchbox-window-manager - TITLE:=matchbox window manager - SECTION:=xorg-wm - CATEGORY:=Xorg - SUBMENU:=window manager - DEPENDS:=+libX11 +zlib +libfreetype +fontconfig +libmatchbox - URL:=http://matchbox-project.org/ -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(PKG_INSTALL_DIR) \ - LIBMB_LIBS="$(TARGET_LDFLAGS) -lfontconfig -lXrender \ - -lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp \ - -lpng12" \ - all -endef - -define Package/matchbox-window-manager/install - $(INSTALL_DIR) $(1)/etc/matchbox - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/etc/matchbox/kbdconfig \ - $(1)/etc/matchbox/ - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ - - $(INSTALL_DIR) $(1)/usr/share/{matchbox,themes} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/matchbox/* \ - $(1)/usr/share/matchbox/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/themes/* \ - $(1)/usr/share/themes/ - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_DATA) \ - ./files/uci-defaults/x11 \ - $(1)/etc/uci-defaults/ -endef - -define Package/matchbox-window-manager/postinst - #!/bin/sh - [ -n "$${IPKG_INSTROOT}" ] && exit - . /etc/functions.sh - uci_apply_defaults -endef - -$(eval $(call BuildPackage,matchbox-window-manager)) diff --git a/Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 b/Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 deleted file mode 100644 index 3d029c0e0..000000000 --- a/Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 +++ /dev/null @@ -1 +0,0 @@ -uci set x11.@desktop[0].autostart=enlightenment_start \ No newline at end of file diff --git a/Xorg/xorg/app/font-util/Makefile b/Xorg/xorg/app/font-util/Makefile deleted file mode 100644 index 07e8dbb17..000000000 --- a/Xorg/xorg/app/font-util/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=font-util -PKG_VERSION:=1.0.1 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=b81535f78fe05732931f02841e5ca37b - -include $(INCLUDE_DIR)/package.mk - -define Package/font-util - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=app - TITLE:=misc tool to generate x fonts - DEPENDS:=+xserver - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - cd $(PKG_BUILD_DIR)/; ./configure -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) install DESTDIR="$(PKG_INSTALL_DIR)" -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(1)/usr/lib/X11 $(2)/bin - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(1)/usr/lib/X11/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(2)/bin/ -endef - -$(eval $(call BuildPackage,font-util)) diff --git a/Xorg/xorg/app/fontconfig/Makefile b/Xorg/xorg/app/fontconfig/Makefile deleted file mode 100644 index 5a5b3697a..000000000 --- a/Xorg/xorg/app/fontconfig/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fontconfig -PKG_VERSION:=2.6.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://fontconfig.org/release/ -PKG_MD5SUM:=ab54ec1d4ddd836313fdbc0cd5299d6d -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/fontconfig - SECTION:=xorg-util - CATEGORY:=Xorg - SUBMENU:=font-utils - TITLE:=fontconfig - DEPENDS:=+libexpat +libfreetype - URL:=http://fontconfig.org/ -endef - -CONFIGURE_ARGS+= \ - --disable-docs \ - --with-cache-dir=/usr/share/fontconfig/cache \ - --with-arch=$(ARCH) \ - -CONFIGURE_VARS+= \ - ac_cv_prog_HASDOCBOOK=no \ - -TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/Compile - $(foreach dir,fc-arch fc-case fc-lang fc-glyphname, \ - $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="$(HOST_CFLAGS)" \ - CPPFLAGS="" LDFLAGS="$(HOST_LDFLAGS)" || exit 1;) - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" DOCSRC="" install -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fontconfig $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfontconfig.* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fontconfig.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/fontconfig/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfontconfig.so.* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/etc/fonts/conf.avail - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/fonts/conf.avail/*.conf $(1)/etc/fonts/conf.avail/ - $(INSTALL_DIR) $(1)/etc/fonts/conf.d - $(CP) $(PKG_INSTALL_DIR)/etc/fonts/conf.d/*.conf $(1)/etc/fonts/conf.d/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/fonts/fonts.{conf,dtd} $(1)/etc/fonts/ -endef - -$(eval $(call BuildPackage,fontconfig)) diff --git a/Xorg/xorg/app/iceauth/Makefile b/Xorg/xorg/app/iceauth/Makefile deleted file mode 100644 index 9ee07dd1d..000000000 --- a/Xorg/xorg/app/iceauth/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=iceauth -PKG_RELEASE:=1 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=975ade3f238c1eb10705da0a91e6e8e7 -PKG_BUILD_DEPENDS:=xproto - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -PKG_INSTALL=1 - -define Package/iceauth - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libICE - TITLE:=iceauth - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -define Package/iceauth/install - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1) - rm -rf $(1)/usr/man/ -endef - -$(eval $(call BuildPackage,iceauth)) diff --git a/Xorg/xorg/app/smproxy/Makefile b/Xorg/xorg/app/smproxy/Makefile deleted file mode 100644 index c20c58b0b..000000000 --- a/Xorg/xorg/app/smproxy/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=smproxy -PKG_RELEASE:=1 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=ba7dbde81be24fc1bd4156b360e5f8cf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/smproxy - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libXt +libXmu - TITLE:=smproxy - URL:=http://xorg.freedesktop.org/ -endef - -define Package/smproxy/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,smproxy)) diff --git a/Xorg/xorg/app/x11perf/Makefile b/Xorg/xorg/app/x11perf/Makefile deleted file mode 100644 index a1fa62e46..000000000 --- a/Xorg/xorg/app/x11perf/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (C) 2008-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=x11perf -PKG_RELEASE:=1 -PKG_VERSION:=1.5.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=66e4aa4645f83809071eb69553ed0222 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/x11perf - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXmuu +libXrender +libXft +libXext - TITLE:=x11perf - URL:=http://xorg.freedesktop.org/ -endef - -CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -define Package/x11perf/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/X11/x11perfcomp - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/lib/X11/x11perfcomp/* \ - $(1)/usr/lib/X11/x11perfcomp/ -endef - -$(eval $(call BuildPackage,x11perf)) diff --git a/Xorg/xorg/app/xauth/Makefile b/Xorg/xorg/app/xauth/Makefile deleted file mode 100644 index 7b3910e1a..000000000 --- a/Xorg/xorg/app/xauth/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xauth -PKG_RELEASE:=1 -PKG_VERSION:=1.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=fa00078c414c4a57cab7a6d89a0c8734 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xauth - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXau +libXext +libXmuu - TITLE:=xauth - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xauth/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,xauth)) diff --git a/Xorg/xorg/app/xkbcomp/Makefile b/Xorg/xorg/app/xkbcomp/Makefile deleted file mode 100644 index b7c0a2da2..000000000 --- a/Xorg/xorg/app/xkbcomp/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xkbcomp -PKG_RELEASE:=2 -PKG_VERSION:=1.1.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=38c387bacdc01038c8ac280588792bcf - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib - -define Package/xkbcomp - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libxkbfile - TITLE:=xkbcomp - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xkbcomp/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin - $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/xkbdata/compiled -endef - -$(eval $(call BuildPackage,xkbcomp)) diff --git a/Xorg/xorg/app/xprop/Makefile b/Xorg/xorg/app/xprop/Makefile deleted file mode 100644 index 33dc46c61..000000000 --- a/Xorg/xorg/app/xprop/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xprop -PKG_RELEASE:=1 -PKG_VERSION:=1.2.0 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app/ -PKG_MD5SUM:=e6d0673a1e1e469f0a6220a6868fb94b - -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_BUILD_DEPENDS:=xproto -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xprop - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 - TITLE:=xprop - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xprop/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/xprop \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,xprop)) diff --git a/Xorg/xorg/app/xrandr/Makefile b/Xorg/xorg/app/xrandr/Makefile deleted file mode 100644 index 503175031..000000000 --- a/Xorg/xorg/app/xrandr/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xrandr -PKG_RELEASE:=1 -PKG_VERSION:=1.3.2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=2cb19bb1c19ccf77c40032b03dbe06f0 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xrandr - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXrandr +libXrender +libX11 - TITLE:=xrandr - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xrandr/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,xrandr)) diff --git a/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch b/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch deleted file mode 100644 index 6a14192c8..000000000 --- a/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- xrandr-1.2.3/xrandr.c.orig 2007-10-25 17:18:55.001346494 +0200 -+++ xrandr-1.2.3/xrandr.c 2007-10-25 17:21:07.222276308 +0200 -@@ -189,7 +189,7 @@ - - #if HAS_RANDR_1_2 - typedef enum _policy { -- clone, extend -+ p_clone, p_extend - } policy_t; - - typedef enum _relation { -@@ -1602,7 +1602,7 @@ - int ret = 0; - #if HAS_RANDR_1_2 - output_t *output = NULL; -- policy_t policy = clone; -+ policy_t policy = p_clone; - Bool setit_1_2 = False; - Bool query_1_2 = False; - Bool modeit = False; -@@ -1863,12 +1863,12 @@ - continue; - } - if (!strcmp ("--clone", argv[i])) { -- policy = clone; -+ policy = p_clone; - setit_1_2 = True; - continue; - } - if (!strcmp ("--extend", argv[i])) { -- policy = extend; -+ policy = p_extend; - setit_1_2 = True; - continue; - } diff --git a/Xorg/xorg/app/xrdb/Makefile b/Xorg/xorg/app/xrdb/Makefile deleted file mode 100644 index 20d53b482..000000000 --- a/Xorg/xorg/app/xrdb/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xrdb -PKG_RELEASE:=1 -PKG_VERSION:=1.0.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=9c30b8e1709d5367beb7706146640c07 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xrdb - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 +libXmuu - TITLE:=xrdb - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xrdb/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/xrdb \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,xrdb)) diff --git a/Xorg/xorg/app/xset/Makefile b/Xorg/xorg/app/xset/Makefile deleted file mode 100644 index e6cca3357..000000000 --- a/Xorg/xorg/app/xset/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xset -PKG_RELEASE:=1 -PKG_VERSION:=1.1.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=eeb0d02f69c76bd40470dede99b4bd49 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib - -define Package/xset - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libXmuu +libX11 +libXext - TITLE:=xset - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xset/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin -endef - -$(eval $(call BuildPackage,xset)) diff --git a/Xorg/xorg/app/xsetroot/Makefile b/Xorg/xorg/app/xsetroot/Makefile deleted file mode 100644 index af27a189d..000000000 --- a/Xorg/xorg/app/xsetroot/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xsetroot -PKG_RELEASE:=1 -PKG_VERSION:=1.0.3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=cbda9b9b8da5af4614110883d5a276b8 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xsetroot - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+xbitmaps +libXmuu +libX11 - TITLE:=xsetroot - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xsetroot/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin -endef - -$(eval $(call BuildPackage,xsetroot)) diff --git a/Xorg/xorg/app/xwd/Makefile b/Xorg/xorg/app/xwd/Makefile deleted file mode 100644 index b88b010f2..000000000 --- a/Xorg/xorg/app/xwd/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xwd -PKG_RELEASE:=1 -PKG_VERSION:=1.0.3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=007cea1f389abde5c93162dcd5541351 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/xwd - SECTION:=xorg-app - CATEGORY:=Xorg - SUBMENU:=app - DEPENDS:=+libX11 - TITLE:=xwd - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xwd/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(1)/usr/bin -endef - -$(eval $(call BuildPackage,xwd)) diff --git a/Xorg/xorg/data/xbitmaps/Makefile b/Xorg/xorg/data/xbitmaps/Makefile deleted file mode 100644 index 8ab212c13..000000000 --- a/Xorg/xorg/data/xbitmaps/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xbitmaps -PKG_RELEASE:=1 -PKG_VERSION:=1.1.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/data/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=f9ddd4e70a5375508b3acaf17be0d0ab -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xbitmaps - SECTION:=xorg-data - CATEGORY:=Xorg - SUBMENU:=data - TITLE:=xbitmaps - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/bitmaps} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \ - $(1)/usr/include/X11/bitmaps/ -endef - -define Package/xbitmaps/install - $(INSTALL_DIR) $(1)/usr/include/X11/bitmaps - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \ - $(1)/usr/include/X11/bitmaps -endef - -$(eval $(call BuildPackage,xbitmaps)) diff --git a/Xorg/xorg/data/xkbdata/Makefile b/Xorg/xorg/data/xkbdata/Makefile deleted file mode 100644 index 4157539d1..000000000 --- a/Xorg/xorg/data/xkbdata/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xkbdata -PKG_RELEASE:=2 -PKG_VERSION:=1.0.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/data/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=9bf179be9a195953dc5f4c15e23ab7f0 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xkbdata - SECTION:=xorg-data - CATEGORY:=Xorg - SUBMENU:=data - TITLE:=xkbdata - DEPENDS:=+xkbcomp - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xkbdata/install - $(INSTALL_DIR) $(1)/usr/share/X11/xkb/{rules,types,keycodes,geometry,compat,symbols} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/xkb/rules/xorg \ - $(1)/usr/share/X11/xkb/rules/base - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/xkb/rules/xorg.lst \ - $(1)/usr/share/X11/xkb/rules/base.lst - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/xkb/types/* \ - $(1)/usr/share/X11/xkb/types/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/xkb/keycodes/{aliases,xfree86} \ - $(1)/usr/share/X11/xkb/keycodes/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/xkb/geometry/pc \ - $(1)/usr/share/X11/xkb/geometry/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/X11/xkb/compat/* \ - $(1)/usr/share/X11/xkb/compat/ - - $(if $(filter y,$(CONFIG_TARGET_omap24xx_n810-gui)), \ - $(INSTALL_DIR) $(1)/usr/share/X11/xkb/symbols/nokia_vndr; \ - $(INSTALL_DATA) ./files/nokia_n810/rx-44 $(1)/usr/share/X11/xkb/symbols/nokia_vndr/; \ - $(INSTALL_DATA) ./files/nokia_n810/su-8w $(1)/usr/share/X11/xkb/symbols/nokia_vndr/; \ - ) -endef - -$(eval $(call BuildPackage,xkbdata)) diff --git a/Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 b/Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 deleted file mode 100644 index 3ee1118f3..000000000 --- a/Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 +++ /dev/null @@ -1,310 +0,0 @@ -partial alphanumeric_keys -xkb_symbols "us" { - name[Group1] = "U.S. English"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, backslash, backslash ] }; - key { [ h, H, slash, slash ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, asterisk, asterisk ] }; - key { [ apostrophe, question, question, question ] }; - - key { [ z, Z, yen, yen ] }; - key { [ x, X, asciicircum, asciicircum ] }; - key { [ c, C, asciitilde, asciitilde ] }; - key { [ v, V, percent, percent ] }; - key { [ b, B, ampersand, ampersand ] }; - key { [ n, N, dollar, dollar ] }; - key { [ m, M, EuroSign, EuroSign ] }; - key { [ semicolon, colon, sterling, sterling ] }; - key { [ minus, underscore, underscore, underscore ] }; - key { [ plus, equal, equal, equal ] }; - - key { [ comma, less, comma, less ] }; - key { [ period, greater, period, greater ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "fisenoda" { - name[Group1] = "Finnish/Swedish/Norwegian/Danish"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ aring, Aring, question, question ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, percent, percent ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; - key { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; - key { [ minus, underscore, underscore, underscore ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "ptes" { - name[Group1] = "Portuguese/Spanish"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, percent, percent ] }; - key { [ c, C, ampersand, ampersand ] }; - key { [ v, V, exclamdown, exclamdown ] }; - key { [ b, B, apostrophe, apostrophe ] }; - key { [ n, N, plus, plus ] }; - key { [ m, M, equal, equal ] }; - key { [ ccedilla, Ccedilla, questiondown, questiondown ] }; - key { [ ntilde, Ntilde, question, question ] }; - key { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; - - key { [ comma, semicolon, minus, minus ] }; - key { [ period, colon, underscore, underscore ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "fr" { - name[Group1] = "French"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, 1, 1 ] }; - key { [ z, Z, 2, 2 ] }; - - key { [ q, Q, at, at ] }; - key { [ s, S, percent, percent ] }; - key { [ d, D, ecircumflex, Ecircumflex ] }; - key { [ f, F, eacute, Eacute ] }; - key { [ g, G, egrave, Egrave ] }; - key { [ h, H, oe, OE ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, agrave, Agrave ] }; - key { [ m, M, ugrave, Ugrave ] }; - - key { [ w, w, EuroSign, EuroSign ] }; - key { [ x, X, numbersign, numbersign ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, plus, plus ] }; - key { [ b, B, equal, equal ] }; - key { [ n, N, quotedbl, quotedbl ] }; - key { [ comma, question, backslash, backslash ] }; - key { [ semicolon, period, minus, minus ] }; - key { [ colon, slash, underscore, underscore ] }; - key { [ apostrophe, apostrophe, mu, mu ] }; - - key { [ less, greater, less, greater ] }; - key { [ exclam, section, asterisk, asterisk ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "de" { - name[Group1] = "German"; - - include "nokia_vndr/rx-44(base)" - - key { [ z, Z, 6, 6 ] }; - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, percent, percent ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ udiaeresis, Udiaeresis, question, question ] }; - - key { [ y, Y, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, asterisk, asterisk ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { [ odiaeresis, Odiaeresis, equal, equal ] }; - key { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; - key { [ minus, underscore, ssharp, ssharp ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - - -// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. -partial alphanumeric_keys -xkb_symbols "ru" { - name[Group1] = "Russian"; - - include "nokia_vndr/rx-44(base)" - - key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; - key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; - key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; - key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; - key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; - key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; - key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; - key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; - key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; - key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; - key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; - key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; - key { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; - - key { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; - key { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; - key { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; - key { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; - key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; - key { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; - key { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_be, Cyrillic_BE, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_be, Cyrillic_BE, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_yu, Cyrillic_YU, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_yu, Cyrillic_YU, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - - key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; - key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; - key { type="EIGHT_LEVEL", [ Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "it" { - name[Group1] = "Italian"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ apostrophe, question, igrave, Igrave ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, ampersand, ampersand ] }; - key { [ v, V, equal, equal ] }; - key { [ b, B, less, less ] }; - key { [ n, N, greater, greater ] }; - key { [ m, M, plus, plus ] }; - key { [ eacute, Eacute, ograve, Ograve ] }; - key { [ egrave, Egrave, agrave, Agrave ] }; - key { [ minus, underscore, ugrave, Ugrave ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - -partial default alphanumeric_keys -xkb_symbols "base" { - key { [ q, Q, 1, 1 ] }; - key { [ w, W, 2, 2 ] }; - key { [ e, E, 3, 3 ] }; - key { [ r, R, 4, 4 ] }; - key { [ t, T, 5, 5 ] }; - key { [ y, Y, 6, 6 ] }; - key { [ u, U, 7, 7 ] }; - key { [ i, I, 8, 8 ] }; - key { [ o, O, 9, 9 ] }; - key { [ p, P, 0, 0 ] }; - key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - - // broken UI spec. - key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; - - key { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; - key { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; -// key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; - key { [ space, space, space, space ] }; - key { [ Control_R, Control_R, Control_R, Control_R ] }; - key { [ Tab, Tab, Tab, Tab ] }; - - modifier_map Shift { Shift_L }; - modifier_map Mod5 { ISO_Level3_Shift }; - modifier_map Control { Control_R }; - - key { [ Return ] }; - key { [ Up ] }; - key { [ Down ] }; - key { [ Left ] }; - key { [ Right ] }; - - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - - // generated from the headset, must always be in the map. - key { [ XF86Phone ] }; -}; diff --git a/Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w b/Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w deleted file mode 100644 index 8292db1a9..000000000 --- a/Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w +++ /dev/null @@ -1,482 +0,0 @@ -partial alphanumeric_keys default -xkb_symbols "no" { - name[Group1]= "Norwegian/Danish"; - - include "nokia_vndr/su-8w(base)" - - key { [ 1, exclam, dead_circumflex ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, EuroSign ] }; - key { [ 4, currency, dollar ] }; - key { [ 5, percent, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ dead_acute, dead_grave, backslash ] }; - - key { [ q, Q, dead_circumflex ] }; - key { [ w, W, at ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, dollar ] }; - key { [ t, T, sterling ] }; - key { [ y, Y ] }; - key { [ u, U, braceleft ] }; - key { [ i, I, bracketleft ] }; - key { [ o, O, bracketright ] }; - key { [ p, P, braceright ] }; - key { [ aring, Aring ] }; - key { [ ssharp, ssharp, backslash ] }; - - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ oslash, Ooblique ] }; - key { [ ae, AE ] }; - - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, semicolon, less ] }; - key { [ period, colon, greater ] }; - key { [ minus, underscore, dead_diaeresis ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "no_nodeadkeys" { - name[Group1] = "Norwegian/Danish (no dead keys)"; - - include "nokia_vndr/su-8w(no)" - - key { [ 1, exclam, asciicircum ] }; - key { [ acute, grave, backslash ] }; - key { [ q, Q, asciicircum ] }; -}; - -partial alphanumeric_keys default -xkb_symbols "dk" { - include "nokia_vndr/su-8w(no)" -}; - -partial alphanumeric_keys default -xkb_symbols "dk_nodeadkeys" { - include "nokia_vndr/su-8w(no_nodeadkeys)" -}; - - - -partial alphanumeric_keys default -xkb_symbols "de" { - name[Group1]= "German"; - include "nokia_vndr/su-8w(base)" - - key { [ 1, exclam, dead_circumflex ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, EuroSign ] }; - key { [ 4, currency, dollar ] }; - key { [ 5, percent, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ dead_acute, dead_grave, backslash ] }; - - key { [ q, Q, dead_circumflex ] }; - key { [ w, W, at ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, dollar ] }; - key { [ t, T, sterling ] }; - key { [ z, Z ] }; - key { [ u, U, braceleft ] }; - key { [ i, I, bracketleft ] }; - key { [ o, O, bracketright ] }; - key { [ p, P, braceright ] }; - key { [ udiaeresis, Udiaeresis ] }; - key { [ ssharp, ssharp, backslash ] }; - - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ odiaeresis, Odiaeresis ] }; - key { [ adiaeresis, Adiaeresis ] }; - - key { [ y, Y ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, semicolon, less ] }; - key { [ period, colon, greater ] }; - // XXX Inexplicably, the diaeresis is dead on other layouts, but not - // German. Go figure. - key { [ minus, underscore, diaeresis ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "de_nodeadkeys" { - name[Group1] = "German (no dead keys)"; - - include "nokia_vndr/su-8w(de)" - - key { [ 1, exclam, asciicircum ] }; - key { [ acute, grave, backslash ] }; - key { [ q, Q, asciicircum ] }; -}; - - - -partial alphanumeric_keys default -xkb_symbols "se" { - name[Group1]= "Finnish/Swedish"; - - include "nokia_vndr/su-8w(base)" - - key { [ 1, exclam, dead_circumflex ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, EuroSign ] }; - key { [ 4, currency, dollar ] }; - key { [ 5, percent, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ dead_acute, dead_grave, backslash ] }; - - key { [ q, Q, dead_circumflex ] }; - key { [ w, W, at ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, dollar ] }; - key { [ t, T, sterling ] }; - key { [ y, Y ] }; - key { [ u, U, braceleft ] }; - key { [ i, I, bracketleft ] }; - key { [ o, O, bracketright ] }; - key { [ p, P, braceright ] }; - key { [ aring, Aring ] }; - key { [ ssharp, ssharp, backslash ] }; - - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ odiaeresis, Odiaeresis ] }; - key { [ adiaeresis, Adiaeresis ] }; - - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, semicolon, less ] }; - key { [ period, colon, greater ] }; - key { [ minus, underscore, dead_diaeresis ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "se_nodeadkeys" { - name[Group1] = "Finnish/Swedish (no dead keys)"; - - include "nokia_vndr/su-8w(se)" - - key { [ 1, exclam, asciicircum ] }; - key { [ acute, grave, backslash ] }; - key { [ q, Q, asciicircum ] }; - key { [ minus, underscore, diaeresis ] }; -}; - -partial alphanumeric_keys default -xkb_symbols "fi" { - include "nokia_vndr/su-8w(se)" -}; - -xkb_symbols "fi_nodeadkeys" { - include "nokia_vndr/su-8w(se_nodeadkeys)" -}; - - - -// Russian layout on first two levels, US layout on third and fourth. -partial alphanumeric_keys default -xkb_symbols "ru" { - name[Group1]= "Russian"; - - include "nokia_vndr/su-8w(base)" - - // XXX Would be nice if this actually generated a tilde. - key { [ Cyrillic_io, Cyrillic_IO, grave ] }; - key { [ 1, exclam, exclam, exclam ] }; - key { [ 2, at, quotedbl, at ] }; - key { [ 3, numbersign, numbersign, numbersign ] }; - key { [ 4, dollar, currency, dollar ] }; - key { [ 5, percent, percent, percent ] }; - key { [ 6, dead_circumflex, ampersand, asciicircum ] }; - key { [ 7, ampersand, slash, ampersand ] }; - key { [ 8, asterisk, parenleft, asterisk ] }; - key { [ 9, parenleft, parenright, parenleft ] }; - key { [ 0, parenright, equal, parenright ] }; - key { [ minus, underscore, plus, question ] }; - key { [ equal, plus, equal, plus ] }; - - key { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; - key { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; - key { [ Cyrillic_u, Cyrillic_U, e, E ] }; - key { [ Cyrillic_ka, Cyrillic_KA, r, R ] }; - key { [ Cyrillic_ie, Cyrillic_IE, t, T ] }; - key { [ Cyrillic_en, Cyrillic_EN, y, Y ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE, u, U ] }; - key { [ Cyrillic_sha, Cyrillic_SHA, i, I ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA, o, O ] }; - key { [ Cyrillic_ze, Cyrillic_ZE, p, P ] }; - key { [ Cyrillic_ha, Cyrillic_HA, bracketleft, braceleft ] }; - key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright, braceright ] }; - - key { [ Cyrillic_ef, Cyrillic_EF, a, A ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU, s, S ] }; - key { [ Cyrillic_ve, Cyrillic_VE, d, D ] }; - key { [ Cyrillic_a, Cyrillic_A, f, F ] }; - key { [ Cyrillic_pe, Cyrillic_PE, g, G ] }; - key { [ Cyrillic_er, Cyrillic_ER, h, H ] }; - key { [ Cyrillic_o, Cyrillic_O, j, J ] }; - key { [ Cyrillic_el, Cyrillic_EL, k, K ] }; - key { [ Cyrillic_de, Cyrillic_DE, l, L ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, colon ] }; - key { [ Cyrillic_e, Cyrillic_E, apostrophe, quotedbl ] }; - - key { [ Cyrillic_ya, Cyrillic_YA, z, Z ] }; - key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; - key { [ Cyrillic_es, Cyrillic_ES, c, C ] }; - key { [ Cyrillic_em, Cyrillic_EM, v, V ] }; - key { [ Cyrillic_i, Cyrillic_I, b, B ] }; - key { [ Cyrillic_te, Cyrillic_TE, n, N ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, m, M ] }; - key { [ Cyrillic_be, Cyrillic_BE, comma, less ] }; - key { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; - key { [ slash, question, slash, question ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "ru_nodeadkeys" { - name[Group1] = "Russian - no dead keys"; - - include "nokia_vndr/su-8w(ru)" - - key { [ 6, asciicircum, ampersand, asciicircum ] }; -}; - - - -partial alphanumeric_keys default -xkb_symbols "us" { - name[Group1]= "U.S. English - International"; - - include "nokia_vndr/su-8w(base)" - - // I can't believe it's not us(intl). - key { [ 1, exclam, exclamdown ] }; - key { [ 2, at, twosuperior ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar, currency ] }; - key { [ 5, percent, EuroSign ] }; - key { [ 6, asciicircum, onequarter ] }; - key { [ 7, ampersand, onehalf ] }; - key { [ 8, asterisk, threequarters ] }; - key { [ 9, parenleft, leftsinglequotemark ] }; - key { [ 0, parenright, rightsinglequotemark ] }; - key { [ minus, underscore, yen ] }; - key { [ equal, plus, multiply ] }; - - key { [ q, Q, adiaeresis, Adiaeresis ] }; - key { [ w, W, aring, Aring ] }; - key { [ e, E, eacute, Eacute ] }; - key { [ r, R, registered ] }; - key { [ t, T, thorn, THORN ] }; - key { [ y, Y, udiaeresis, Udiaeresis ] }; - key { [ u, U, uacute, Uacute ] }; - key { [ i, I, iacute, Iacute ] }; - key { [ o, O, oacute, Oacute ] }; - key { [ p, P, odiaeresis, Odiaeresis ] }; - key { [ bracketleft, braceleft, guillemotleft ] }; - key { [ bracketright, braceright, guillemotright ] }; - - key { [ a, A, aacute, Aacute ] }; - key { [ s, S, ssharp, section ] }; - key { [ d, D, eth, ETH ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L, oslash, Ooblique ] }; - key { [ semicolon, colon, paragraph, degree ] }; - // XXX Not entirely sure if fourth level is quotedbl or diaeresis. - // The former makes a lot more sense. - key { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; - - key { [ z, Z, ae, AE ] }; - key { [ x, X ] }; - key { [ c, C, copyright ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N, ntilde, Ntilde ] }; - key { [ m, M, mu ] }; - key { [ comma, less, ccedilla, Ccedilla ] }; - key { [ period, greater ] }; - key { [ slash, question, questiondown ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "us_nodeadkeys" { - name[Group1] = "U.S. English - no dead keys"; - - include "nokia_vndr/su-8w(us_intl)" - - // XXX Not entirely sure if second level is quotedbl or diaeresis. - // The former makes a lot more sense. - key { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] }; -}; - - - -partial default alphanumeric_keys -xkb_symbols "base" { - // forked from from pc(pc105); madness. - key { [ Escape ] }; - - // the extra key on most European keyboards - key { [ less, greater, bar, brokenbar ] }; - - // these keys are common to all layouts - key { [ backslash, bar ] }; - key { [ space ] }; - - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; - // we don't ever generate this key, but the VKB needs it always. - key { [ KP_Enter ] }; - // generated from the headset, must always be in the map. - key { [ XF86Phone ] }; - - key { [ Caps_Lock ] }; - - key { [ Num_Lock, Pointer_EnableKeys ] }; - - key { [ Shift_L ] }; - key { [ Control_L ] }; - key { [ Alt_L, Meta_L ] }; - key { [ Super_L ] }; - - key { [ Shift_R ] }; - key { [ Control_R ] }; - key { [ Alt_R, Meta_R ] }; - key { [ Super_R ] }; - - key { [ Menu ] }; - - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F11 ] }; - key { [ F10 ] }; - key { [ F12 ] }; - - // begin modifier mappings - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; - modifier_map Control{ Control_L, Control_R }; - modifier_map Mod2 { Num_Lock }; - - // Fake keys for virtual<->real modifiers mapping - key { [ ISO_Level3_Shift ] }; - key { [ Mode_switch ] }; - modifier_map Mod5 { , }; - - key { [ NoSymbol, Alt_L ] }; - modifier_map Mod1 { , }; - - key { [ NoSymbol, Meta_L ] }; - modifier_map Mod1 { }; - - key { [ NoSymbol, Super_L ] }; - modifier_map Mod4 { }; - - key { [ NoSymbol, Hyper_L ] }; - modifier_map Mod4 { }; - - key { [ Insert ] }; - key { [ Delete ] }; - key { [ End ] }; - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - - // True for all layouts (except for ru). - key { [ grave, asterisk, asciitilde ] }; - - // SU-8W uses 140 for Home, not the normal keycode. Very useful. - key { [ NoSymbol ] }; - // Ditto LWIN/RWIN and Page Up/Page Down. - key { [ none ] }; - key { [ NoSymbol ] }; - - // The LWIN & RWIN keys correspond to the 'select left' and - // 'select right' keys. - key { [ Prior ] }; - key { [ Next ] }; - - key { [ Home ] }; - key { [ Menu ] }; - key { [ XF86Mail ] }; - - // Power button. - key { [ Execute ] }; -}; diff --git a/Xorg/xorg/data/xkeyboard-config/Makefile b/Xorg/xorg/data/xkeyboard-config/Makefile deleted file mode 100644 index dc6079c33..000000000 --- a/Xorg/xorg/data/xkeyboard-config/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xkeyboard-config -PKG_VERSION:=1.7 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://xlibs.freedesktop.org/xkbdesc/ -PKG_MD5SUM:=d351c0109fac166edcedad32d1b0e38e - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xkeyboard-config - SECTION:=xorg-data - CATEGORY:=Xorg - SUBMENU:=data - TITLE:=xkeyboard-config - DEPENDS:=+xkbcomp - URL:=http://freedesktop.org/wiki/Software/XKeyboardConfig -endef - -define Package/xkeyboard-config/install - $(INSTALL_DIR) $(1)/usr/share/X11 - $(CP) $(PKG_INSTALL_DIR)/usr/share/X11/xkb $(1)/usr/share/X11/ -endef - -$(eval $(call RequireCommand,intltool-update, \ - $(PKG_NAME) requires intltool installed on the host-system. \ -)) - -$(eval $(call BuildPackage,xkeyboard-config)) diff --git a/Xorg/xorg/driver/xf86-input-evdev/Makefile b/Xorg/xorg/driver/xf86-input-evdev/Makefile deleted file mode 100644 index 99cd18cbb..000000000 --- a/Xorg/xorg/driver/xf86-input-evdev/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-input-evdev -PKG_RELEASE:=2 -PKG_VERSION:=2.3.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=21dac6461379d67ee3b333c77f63e7bf - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -PKG_BUILD_DEPENDS:=randrproto inputproto xproto - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-input-evdev - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg - TITLE:=xf86-input-evdev - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xf86-input-evdev/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/evdev_drv.so \ - $(1)/usr/lib/xorg/modules/input/ -endef - -$(eval $(call BuildPackage,xf86-input-evdev)) diff --git a/Xorg/xorg/driver/xf86-input-keyboard/Makefile b/Xorg/xorg/driver/xf86-input-keyboard/Makefile deleted file mode 100644 index 39110ff28..000000000 --- a/Xorg/xorg/driver/xf86-input-keyboard/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-input-keyboard -PKG_VERSION:=1.4.0 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=fd17158ffeacecc8cc670604460cb98b - -PKG_BUILD_DEPENDS:=randrproto inputproto kbproto xproto -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-input-keyboard - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg - TITLE:=xf86-input-keyboard - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xf86-input-keyboard/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/kbd_drv.so \ - $(1)/usr/lib/xorg/modules/input/ -endef - -$(eval $(call BuildPackage,xf86-input-keyboard)) diff --git a/Xorg/xorg/driver/xf86-input-mouse/Makefile b/Xorg/xorg/driver/xf86-input-mouse/Makefile deleted file mode 100644 index 76b011068..000000000 --- a/Xorg/xorg/driver/xf86-input-mouse/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-input-mouse -PKG_VERSION:=1.5.0 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=c58629fddf0782dad5c02da6aeb35521 - -PKG_BUILD_DEPENDS:=randrproto inputproto xproto -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-input-mouse - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg - TITLE:=xf86-input-mouse - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xf86-input-mouse/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/mouse_drv.so \ - $(1)/usr/lib/xorg/modules/input/ -endef - -$(eval $(call BuildPackage,xf86-input-mouse)) diff --git a/Xorg/xorg/driver/xf86-video-ati/Makefile b/Xorg/xorg/driver/xf86-video-ati/Makefile deleted file mode 100644 index 7b3f2724d..000000000 --- a/Xorg/xorg/driver/xf86-video-ati/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=xf86 -PKG_NAME:=xf86-video-ati -PKG_RELEASE:=1 -PKG_VERSION:=6.12.4 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ -PKG_MD5SUM:=e662348f6f957fcedf52818d668ab9f5 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-video-ati - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg @TARGET_x86 @BROKEN - TITLE:=xf86-video-ati - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ - -I$(STAGING_DIR)/usr/include/X11/ \ - $(TARGET_CPPFLAGS) - -EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS) - -acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1)))) - -CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \ - sdkdir=$(STAGING_DIR) - -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ - sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\ - fi \ - ) -endef - -define Build/Compile - make -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf -endef - -define Package/xf86-video-ati/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,xf86-video-ati)) diff --git a/Xorg/xorg/driver/xf86-video-fbdev/Makefile b/Xorg/xorg/driver/xf86-video-fbdev/Makefile deleted file mode 100644 index 3b68ad559..000000000 --- a/Xorg/xorg/driver/xf86-video-fbdev/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-video-fbdev -PKG_VERSION:=0.4.1 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=79ce1eb9f9d2ed56de70d8e06cb767d9 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-video-fbdev - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg +libpciaccess - TITLE:=xf86-video-fbdev - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-pciaccess \ - ) -endef - -define Package/xf86-video-fbdev/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/*.so \ - $(1)/usr/lib/xorg/modules/drivers -endef - -$(eval $(call BuildPackage,xf86-video-fbdev)) diff --git a/Xorg/xorg/driver/xf86-video-geode/Makefile b/Xorg/xorg/driver/xf86-video-geode/Makefile deleted file mode 100644 index b53ed85bf..000000000 --- a/Xorg/xorg/driver/xf86-video-geode/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-video-geode -PKG_RELEASE:=1 -PKG_VERSION:=2.11.6 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=3ff0dfb4b3bd8872c6efb70371cb6b98 - -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_BUILD_DEPENDS:=randrproto renderproto videoproto xextproto xf86dgaproto \ - xproto fontsproto -PKG_INSTALL:=1 - - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-video-geode - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg +libpciaccess @TARGET_x86 - TITLE:=xf86-video-geode - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xf86-video-geode/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/*.so \ - $(1)/usr/lib/xorg/modules/drivers/ -endef - -$(eval $(call BuildPackage,xf86-video-geode)) diff --git a/Xorg/xorg/driver/xf86-video-intel/Makefile b/Xorg/xorg/driver/xf86-video-intel/Makefile deleted file mode 100644 index f1c71104d..000000000 --- a/Xorg/xorg/driver/xf86-video-intel/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=xf86 -PKG_NAME:=xf86-video-intel -PKG_RELEASE:=1 -PKG_VERSION:=2.9.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ -PKG_BUILD_DEPENDS:=xf86driproto glproto - -PKG_MD5SUM:=8951d0366c16991badb7f9050556f4f3 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-video-intel - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg @TARGET_x86 - TITLE:=xf86-video-intel - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ - -I$(STAGING_DIR)/usr/include/X11/ \ - -I$(STAGING_DIR)/usr/include/drm \ - $(TARGET_CPPFLAGS) - -EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS) - -acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1)))) - -CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \ - sdkdir=$(STAGING_DIR) - -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ - sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\ - fi \ - ) -endef - -define Build/Compile - make -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf -endef - -define Package/xf86-video-intel/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,xf86-video-intel)) diff --git a/Xorg/xorg/driver/xf86-video-nv/Makefile b/Xorg/xorg/driver/xf86-video-nv/Makefile deleted file mode 100644 index 11bff5f82..000000000 --- a/Xorg/xorg/driver/xf86-video-nv/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=xf86 -PKG_NAME:=xf86-video-nv -PKG_RELEASE:=3 -PKG_VERSION:=2.1.15 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ -PKG_MD5SUM:=1b22188bd9012a148206940708b52ea6 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-video-nv - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg @TARGET_x86 - TITLE:=xf86-video-nv - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ - -I$(STAGING_DIR)/usr/include/X11/ \ - $(TARGET_CPPFLAGS) - -EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS) - -acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1)))) - -CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \ - sdkdir=$(STAGING_DIR) - -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ - sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\ - fi \ - ) -endef - -define Build/Compile - make -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf -endef - -define Package/xf86-video-nv/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,xf86-video-nv)) diff --git a/Xorg/xorg/driver/xf86-video-omap/Makefile b/Xorg/xorg/driver/xf86-video-omap/Makefile deleted file mode 100644 index 9b8022563..000000000 --- a/Xorg/xorg/driver/xf86-video-omap/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-video-omapfb -PKG_VERSION:=20100810 -PKG_REV:=db636c8436265c3d86c5b8e00785e45d55825c80 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://git.pingu.fi/xf86-video-omapfb -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - -define Package/xf86-video-omapfb - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg - TITLE:=xf86-video-omapfb - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR); ./autogen.sh) - $(call Build/Configure/Default) -endef - -define Package/xf86-video-omapfb/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/*.so \ - $(1)/usr/lib/xorg/modules/drivers -endef - -$(eval $(call BuildPackage,xf86-video-omapfb)) diff --git a/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch b/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch deleted file mode 100644 index 007179f66..000000000 --- a/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - src/omapfb-driver.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- xf86-video-omapfb-20100810.orig/src/omapfb-driver.c -+++ xf86-video-omapfb-20100810/src/omapfb-driver.c -@@ -182,7 +182,7 @@ OMAPFBProbe(DriverPtr drv, int flags) - return FALSE; - - /* FIXME: We don't really want to do it like this... */ --#define DEFAULT_DEVICE "/dev/fb" -+#define DEFAULT_DEVICE "/dev/fb0" - - for (i = 0; i < numDevSections; i++) { - int fd; -@@ -831,7 +831,7 @@ static XF86ModuleVersionInfo OMAPFBVersR - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, -- PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, -+ 99, 99, 99, - ABI_CLASS_VIDEODRV, - ABI_VIDEODRV_VERSION, - NULL, diff --git a/Xorg/xorg/driver/xf86-video-vesa/Makefile b/Xorg/xorg/driver/xf86-video-vesa/Makefile deleted file mode 100644 index d48860db8..000000000 --- a/Xorg/xorg/driver/xf86-video-vesa/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86-video-vesa -PKG_RELEASE:=1 -PKG_VERSION:=2.2.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -PKG_MD5SUM:=61a1dc9a22991bd04d0ff98f800775c1 -PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto xextproto -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, xorg-driver.mk) - - -define Package/xf86-video-vesa - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xserver-xorg +libpciaccess @TARGET_x86 - TITLE:=xf86-video-vesa - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xf86-video-vesa/install - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/vesa_drv.so \ - $(1)/usr/lib/xorg/modules/drivers/ -endef - -$(eval $(call BuildPackage,xf86-video-vesa)) diff --git a/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch b/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch deleted file mode 100644 index 0ae58f3d3..000000000 --- a/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -20787,7 +20787,7 @@ fi - - - CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' --INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include' -+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src' - - - diff --git a/Xorg/xorg/font/encodings/Makefile b/Xorg/xorg/font/encodings/Makefile deleted file mode 100644 index 9ffc949d1..000000000 --- a/Xorg/xorg/font/encodings/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=encodings -PKG_NAME:=encodings -PKG_RELEASE:=2 -PKG_VERSION:=1.0.2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=11adda157b03d63fd61d95ad7ef00466 - -include $(INCLUDE_DIR)/package.mk - -define Package/encodings - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=encodings - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.encodings -endef - -define Package/encodings/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/encodings/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.encodings` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (encodings,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,encodings)) - diff --git a/Xorg/xorg/font/font-alias/Makefile b/Xorg/xorg/font/font-alias/Makefile deleted file mode 100644 index 57ec02f95..000000000 --- a/Xorg/xorg/font/font-alias/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-alias -PKG_RELEASE:=2 -PKG_VERSION:=1.0.1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=c4776b6f0f2ecdb7670b6fe64b5d2a2d - -include $(INCLUDE_DIR)/package.mk - -define Package/font-alias - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-alias - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-alias -endef - -define Package/font-alias/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-alias/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-alias` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-alias,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-alias)) - diff --git a/Xorg/xorg/font/font-bh-75dpi/Makefile b/Xorg/xorg/font/font-bh-75dpi/Makefile deleted file mode 100644 index e6a547ae4..000000000 --- a/Xorg/xorg/font/font-bh-75dpi/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-bh-75dpi -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=6e51cd02f4ce32e1393e34ab17a9b211 - -include $(INCLUDE_DIR)/package.mk - -define Package/font-bh-75dpi - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-bh-75dpi - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-bh-75dpi -endef - -define Package/font-bh-75dpi/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-bh-75dpi/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-bh-75dpi` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-bh-75dpi,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-bh-75dpi)) - diff --git a/Xorg/xorg/font/font-cursor-misc/Makefile b/Xorg/xorg/font/font-cursor-misc/Makefile deleted file mode 100644 index 1120f6393..000000000 --- a/Xorg/xorg/font/font-cursor-misc/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-cursor-misc -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=305fa22cdfefb8f80babd711051a534b - -include $(INCLUDE_DIR)/package.mk - -define Package/font-cursor-misc - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-cursor-misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-cursor-misc -endef - -define Package/font-cursor-misc/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-cursor-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-cursor-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-cursor-misc,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-cursor-misc)) - diff --git a/Xorg/xorg/font/font-daewoo-misc/Makefile b/Xorg/xorg/font/font-daewoo-misc/Makefile deleted file mode 100644 index 398563aec..000000000 --- a/Xorg/xorg/font/font-daewoo-misc/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-daewoo-misc -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=61f9eab48c619af5494d3e384d8d7d79 - -include $(INCLUDE_DIR)/package.mk - -define Package/font-daewoo-misc - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-daewoo-misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-daewoo-misc -endef - -define Package/font-daewoo-misc/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-daewoo-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-daewoo-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-daewoo-misc,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-daewoo-misc)) - diff --git a/Xorg/xorg/font/font-dec-misc/Makefile b/Xorg/xorg/font/font-dec-misc/Makefile deleted file mode 100644 index 107e5442a..000000000 --- a/Xorg/xorg/font/font-dec-misc/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-dec-misc -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=284e554db1c64fb7580a06df01444a2b - -include $(INCLUDE_DIR)/package.mk - -define Package/font-dec-misc - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-dec-misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-dec-misc -endef - -define Package/font-dec-misc/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-dec-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-dec-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-dec-misc,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-dec-misc)) - diff --git a/Xorg/xorg/font/font-ibm-type1/Makefile b/Xorg/xorg/font/font-ibm-type1/Makefile deleted file mode 100644 index df6b658cc..000000000 --- a/Xorg/xorg/font/font-ibm-type1/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-ibm-type1 -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=8e8733051371e2b51123376b49f5d3ea - -include $(INCLUDE_DIR)/package.mk - -define Package/font-ibm-type1 - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-ibm-type1 - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-ibm-type1 -endef - -define Package/font-ibm-type1/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-ibm-type1/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-ibm-type1` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-ibm-type1,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-ibm-type1)) - diff --git a/Xorg/xorg/font/font-isas-misc/Makefile b/Xorg/xorg/font/font-isas-misc/Makefile deleted file mode 100644 index 037bebf96..000000000 --- a/Xorg/xorg/font/font-isas-misc/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-isas-misc -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=ec709a96b64b497a5cb5658c93bd38dc - -include $(INCLUDE_DIR)/package.mk - -define Package/font-isas-misc - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-isas-misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-isas-misc -endef - -define Package/font-isas-misc/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-isas-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-isas-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-isas-misc,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-isas-misc)) - diff --git a/Xorg/xorg/font/font-jis-misc/Makefile b/Xorg/xorg/font/font-jis-misc/Makefile deleted file mode 100644 index b3073f380..000000000 --- a/Xorg/xorg/font/font-jis-misc/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-jis-misc -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=61febb49a71065723a1fba17cbf23c67 - -include $(INCLUDE_DIR)/package.mk - -define Package/font-jis-misc - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-jis-misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-jis-misc -endef - -define Package/font-jis-misc/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-jis-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-jis-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-jis-misc,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-jis-misc)) - diff --git a/Xorg/xorg/font/font-micro-misc/Makefile b/Xorg/xorg/font/font-micro-misc/Makefile deleted file mode 100644 index d8f84dcbe..000000000 --- a/Xorg/xorg/font/font-micro-misc/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-micro-misc -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=8c8bffd7540f05caa0dbb4e6e1d6c58e - -include $(INCLUDE_DIR)/package.mk - -define Package/font-micro-misc - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-micro-misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-micro-misc -endef - -define Package/font-micro-misc/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-micro-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-micro-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-micro-misc,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-micro-misc)) - diff --git a/Xorg/xorg/font/font-misc-cyrillic/Makefile b/Xorg/xorg/font/font-misc-cyrillic/Makefile deleted file mode 100644 index 2e1d38c29..000000000 --- a/Xorg/xorg/font/font-misc-cyrillic/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-misc-cyrillic -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=3596907d7a2a99c81d8de99bc4552b6a - -include $(INCLUDE_DIR)/package.mk - -define Package/font-misc-cyrillic - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-misc-cyrillic - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-misc-cyrillic -endef - -define Package/font-misc-cyrillic/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-misc-cyrillic/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-cyrillic` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-misc-cyrillic,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-misc-cyrillic)) - diff --git a/Xorg/xorg/font/font-misc-misc/Makefile b/Xorg/xorg/font/font-misc-misc/Makefile deleted file mode 100644 index e6aa36b37..000000000 --- a/Xorg/xorg/font/font-misc-misc/Makefile +++ /dev/null @@ -1,135 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font-base -PKG_NAME:=font-misc-misc -PKG_RELEASE:=1 -PKG_VERSION:=1.0.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=2a57f6188c41d4bc1b88ca3d08ad011d - -include $(INCLUDE_DIR)/package.mk - -define Package/font-misc-misc/Default - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font -endef - -define Package/font-base - $(call Package/font-misc-misc/Default) - DEPENDS:=+xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-base - URL:=http://xorg.freedesktop.org/ -endef - -define Package/font-misc-misc - $(call Package/font-misc-misc/Default) - DEPENDS:=font-base - TITLE:=font-misc-misc - URL:=http://xorg.freedesktop.org/ -endef - - -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs rm -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - -define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Package/font-base/install - $(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/6x13* $(1)/usr/lib/X11/fonts/misc/ - $(CP) files/fonts.dir.font-base $(1)/usr/lib/X11/fonts/misc/ -endef - -define Package/font-misc-misc/install - $(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/* $(1)/usr/lib/X11/fonts/misc/ - rm $(1)/usr/lib/X11/fonts/misc/6x13* - $(CP) files/fonts.dir.font-misc-misc $(1)/usr/lib/X11/fonts/misc/ -endef - -define Package/font-base/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-base` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -define Package/font-misc-misc/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-misc` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -# FIXME: replace with native versions -$(eval $(call RequireCommand,mkfontscale, \ - Please install mkfontscale (usually in xfonts-utils) \ -)) -$(eval $(call RequireCommand,mkfontdir, \ - Please install mkfontdir (usually in xfonts-utils) \ -)) - -$(eval $(call BuildPackage,font-misc-misc)) -$(eval $(call BuildPackage,font-base)) - - diff --git a/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base deleted file mode 100644 index 0158265a1..000000000 --- a/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base +++ /dev/null @@ -1,9 +0,0 @@ -6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 -6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15 -6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 -6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 -6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15 -6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1 -6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1 -6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15 -6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1 diff --git a/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc deleted file mode 100644 index 1adf284dd..000000000 --- a/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc +++ /dev/null @@ -1,62 +0,0 @@ -10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 -10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15 -10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 -12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1 -18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1 -18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1 -4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1 -4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15 -4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1 -5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 -5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15 -5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 -5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 -5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15 -5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 -6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 -6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15 -6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 -6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 -6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15 -6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1 -6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 -6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15 -6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1 -7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 -7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 -7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1 -7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 -7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 -7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1 -7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1 -7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15 -7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1 -7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 -7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15 -7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 -7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 -7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15 -7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1 -8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 -8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15 -8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 -8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 -8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15 -8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1 -8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1 -8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15 -8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1 -9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 -9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15 -9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 -9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 -9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15 -9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1 -9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 -9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15 -9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 -9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1 -9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15 -9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1 -k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 -nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific diff --git a/Xorg/xorg/font/font-xfree86-type1/Makefile b/Xorg/xorg/font/font-xfree86-type1/Makefile deleted file mode 100644 index c4535a796..000000000 --- a/Xorg/xorg/font/font-xfree86-type1/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=font -PKG_NAME:=font-xfree86-type1 -PKG_RELEASE:=2 -PKG_VERSION:=1.0.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font -PKG_MD5SUM:=e66f36a6d68203cc4cf7b56ebbb192dd - -include $(INCLUDE_DIR)/package.mk - -define Package/font-xfree86-type1 - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT - TITLE:=font-xfree86-type1 - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.font-xfree86-type1 -endef - -define Package/font-xfree86-type1/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/font-xfree86-type1/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-xfree86-type1` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (font-xfree86-type1,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,font-xfree86-type1)) - diff --git a/Xorg/xorg/font/packages b/Xorg/xorg/font/packages deleted file mode 100644 index 1766b9b03..000000000 --- a/Xorg/xorg/font/packages +++ /dev/null @@ -1,12 +0,0 @@ -encodings-1.0.2| -font-xfree86-type1-1.0.0| -font-cursor-misc-1.0.0| -font-daewoo-misc-1.0.0| -font-dec-misc-1.0.0| -font-ibm-type1-1.0.0| -font-isas-misc-1.0.0| -font-jis-misc-1.0.0| -font-micro-misc-1.0.0| -font-misc-cyrillic-1.0.0| -font-bh-75dpi-1.0.0| -font-alias-1.0.1| diff --git a/Xorg/xorg/font/template.mk b/Xorg/xorg/font/template.mk deleted file mode 100644 index 149f89470..000000000 --- a/Xorg/xorg/font/template.mk +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=@BASE_NAME@ -PKG_NAME:=@NAME@ -PKG_RELEASE:=2 -PKG_VERSION:=@VER@ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font - -include $(INCLUDE_DIR)/package.mk - -define Package/@NAME@ - SECTION:=xorg-font - CATEGORY:=Xorg - SUBMENU:=font - DEPENDS:=@DEP@ +xorg-server +font-util @DISPLAY_SUPPORT - TITLE:=@NAME@ - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install -endef - -CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 - -define Build/Compile - UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) - DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - sed -i '1d' {} - find $(PKG_INSTALL_DIR) -name fonts.dir | \ - xargs -i -t \ - mv {} {}.@NAME@ -endef - -define Package/@NAME@/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/@NAME@/postinst -#!/bin/sh - -FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.@NAME@` -FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir - -echo found $${FILE} - -if [ ! -z $${FILE_NEW} ]; then - if [ -f $${FILE_OLD} ]; then - sed -i "1d" $${FILE_OLD} - cat $${FILE_NEW} >> $${FILE_OLD} - rm -rf $${FILE_NEW} - mv $${FILE_OLD} $${FILE_OLD}.tmp - else - mv $${FILE_NEW} $${FILE_OLD}.tmp - fi - (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} - rm $${FILE_OLD}.tmp -fi -endef - -ifeq (@NAME@,font-util) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ -endef -endif - -$(eval $(call BuildPackage,@NAME@)) - diff --git a/Xorg/xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile deleted file mode 100644 index bf74d5c60..000000000 --- a/Xorg/xorg/lib/libICE/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libICE -PKG_RELEASE:=1 -PKG_VERSION:=1.0.6 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=2d39bc924af24325dae589e9a849180c - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xtrans - -include $(INCLUDE_DIR)/package.mk - -define Package/libICE - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libICE - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/ICE} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/ICE/* \ - $(1)/usr/include/X11/ICE/ -endef - -define Package/libICE/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libICE)) diff --git a/Xorg/xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile deleted file mode 100644 index 08dbd64c1..000000000 --- a/Xorg/xorg/lib/libSM/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=libSM -PKG_NAME:=libSM -PKG_RELEASE:=2 -PKG_VERSION:=1.1.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=6889a455496aaaa65b1fa05fc518d179 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xtrans - -include $(INCLUDE_DIR)/package.mk - -define Package/libSM - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libICE +libuuid - TITLE:=libSM - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/SM} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/SM/* \ - $(1)/usr/include/X11/SM/ -endef - -define Package/libSM/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libSM)) diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile deleted file mode 100644 index 6468b04e3..000000000 --- a/Xorg/xorg/lib/libX11/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libX11 -PKG_RELEASE:=1 -PKG_VERSION:=1.3.2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=001d780829f936e34851ef7cd37b4dfd - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto xf86bigfontproto kbproto inputproto \ - xtrans xcmiscproto bigreqsproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libX11 - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libXdmcp +libXau @FEATURE_drawing-backend_libX11 @DISPLAY_SUPPORT - TITLE:=libX11 - URL:=http://xorg.freedesktop.org/ -endef - -define Feature/libX11 - TARGET_NAME:=drawing-backend - TARGET_TITLE:=Drawing Backend - NAME:=libX11 -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - --enable-xf86bigfont \ - --without-xcb \ - --without-launchd \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/src/util \ - CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS)" \ - CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" - - $(call Build/Compile/Default) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/* \ - $(1)/usr/include/X11/ -endef - -define Package/libX11/install - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DIR) $(1)/usr/share/X11 - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/X11/* \ - $(1)/usr/share/X11 -endef - -$(eval $(call Feature,libX11)) -$(eval $(call BuildPackage,libX11)) diff --git a/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch b/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch deleted file mode 100644 index 6d28221a4..000000000 --- a/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/modules/im/ximcp/Makefile.in b/modules/im/ximcp/Makefile.in -index 905d526..6027e58 100644 ---- a/modules/im/ximcp/Makefile.in -+++ b/modules/im/ximcp/Makefile.in -@@ -96,7 +96,7 @@ ximcp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(ximcp_la_LDFLAGS) $(LDFLAGS) -o $@ - @XLIB_LOADABLE_I18N_TRUE@am_ximcp_la_rpath = -rpath $(commonlibdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/modules/lc/Utf8/Makefile.in b/modules/lc/Utf8/Makefile.in -index 4078c1c..e7e52fa 100644 ---- a/modules/lc/Utf8/Makefile.in -+++ b/modules/lc/Utf8/Makefile.in -@@ -88,7 +88,7 @@ xlcUTF8Load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $@ - @XLIB_LOADABLE_I18N_TRUE@am_xlcUTF8Load_la_rpath = -rpath \ - @XLIB_LOADABLE_I18N_TRUE@ $(commonlibdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/modules/lc/def/Makefile.in b/modules/lc/def/Makefile.in -index b37cec6..89ce832 100644 ---- a/modules/lc/def/Makefile.in -+++ b/modules/lc/def/Makefile.in -@@ -86,7 +86,7 @@ xlcDef_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(xlcDef_la_LDFLAGS) $(LDFLAGS) -o $@ - @XLIB_LOADABLE_I18N_TRUE@am_xlcDef_la_rpath = -rpath $(commonlibdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/modules/lc/gen/Makefile.in b/modules/lc/gen/Makefile.in -index 6e2e522..e832723 100644 ---- a/modules/lc/gen/Makefile.in -+++ b/modules/lc/gen/Makefile.in -@@ -86,7 +86,7 @@ xlibi18n_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(xlibi18n_la_LDFLAGS) $(LDFLAGS) -o $@ - @XLIB_LOADABLE_I18N_TRUE@am_xlibi18n_la_rpath = -rpath $(commonlibdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/modules/lc/xlocale/Makefile.in b/modules/lc/xlocale/Makefile.in -index 7c947ee..b68b06e 100644 ---- a/modules/lc/xlocale/Makefile.in -+++ b/modules/lc/xlocale/Makefile.in -@@ -86,7 +86,7 @@ xlocale_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(xlocale_la_LDFLAGS) $(LDFLAGS) -o $@ - @XLIB_LOADABLE_I18N_TRUE@am_xlocale_la_rpath = -rpath $(commonlibdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/modules/om/generic/Makefile.in b/modules/om/generic/Makefile.in -index e39802b..0979207 100644 ---- a/modules/om/generic/Makefile.in -+++ b/modules/om/generic/Makefile.in -@@ -89,7 +89,7 @@ xomGeneric_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(xomGeneric_la_LDFLAGS) $(LDFLAGS) -o $@ - @XLIB_LOADABLE_I18N_TRUE@am_xomGeneric_la_rpath = -rpath \ - @XLIB_LOADABLE_I18N_TRUE@ $(commonlibdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/src/util/Makefile.in b/src/util/Makefile.in -index 65c181e..bfa7c05 100644 ---- a/src/util/Makefile.in -+++ b/src/util/Makefile.in -@@ -59,7 +59,7 @@ am__v_lt_0 = --silent - makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/src/xcms/Makefile.in b/src/xcms/Makefile.in -index 6573196..a140221 100644 ---- a/src/xcms/Makefile.in -+++ b/src/xcms/Makefile.in -@@ -65,7 +65,7 @@ libxcms_la_OBJECTS = $(am_libxcms_la_OBJECTS) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/src/xkb/Makefile.in b/src/xkb/Makefile.in -index 0e52692..43a9660 100644 ---- a/src/xkb/Makefile.in -+++ b/src/xkb/Makefile.in -@@ -57,7 +57,7 @@ libxkb_la_OBJECTS = $(am_libxkb_la_OBJECTS) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/src/xlibi18n/Makefile.in b/src/xlibi18n/Makefile.in -index 50ac253..6c44c48 100644 ---- a/src/xlibi18n/Makefile.in -+++ b/src/xlibi18n/Makefile.in -@@ -85,7 +85,7 @@ libi18n_la_OBJECTS = $(am_libi18n_la_OBJECTS) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff --git a/src/Makefile.in b/src/Makefile.in -index a79daa8..ca7f366 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -218,7 +218,7 @@ libX11_la_OBJECTS = $(am_libX11_la_OBJECTS) - libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libX11_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/X11 -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/ -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f diff --git a/Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch b/Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch deleted file mode 100644 index a83e76150..000000000 --- a/Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/specs/troffrules.in 2010-01-15 01:11:36.000000000 +0000 -+++ b/specs/troffrules.in 2011-01-24 21:37:01.000000000 +0000 -@@ -49,7 +49,9 @@ - - .ms.ps: - -$(AM_V_GEN) $(GROFF) -Tps $(GROFF_FLAGS) $< 2> index.$@.raw > $@ -- @if grep '^[^1-9.]' index.$@.raw | grep -v warning; then exit 1; \ -+ @if grep '^[^1-9.]' index.$@.raw | grep -v warning | \ -+ grep -v 'table wider than line width'; \ -+ then exit 1; \ - else test $$? -le 1; fi - - .ms.txt: diff --git a/Xorg/xorg/lib/libXau/Makefile b/Xorg/xorg/lib/libXau/Makefile deleted file mode 100644 index 74a5908cf..000000000 --- a/Xorg/xorg/lib/libXau/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=libXau -PKG_NAME:=libXau -PKG_RELEASE:=1 -PKG_VERSION:=1.0.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=993b3185c629e4b89401fca072dcb663 - -PKG_FIXUP:=libtool - -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXau - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libXau - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/* \ - $(1)/usr/include/X11/ -endef - -define Package/libXau/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXau)) diff --git a/Xorg/xorg/lib/libXaw/Makefile b/Xorg/xorg/lib/libXaw/Makefile deleted file mode 100644 index 5733b5198..000000000 --- a/Xorg/xorg/lib/libXaw/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXaw -PKG_RELEASE:=1 -PKG_VERSION:=1.0.7 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=815e74de989ccda684e2baf8d12cf519 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto printproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXaw - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext +libXt +libXmu +libXpm +libXau - TITLE:=libXaw - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --disable-xaw6 \ - --disable-xaw8 \ - --disable-docs \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xaw} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/Xaw/* \ - $(1)/usr/include/X11/Xaw/ - -endef - -define Package/libXaw/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXaw)) diff --git a/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch b/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch deleted file mode 100644 index 036523c9f..000000000 --- a/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index eff87e9..3a9834e 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -126,7 +126,7 @@ libXaw7_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libXaw7_la_CFLAGS) \ - $(CFLAGS) $(libXaw7_la_LDFLAGS) $(LDFLAGS) -o $@ - @BUILD_XAW7_TRUE@am_libXaw7_la_rpath = -rpath $(libdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff --git a/Xorg/xorg/lib/libXcomposite/Makefile b/Xorg/xorg/lib/libXcomposite/Makefile deleted file mode 100644 index 10f970a62..000000000 --- a/Xorg/xorg/lib/libXcomposite/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXcomposite -PKG_RELEASE:=1 -PKG_VERSION:=0.4.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=0f1367f57fdf5df17a8dd71d0fa68248 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=compositeproto fixesproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXcomposite - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXfixes +libXext - TITLE:=libXcomposite - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXcomposite/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXcomposite)) diff --git a/Xorg/xorg/lib/libXcursor/Makefile b/Xorg/xorg/lib/libXcursor/Makefile deleted file mode 100644 index d83e5e3c5..000000000 --- a/Xorg/xorg/lib/libXcursor/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXcursor -PKG_RELEASE:=1 -PKG_VERSION:=1.1.10 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7dcdad1c10daea872cb3355af414b2ca - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=fixesproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXcursor - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libXrender +libXfixes +libX11 - TITLE:=libXcursor - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xcursor} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/Xcursor/* \ - $(1)/usr/include/X11/Xcursor -endef - -define Package/libXcursor/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXcursor)) diff --git a/Xorg/xorg/lib/libXdamage/Makefile b/Xorg/xorg/lib/libXdamage/Makefile deleted file mode 100644 index 34f31b895..000000000 --- a/Xorg/xorg/lib/libXdamage/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXdamage -PKG_RELEASE:=1 -PKG_VERSION:=1.1.2 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b42780bce703ec202a33e5693991c09d - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto fixesproto damageproto - -include $(INCLUDE_DIR)/package.mk - - -define Package/libXdamage - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXfixes - TITLE:=libXdamage - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXdamage/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXdamage)) diff --git a/Xorg/xorg/lib/libXdmcp/Makefile b/Xorg/xorg/lib/libXdmcp/Makefile deleted file mode 100644 index a8da2c33b..000000000 --- a/Xorg/xorg/lib/libXdmcp/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXdmcp -PKG_RELEASE:=1 -PKG_VERSION:=1.0.3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=d60941d471800f41a3f19b24bea855a7 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXdmcp - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=libXdmcp - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/* \ - $(1)/usr/include/X11/ -endef - -define Package/libXdmcp/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXdmcp)) diff --git a/Xorg/xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile deleted file mode 100644 index 3bb31f06a..000000000 --- a/Xorg/xorg/lib/libXext/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXext -PKG_RELEASE:=1 -PKG_VERSION:=1.1.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=c417c0e8df39a067f90a2a2e7133637d - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXext - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXau - TITLE:=libXext - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DIR) $(1)/usr/include/X11/extensions - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXext/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXext)) diff --git a/Xorg/xorg/lib/libXfixes/Makefile b/Xorg/xorg/lib/libXfixes/Makefile deleted file mode 100644 index 7bb353a56..000000000 --- a/Xorg/xorg/lib/libXfixes/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXfixes -PKG_RELEASE:=1 -PKG_VERSION:=4.0.4 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7f2c40852eb337b237ad944ca5c30d49 - -PKG_FIXUP:=libtool - -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto fixesproto xextproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXfixes - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 - TITLE:=libXfixes - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXfixes/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXfixes)) diff --git a/Xorg/xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile deleted file mode 100644 index 6971629b9..000000000 --- a/Xorg/xorg/lib/libXfont/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXfont -PKG_RELEASE:=1 -PKG_VERSION:=1.4.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4f2bed2a2be82e90a51a24bb3a22cdf0 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto xtrans - -include $(INCLUDE_DIR)/package.mk - -define Package/libXfont - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+zlib +libfontenc +libfreetype - TITLE:=libXfont - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --disable-devel-docs \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \ - $(1)/usr/include/X11/fonts/ -endef - -define Package/libXfont/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXfont)) diff --git a/Xorg/xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile deleted file mode 100644 index 1b865890c..000000000 --- a/Xorg/xorg/lib/libXft/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXft -PKG_RELEASE:=1 -PKG_VERSION:=2.1.14 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=254e62a233491e0e1251636536163e20 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libXft - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+fontconfig +libfreetype +libXrender - TITLE:=libXft - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xft} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/Xft/* \ - $(1)/usr/include/X11/Xft/ -endef - -define Package/libXft/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXft)) diff --git a/Xorg/xorg/lib/libXi/Makefile b/Xorg/xorg/lib/libXi/Makefile deleted file mode 100644 index 661450cde..000000000 --- a/Xorg/xorg/lib/libXi/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXi -PKG_RELEASE:=1 -PKG_VERSION:=1.3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=8df4ece9bd1efb02c28acb2b6f485e09 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto inputproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXi - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext - TITLE:=libXi - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, --enable-malloc0returnsnull) -endef - -define Package/libXi/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libXi.so* \ - $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libXi.{so*,a,la} \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(INSTALL_DIR) $(1)/usr/include/X11/extensions - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -$(eval $(call BuildPackage,libXi)) diff --git a/Xorg/xorg/lib/libXmu/Makefile b/Xorg/xorg/lib/libXmu/Makefile deleted file mode 100644 index 758b3ec7d..000000000 --- a/Xorg/xorg/lib/libXmu/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXmu -PKG_RELEASE:=1 -PKG_VERSION:=1.0.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=fc4d66be7a1a1eb474954728415e46d6 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=libXt libXext xextproto - -include $(INCLUDE_DIR)/package.mk - - -define Package/libXmu - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libXt +libXext - TITLE:=libXmu - URL:=http://xorg.freedesktop.org/ -endef - -define Package/libXmuu - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 - TITLE:=libXmuu - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xmu} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/Xmu/* \ - $(1)/usr/include/X11/Xmu/ -endef - -define Package/libXmu/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libXmu.so* \ - $(1)/usr/lib/ -endef - -define Package/libXmuu/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libXmuu.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXmu)) -$(eval $(call BuildPackage,libXmuu)) diff --git a/Xorg/xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile deleted file mode 100644 index 05186d130..000000000 --- a/Xorg/xorg/lib/libXpm/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXpm -PKG_RELEASE:=2 -PKG_VERSION:=3.5.8 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=38e58e72d476a74298a59052fde185a3 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUID_DEPENDS:=xproto xextproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXpm - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXt +libXext +libSM - TITLE:=libXpm - URL:=http://xorg.freedesktop.org/ -endef - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/* \ - $(1)/usr/include/X11/ -endef - -define Package/libXpm/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXpm)) diff --git a/Xorg/xorg/lib/libXrandr/Makefile b/Xorg/xorg/lib/libXrandr/Makefile deleted file mode 100644 index 398581770..000000000 --- a/Xorg/xorg/lib/libXrandr/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXrandr -PKG_RELEASE:=4 -PKG_VERSION:=1.3.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=68eb59c3b7524db6ffd78746ee893d1d - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=randrproto renderproto xextproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXrandr - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libXext +libXrender +libX11 - TITLE:=libXrandr - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXrandr/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXrandr)) diff --git a/Xorg/xorg/lib/libXrender/Makefile b/Xorg/xorg/lib/libXrender/Makefile deleted file mode 100644 index dfc541b68..000000000 --- a/Xorg/xorg/lib/libXrender/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXrender -PKG_RELEASE:=1 -PKG_VERSION:=0.9.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=276dd9e85daf0680616cd9f132b354c9 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=renderproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXrender - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 - TITLE:=libXrender - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXrender/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXrender)) diff --git a/Xorg/xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile deleted file mode 100644 index 81cbad460..000000000 --- a/Xorg/xorg/lib/libXt/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXt -PKG_RELEASE:=1 -PKG_VERSION:=1.0.7 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=96f3c93434a93186d178b60d4a262496 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto kbproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXt - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libSM +libX11 +libICE - TITLE:=libXt - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - --without-xcb \ - , \ - CC_FOR_BUILD="$(HOSTCC)" \ - CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ - LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/util \ - CPPFLAGS="$(HOST_CPPFLAGS)" - - $(call Build/Compile/Default) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/* \ - $(1)/usr/include/X11/ -endef - -define Package/libXt/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXt)) diff --git a/Xorg/xorg/lib/libXtst/Makefile b/Xorg/xorg/lib/libXtst/Makefile deleted file mode 100644 index 60a37b1e4..000000000 --- a/Xorg/xorg/lib/libXtst/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXtst -PKG_RELEASE:=1 -PKG_VERSION:=1.1.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=dd6f3e20b87310187121539f9605d977 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=recordproto xextproto inputproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXtst - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext +libXi - TITLE:=libXtst - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{include,lib/pkgconfig} - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libXtst/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXtst)) diff --git a/Xorg/xorg/lib/libXv/Makefile b/Xorg/xorg/lib/libXv/Makefile deleted file mode 100644 index 95ca1cf9d..000000000 --- a/Xorg/xorg/lib/libXv/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXv -PKG_RELEASE:= -PKG_VERSION:=1.0.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=1d97798b1d8bbf8d9085e1b223a0738f - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=videoproto xextproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXv - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext - TITLE:=libXv - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXv/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXv)) diff --git a/Xorg/xorg/lib/libXvMC/Makefile b/Xorg/xorg/lib/libXvMC/Makefile deleted file mode 100644 index 82b421b5b..000000000 --- a/Xorg/xorg/lib/libXvMC/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXvMC -PKG_RELEASE:=1 -PKG_VERSION:=1.0.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=16c3a11add14979beb7510e44623cac6 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=videoproto xextproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXvMC - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libXext +libXv +libX11 - TITLE:=libXvMC - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libXvMC/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXvMC)) diff --git a/Xorg/xorg/lib/libXxf86vm/Makefile b/Xorg/xorg/lib/libXxf86vm/Makefile deleted file mode 100644 index 2a09cb81f..000000000 --- a/Xorg/xorg/lib/libXxf86vm/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXxf86vm -PKG_RELEASE:=1 -PKG_VERSION:=1.1.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b431ad7084e1055fef99a9115237edd8 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto xf86vidmodeproto - -include $(INCLUDE_DIR)/package.mk - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Package/libXxf86vm - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext - TITLE:=libXxf86vm - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/X11/extensions - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libXxf86vm/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXxf86vm)) diff --git a/Xorg/xorg/lib/libfontenc/Makefile b/Xorg/xorg/lib/libfontenc/Makefile deleted file mode 100644 index 99fdf869e..000000000 --- a/Xorg/xorg/lib/libfontenc/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libfontenc -PKG_RELEASE:=1 -PKG_VERSION:=1.0.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4f0d8191819be9f2bdf9dad49a65e43b - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libfontenc - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+zlib - TITLE:=libfontenc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \ - $(1)/usr/include/X11/fonts/ -endef - -define Package/libfontenc/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libfontenc)) diff --git a/Xorg/xorg/lib/libpciaccess/Makefile b/Xorg/xorg/lib/libpciaccess/Makefile deleted file mode 100644 index 54ac26db6..000000000 --- a/Xorg/xorg/lib/libpciaccess/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=libpciaccess -PKG_NAME:=libpciaccess -PKG_RELEASE:=1 -PKG_VERSION:=0.10.9 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=685cb20e7a6165bc010972f1183addbd - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - - -define Package/libpciaccess - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+pciutils - TITLE:=libpciaccess - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --with-pciids-path=/usr/share/pci.ids \ - , \ - ac_cv_file__usr_include_asm_mtrr_h=$(shell \ - test -f "$(TOOLCHAIN_DIR)/include/asm/mtrr.h" \ - && echo "yes" \ - || echo "no") \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/*.h \ - $(1)/usr/include - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libpciaccess.{so*,a,la} \ - $(1)/usr/lib/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libpciaccess/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libpciaccess.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libpciaccess)) diff --git a/Xorg/xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile deleted file mode 100644 index 9cdfeabb4..000000000 --- a/Xorg/xorg/lib/libxkbfile/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libxkbfile -PKG_RELEASE:=1 -PKG_VERSION:=1.0.6 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b01156e263eca8177e6b7f10441951c4 - -PKG_FIXUP:=libtool - -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=kbproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libxkbfile - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 - TITLE:=libxkbfile - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ - $(1)/usr/include/X11/extensions/ -endef - -define Package/libxkbfile/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libxkbfile)) diff --git a/Xorg/xorg/lib/xtrans/Makefile b/Xorg/xorg/lib/xtrans/Makefile deleted file mode 100644 index 2b44bc95e..000000000 --- a/Xorg/xorg/lib/xtrans/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xtrans -PKG_RELEASE:=1 -PKG_VERSION:=1.2.5 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=2d1e57e82acc5f21797e92341415af2f - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xtrans - SECTION:=xorg-libraries - CATEGORY:=Xorg - SUBMENU:=libraries - TITLE:=xtrans - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xtrans} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/X11/Xtrans/* \ - $(1)/usr/include/X11/Xtrans/ - - $(INSTALL_DIR) $(1)/usr/share/aclocal - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ - $(1)/usr/share/aclocal/ -endef - -$(eval $(call BuildPackage,xtrans)) diff --git a/Xorg/xorg/proto/applewmproto/Makefile b/Xorg/xorg/proto/applewmproto/Makefile deleted file mode 100644 index 921706bb1..000000000 --- a/Xorg/xorg/proto/applewmproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=applewmproto -PKG_VERSION:=1.4.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=76ca1c6e1d8904d2d885f81f7332eba6 - -include $(INCLUDE_DIR)/package.mk - -define Package/applewmproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=applewmproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,applewmproto)) diff --git a/Xorg/xorg/proto/bigreqsproto/Makefile b/Xorg/xorg/proto/bigreqsproto/Makefile deleted file mode 100644 index 710317086..000000000 --- a/Xorg/xorg/proto/bigreqsproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=bigreqsproto -PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=d30c5dbf19ca6dffcd9788227ecff8c5 - -include $(INCLUDE_DIR)/package.mk - -define Package/bigreqsproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=bigreqsproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,bigreqsproto)) diff --git a/Xorg/xorg/proto/calibrateproto/Makefile b/Xorg/xorg/proto/calibrateproto/Makefile deleted file mode 100644 index 40d812ea2..000000000 --- a/Xorg/xorg/proto/calibrateproto/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=calibrateproto -PKG_RELEASE:=1 -PKG_VERSION:=git - -include $(INCLUDE_DIR)/package.mk - -define Package/calibrateproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=calibrateproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Prepare -$(call Build/Prepare/Default) - $(CP) src/* $(PKG_BUILD_DIR) -endef - -define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE) $(MAKE_FLAGS) install -endef - -define Build/Compile - echo -endef - -$(eval $(call BuildPackage,calibrateproto)) diff --git a/Xorg/xorg/proto/calibrateproto/src/ChangeLog b/Xorg/xorg/proto/calibrateproto/src/ChangeLog deleted file mode 100644 index b36632c44..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2004-10-21 Daniel Stone - - * configure.ac: - * xcalibratewire.h: - Bump version to 0.1. diff --git a/Xorg/xorg/proto/calibrateproto/src/Makefile b/Xorg/xorg/proto/calibrateproto/src/Makefile deleted file mode 100644 index 35611b3ae..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/Makefile +++ /dev/null @@ -1,527 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -# -# Copyright © 2003 Philip Blundell -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of Philip Blundell not be used in -# advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Philip Blundell makes no -# representations about the suitability of this software for any purpose. It -# is provided "as is" without express or implied warranty. -# -# PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. -# - - - -pkgdatadir = $(datadir)/xcalibrateproto -pkglibdir = $(libdir)/xcalibrateproto -pkgincludedir = $(includedir)/xcalibrateproto -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = . -DIST_COMMON = $(XCalibrateinclude_HEADERS) $(am__configure_deps) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/xcalibrateproto.pc.in $(top_srcdir)/configure \ - ChangeLog install-sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = xcalibrateproto.pc -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(XCalibrateincludedir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgconfig_DATA) -XCalibrateincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(XCalibrateinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run aclocal-1.10 -AMTAR = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run tar -AUTOCONF = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoconf -AUTOHEADER = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoheader -AUTOMAKE = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run automake-1.10 -AWK = gawk -CYGPATH_W = echo -DEFS = -DPACKAGE_NAME=\"xcalibrateproto\" -DPACKAGE_TARNAME=\"xcalibrateproto\" -DPACKAGE_VERSION=\"0.1.0\" -DPACKAGE_STRING=\"xcalibrateproto\ 0.1.0\" -DPACKAGE_BUGREPORT=\"pb@nexus.co.uk\" -DPACKAGE=\"xcalibrateproto\" -DVERSION=\"0.1.0\" -ECHO_C = -ECHO_N = -n -ECHO_T = -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LIBOBJS = -LIBS = -LTLIBOBJS = -MAKEINFO = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run makeinfo -MKDIR_P = /bin/mkdir -p -PACKAGE = xcalibrateproto -PACKAGE_BUGREPORT = pb@nexus.co.uk -PACKAGE_NAME = xcalibrateproto -PACKAGE_STRING = xcalibrateproto 0.1.0 -PACKAGE_TARNAME = xcalibrateproto -PACKAGE_VERSION = 0.1.0 -PATH_SEPARATOR = : -SET_MAKE = -SHELL = /bin/sh -STRIP = -VERSION = 0.1.0 -abs_builddir = /var/src/owrt-X/build_dir/i386/calibrateproto-git -abs_srcdir = /var/src/owrt-X/build_dir/i386/calibrateproto-git -abs_top_builddir = /var/src/owrt-X/build_dir/i386/calibrateproto-git -abs_top_srcdir = /var/src/owrt-X/build_dir/i386/calibrateproto-git -am__leading_dot = . -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build_alias = -builddir = . -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -exec_prefix = ${prefix} -host_alias = -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = $(SHELL) /var/src/owrt-X/build_dir/i386/calibrateproto-git/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localedir = ${datarootdir}/locale -localstatedir = ${prefix}/var -mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /usr/local -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -srcdir = . -sysconfdir = ${prefix}/etc -target_alias = -top_builddir = . -top_srcdir = . -XCalibrateincludedir = $(includedir)/X11/extensions -XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xcalibrateproto.pc -EXTRA_DIST = autogen.sh xcalibrateproto.pc.in -all: all-am - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -xcalibrateproto.pc: $(top_builddir)/config.status $(srcdir)/xcalibrateproto.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done -install-XCalibrateincludeHEADERS: $(XCalibrateinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(XCalibrateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(XCalibrateincludedir)" - @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(XCalibrateincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ - $(XCalibrateincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ - done - -uninstall-XCalibrateincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-am -all-am: Makefile $(DATA) $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(XCalibrateincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-XCalibrateincludeHEADERS \ - install-pkgconfigDATA - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-XCalibrateincludeHEADERS \ - uninstall-pkgconfigDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-XCalibrateincludeHEADERS install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-XCalibrateincludeHEADERS uninstall-am \ - uninstall-pkgconfigDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/Xorg/xorg/proto/calibrateproto/src/Makefile.am b/Xorg/xorg/proto/calibrateproto/src/Makefile.am deleted file mode 100644 index 87bcd5850..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright © 2003 Philip Blundell -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of Philip Blundell not be used in -# advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Philip Blundell makes no -# representations about the suitability of this software for any purpose. It -# is provided "as is" without express or implied warranty. -# -# PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. -# - -XCalibrateincludedir = $(includedir)/X11/extensions -XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xcalibrateproto.pc - -EXTRA_DIST = autogen.sh xcalibrateproto.pc.in diff --git a/Xorg/xorg/proto/calibrateproto/src/Makefile.in b/Xorg/xorg/proto/calibrateproto/src/Makefile.in deleted file mode 100644 index 73a01dca7..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/Makefile.in +++ /dev/null @@ -1,527 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Copyright © 2003 Philip Blundell -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of Philip Blundell not be used in -# advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Philip Blundell makes no -# representations about the suitability of this software for any purpose. It -# is provided "as is" without express or implied warranty. -# -# PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. -# - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = . -DIST_COMMON = $(XCalibrateinclude_HEADERS) $(am__configure_deps) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/xcalibrateproto.pc.in $(top_srcdir)/configure \ - ChangeLog install-sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = xcalibrateproto.pc -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(XCalibrateincludedir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgconfig_DATA) -XCalibrateincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(XCalibrateinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -am__leading_dot = @am__leading_dot@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -XCalibrateincludedir = $(includedir)/X11/extensions -XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xcalibrateproto.pc -EXTRA_DIST = autogen.sh xcalibrateproto.pc.in -all: all-am - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -xcalibrateproto.pc: $(top_builddir)/config.status $(srcdir)/xcalibrateproto.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done -install-XCalibrateincludeHEADERS: $(XCalibrateinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(XCalibrateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(XCalibrateincludedir)" - @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(XCalibrateincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ - $(XCalibrateincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ - done - -uninstall-XCalibrateincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-am -all-am: Makefile $(DATA) $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(XCalibrateincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-XCalibrateincludeHEADERS \ - install-pkgconfigDATA - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-XCalibrateincludeHEADERS \ - uninstall-pkgconfigDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-XCalibrateincludeHEADERS install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-XCalibrateincludeHEADERS uninstall-am \ - uninstall-pkgconfigDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 b/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 deleted file mode 100644 index 29813443a..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 +++ /dev/null @@ -1,548 +0,0 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) - -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - diff --git a/Xorg/xorg/proto/calibrateproto/src/autogen.sh b/Xorg/xorg/proto/calibrateproto/src/autogen.sh deleted file mode 100755 index 904cd6746..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff --git a/Xorg/xorg/proto/calibrateproto/src/config.log b/Xorg/xorg/proto/calibrateproto/src/config.log deleted file mode 100644 index 3b696e241..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/config.log +++ /dev/null @@ -1,165 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by xcalibrateproto configure 0.1.0, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ ./configure --enable-maintainer-mode - -## --------- ## -## Platform. ## -## --------- ## - -hostname = blap -uname -m = i686 -uname -r = 2.6.22.5 -uname -s = Linux -uname -v = #12 Fri Aug 31 21:30:17 CEST 2007 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = i686 -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /usr/local/bin -PATH: /usr/bin -PATH: /bin -PATH: /usr/bin/X11 -PATH: /usr/games - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:1692: checking for a BSD-compatible install -configure:1748: result: /usr/bin/install -c -configure:1759: checking whether build environment is sane -configure:1802: result: yes -configure:1830: checking for a thread-safe mkdir -p -configure:1869: result: /bin/mkdir -p -configure:1882: checking for gawk -configure:1898: found /usr/bin/gawk -configure:1909: result: gawk -configure:1920: checking whether make sets $(MAKE) -configure:1941: result: yes -configure:2262: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by xcalibrateproto config.status 0.1.0, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on blap - -config.status:589: creating Makefile -config.status:589: creating xcalibrateproto.pc - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_path_install='/usr/bin/install -c' -ac_cv_path_mkdir=/bin/mkdir -ac_cv_prog_AWK=gawk -ac_cv_prog_make_make_set=yes - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ACLOCAL='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run aclocal-1.10' -AMTAR='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run tar' -AUTOCONF='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoconf' -AUTOHEADER='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoheader' -AUTOMAKE='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run automake-1.10' -AWK='gawk' -CYGPATH_W='echo' -DEFS='-DPACKAGE_NAME=\"xcalibrateproto\" -DPACKAGE_TARNAME=\"xcalibrateproto\" -DPACKAGE_VERSION=\"0.1.0\" -DPACKAGE_STRING=\"xcalibrateproto\ 0.1.0\" -DPACKAGE_BUGREPORT=\"pb@nexus.co.uk\" -DPACKAGE=\"xcalibrateproto\" -DVERSION=\"0.1.0\"' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' -LIBOBJS='' -LIBS='' -LTLIBOBJS='' -MAKEINFO='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run makeinfo' -PACKAGE='xcalibrateproto' -PACKAGE_BUGREPORT='pb@nexus.co.uk' -PACKAGE_NAME='xcalibrateproto' -PACKAGE_STRING='xcalibrateproto 0.1.0' -PACKAGE_TARNAME='xcalibrateproto' -PACKAGE_VERSION='0.1.0' -PATH_SEPARATOR=':' -SET_MAKE='' -SHELL='/bin/sh' -STRIP='' -VERSION='0.1.0' -am__isrc='' -am__leading_dot='.' -am__tar='${AMTAR} chof - "$$tardir"' -am__untar='${AMTAR} xf -' -bindir='${exec_prefix}/bin' -build_alias='' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -dvidir='${docdir}' -exec_prefix='${prefix}' -host_alias='' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${datarootdir}/info' -install_sh='$(SHELL) /var/src/owrt-X/build_dir/i386/calibrateproto-git/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -localedir='${datarootdir}/locale' -localstatedir='${prefix}/var' -mandir='${datarootdir}/man' -mkdir_p='/bin/mkdir -p' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr/local' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target_alias='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -#define PACKAGE_NAME "xcalibrateproto" -#define PACKAGE_TARNAME "xcalibrateproto" -#define PACKAGE_VERSION "0.1.0" -#define PACKAGE_STRING "xcalibrateproto 0.1.0" -#define PACKAGE_BUGREPORT "pb@nexus.co.uk" -#define PACKAGE "xcalibrateproto" -#define VERSION "0.1.0" - -configure: exit 0 diff --git a/Xorg/xorg/proto/calibrateproto/src/config.status b/Xorg/xorg/proto/calibrateproto/src/config.status deleted file mode 100755 index 8d863242e..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/config.status +++ /dev/null @@ -1,786 +0,0 @@ -#! /bin/sh -# Generated by configure. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/sh} -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by xcalibrateproto $as_me 0.1.0, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -# Files that config.status was made for. -config_files=" Makefile xcalibrateproto.pc" - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to ." - -ac_cs_version="\ -xcalibrateproto config.status 0.1.0 -configured by ./configure, generated by GNU Autoconf 2.61, - with options \"'--enable-maintainer-mode'\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='/var/src/owrt-X/build_dir/i386/calibrateproto-git' -srcdir='.' -INSTALL='/usr/bin/install -c' -MKDIR_P='/bin/mkdir -p' -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -if $ac_cs_recheck; then - echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--enable-maintainer-mode' $ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=/bin/sh - export CONFIG_SHELL - exec /bin/sh "./configure" '--enable-maintainer-mode' $ac_configure_extra_args --no-create --no-recursion -fi - -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "xcalibrateproto.pc") CONFIG_FILES="$CONFIG_FILES xcalibrateproto.pc" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -cat >"$tmp/subs-1.sed" <<\CEOF -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -s,@SHELL@,|#_!!_#|/bin/sh,g -s,@PATH_SEPARATOR@,|#_!!_#|:,g -s,@PACKAGE_NAME@,|#_!!_#|xcalibrateproto,g -s,@PACKAGE_TARNAME@,|#_!!_#|xcalibrateproto,g -s,@PACKAGE_VERSION@,|#_!!_#|0.1.0,g -s,@PACKAGE_STRING@,|#_!!_#|xcalibrateproto 0.1.0,g -s,@PACKAGE_BUGREPORT@,|#_!!_#|pb@|#_!!_#|nexus.co.uk,g -s,@exec_prefix@,|#_!!_#|${prefix},g -s,@prefix@,|#_!!_#|/usr/local,g -s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g -s,@bindir@,|#_!!_#|${exec_prefix}/bin,g -s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g -s,@libexecdir@,|#_!!_#|${exec_prefix}/libexec,g -s,@datarootdir@,|#_!!_#|${prefix}/share,g -s,@datadir@,|#_!!_#|${datarootdir},g -s,@sysconfdir@,|#_!!_#|${prefix}/etc,g -s,@sharedstatedir@,|#_!!_#|${prefix}/com,g -s,@localstatedir@,|#_!!_#|${prefix}/var,g -s,@includedir@,|#_!!_#|${prefix}/include,g -s,@oldincludedir@,|#_!!_#|/usr/include,g -s,@docdir@,|#_!!_#|${datarootdir}/doc/${PACKAGE_TARNAME},g -s,@infodir@,|#_!!_#|${datarootdir}/info,g -s,@htmldir@,|#_!!_#|${docdir},g -s,@dvidir@,|#_!!_#|${docdir},g -s,@pdfdir@,|#_!!_#|${docdir},g -s,@psdir@,|#_!!_#|${docdir},g -s,@libdir@,|#_!!_#|${exec_prefix}/lib,g -s,@localedir@,|#_!!_#|${datarootdir}/locale,g -s,@mandir@,|#_!!_#|${datarootdir}/man,g -s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"xcalibrateproto\\" -DPACKAGE_TARNAME=\\"xcalibrateproto\\" -DPACKAGE_VERSION=\\"0.1.0\\" -DPACKAGE_STRING=\\"xcalibrateproto\\ 0.1.0\\" -DPACKAGE_BUGREPORT=\\"pb@|#_!!_#|nexus.co.uk\\" -DPACKAGE=\\"xcalibrateproto\\" -DVERSION=\\"0.1.0\\",g -s,@ECHO_C@,|#_!!_#|,g -s,@ECHO_N@,|#_!!_#|-n,g -s,@ECHO_T@,|#_!!_#|,g -s,@LIBS@,|#_!!_#|,g -s,@build_alias@,|#_!!_#|,g -s,@host_alias@,|#_!!_#|,g -s,@target_alias@,|#_!!_#|,g -s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g -s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g -s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g -s,@am__isrc@,|#_!!_#|,g -s,@CYGPATH_W@,|#_!!_#|echo,g -s,@PACKAGE@,|#_!!_#|xcalibrateproto,g -s,@VERSION@,|#_!!_#|0.1.0,g -s,@ACLOCAL@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run aclocal-1.10,g -s,@AUTOCONF@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoconf,g -s,@AUTOMAKE@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run automake-1.10,g -s,@AUTOHEADER@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoheader,g -s,@MAKEINFO@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run makeinfo,g -s,@install_sh@,|#_!!_#|$(SHELL) /var/src/owrt-X/build_dir/i386/calibrateproto-git/install-sh,g -s,@STRIP@,|#_!!_#|,g -s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g -s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g -s,@AWK@,|#_!!_#|gawk,g -s,@SET_MAKE@,|#_!!_#|,g -s,@am__leading_dot@,|#_!!_#|.,g -s,@AMTAR@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run tar,g -s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g -s,@am__untar@,|#_!!_#|${AMTAR} xf -,g -s,@LIBOBJS@,|#_!!_#|,g -s,@LTLIBOBJS@,|#_!!_#|,g -:end -s/|#_!!_#|//g -CEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - ac_datarootdir_hack=' - s&@datadir@&${datarootdir}&g - s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g - s&@infodir@&${datarootdir}/info&g - s&@localedir@&${datarootdir}/locale&g - s&@mandir@&${datarootdir}/man&g - s&\${datarootdir}&${prefix}/share&g' ;; -esac - sed "/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -} - -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - - - - esac - -done # for ac_tag - - -{ (exit 0); exit 0; } diff --git a/Xorg/xorg/proto/calibrateproto/src/configure b/Xorg/xorg/proto/calibrateproto/src/configure deleted file mode 100755 index d1f2c773c..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/configure +++ /dev/null @@ -1,3163 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for xcalibrateproto 0.1.0. -# -# Report bugs to . -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME='xcalibrateproto' -PACKAGE_TARNAME='xcalibrateproto' -PACKAGE_VERSION='0.1.0' -PACKAGE_STRING='xcalibrateproto 0.1.0' -PACKAGE_BUGREPORT='pb@nexus.co.uk' - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures xcalibrateproto 0.1.0 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/xcalibrateproto] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of xcalibrateproto 0.1.0:";; - esac - cat <<\_ACEOF - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -xcalibrateproto configure 0.1.0 -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by xcalibrateproto $as_me 0.1.0, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -am__api_version='1.10' - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - SET_MAKE= -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='xcalibrateproto' - VERSION='0.1.0' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - -ac_config_files="$ac_config_files Makefile xcalibrateproto.pc" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by xcalibrateproto $as_me 0.1.0, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -xcalibrateproto config.status 0.1.0 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "xcalibrateproto.pc") CONFIG_FILES="$CONFIG_FILES xcalibrateproto.pc" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - - - - esac - -done # for ac_tag - - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - diff --git a/Xorg/xorg/proto/calibrateproto/src/configure.ac b/Xorg/xorg/proto/calibrateproto/src/configure.ac deleted file mode 100644 index eb410726d..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/configure.ac +++ /dev/null @@ -1,6 +0,0 @@ -AC_PREREQ([2.59]) -AC_INIT([xcalibrateproto], [0.1.0], [pb@nexus.co.uk]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) - -AC_OUTPUT([Makefile - xcalibrateproto.pc]) diff --git a/Xorg/xorg/proto/calibrateproto/src/install-sh b/Xorg/xorg/proto/calibrateproto/src/install-sh deleted file mode 100755 index 4fbbae7b7..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/install-sh +++ /dev/null @@ -1,507 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2006-10-14.15 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -posix_glob= -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chmodcmd=$chmodprog -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - shift - shift - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac -done - -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; - esac - - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac - - oIFS=$IFS - IFS=/ - $posix_glob && set -f - set fnord $dstdir - shift - $posix_glob && set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Xorg/xorg/proto/calibrateproto/src/missing b/Xorg/xorg/proto/calibrateproto/src/missing deleted file mode 100755 index 1c8ff7049..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/missing +++ /dev/null @@ -1,367 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2006-05-10.23 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h deleted file mode 100644 index 9a174a4c4..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * $Id: xcalibrateproto.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $ - * - * Copyright © 2003 Philip Blundell - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Philip Blundell not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Philip Blundell makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef XCALIBRATEPROTO_H -#define XCALIBRATEPROTO_H - -/* - * requests and replies - */ -typedef struct { - CARD8 reqType; - CARD8 xCalibrateReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; -} xXCalibrateQueryVersionReq; - -#define sz_xXCalibrateQueryVersionReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xXCalibrateQueryVersionReply; - -#define sz_xXCalibrateQueryVersionReply 32 - -typedef struct { - CARD8 reqType; - CARD8 xCalibrateReqType; - CARD16 length B16; - CARD16 on B16; - CARD16 pad B16; -} xXCalibrateRawModeReq; - -#define sz_xXCalibrateRawModeReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 status; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; -} xXCalibrateRawModeReply; - -#define sz_xXCalibrateRawModeReply 32 - -/* Events */ - -typedef struct { - CARD8 type; - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD16 x; - CARD16 y; - CARD16 pressure; - CARD16 pad2; -} xXCalibrateRawTouchscreenEvent; - -#define sz_xXCalibrateRawTouchscreenEvent 12 - -#endif diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc deleted file mode 100644 index 5dde3ef6b..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc +++ /dev/null @@ -1,9 +0,0 @@ -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: XCalibrate -Description: XCalibrate extension headers -Version: 0.1.0 -Cflags: -I${includedir} diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in deleted file mode 100644 index f17f8d79e..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: XCalibrate -Description: XCalibrate extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h b/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h deleted file mode 100644 index a5b1aeccb..000000000 --- a/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * $Id: xcalibratewire.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $ - * - * Copyright © 2003 Philip Blundell - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Philip Blundell not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Philip Blundell makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef XCALIBRATEWIRE_H -#define XCALIBRATEWIRE_H - -#define XCALIBRATE_MAJOR_VERSION 0 -#define XCALIBRATE_MINOR_VERSION 0 -#define XCALIBRATE_NAME "XCALIBRATE" - -#define X_XCalibrateQueryVersion 0 -#define X_XCalibrateRawMode 1 - -#define XCalibrateNumberRequests (X_XCalibrateSetRawMode + 1) - -#define X_XCalibrateRawTouchscreen 0 - -#define XCalibrateNumberEvents (X_XCalibrateRawTouchscreen + 1) - -#define XCalibrateNumberErrors 0 - -#endif diff --git a/Xorg/xorg/proto/compositeproto/Makefile b/Xorg/xorg/proto/compositeproto/Makefile deleted file mode 100644 index b922b5bc9..000000000 --- a/Xorg/xorg/proto/compositeproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=compositeproto -PKG_VERSION:=0.4.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=3692f3f8b2ea10dff3d2cede8dc65e79 - -include $(INCLUDE_DIR)/package.mk - -define Package/compositeproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=compositeproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,compositeproto)) diff --git a/Xorg/xorg/proto/damageproto/Makefile b/Xorg/xorg/proto/damageproto/Makefile deleted file mode 100644 index d6cef0477..000000000 --- a/Xorg/xorg/proto/damageproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=damageproto -PKG_VERSION:=1.2.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=434b931b02bd83ed9fc44951df81cdac - -include $(INCLUDE_DIR)/package.mk - -define Package/damageproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=damageproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,damageproto)) diff --git a/Xorg/xorg/proto/dmxproto/Makefile b/Xorg/xorg/proto/dmxproto/Makefile deleted file mode 100644 index 541e50ccb..000000000 --- a/Xorg/xorg/proto/dmxproto/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dmxproto -PKG_RELEASE:=1 -PKG_VERSION:=2.3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=880a41720b2937e2660dcdc0d34a8791 - -include $(INCLUDE_DIR)/package.mk - -define Package/dmxproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=dmxproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,dmxproto)) diff --git a/Xorg/xorg/proto/dri2proto/Makefile b/Xorg/xorg/proto/dri2proto/Makefile deleted file mode 100644 index e173ad731..000000000 --- a/Xorg/xorg/proto/dri2proto/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dri2proto -PKG_VERSION:=2.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=5cb7987d29db068153bdc8f23c767c43 - -include $(INCLUDE_DIR)/package.mk - -define Package/dri2proto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - TITLE:=dri2proto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,dri2proto)) diff --git a/Xorg/xorg/proto/fixesproto/Makefile b/Xorg/xorg/proto/fixesproto/Makefile deleted file mode 100644 index 48c21647e..000000000 --- a/Xorg/xorg/proto/fixesproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fixesproto -PKG_VERSION:=4.1.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4c1cb4f2ed9f34de59f2f04783ca9483 - -include $(INCLUDE_DIR)/package.mk - -define Package/fixesproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=fixesproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,fixesproto)) diff --git a/Xorg/xorg/proto/fontcacheproto/Makefile b/Xorg/xorg/proto/fontcacheproto/Makefile deleted file mode 100644 index b2921f542..000000000 --- a/Xorg/xorg/proto/fontcacheproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fontcacheproto -PKG_VERSION:=0.1.3 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=a8a50e5e995bfacb0359575faf7f6906 - -include $(INCLUDE_DIR)/package.mk - -define Package/fontcacheproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=fontcacheproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,fontcacheproto)) diff --git a/Xorg/xorg/proto/fontsproto/Makefile b/Xorg/xorg/proto/fontsproto/Makefile deleted file mode 100644 index 6592eec73..000000000 --- a/Xorg/xorg/proto/fontsproto/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fontsproto -PKG_RELEASE:=1 -PKG_VERSION:=2.1.0 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=f3a857deadca3144fba041af1dbf7603 - -include $(INCLUDE_DIR)/package.mk - -define Package/fontsproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=fontsproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,fontsproto)) diff --git a/Xorg/xorg/proto/glproto/Makefile b/Xorg/xorg/proto/glproto/Makefile deleted file mode 100644 index 8e40489fd..000000000 --- a/Xorg/xorg/proto/glproto/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_NAME:=glproto -PKG_VERSION:=1.4.10 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=c9f8cebfba72bfab674bc0170551fb8d - -include $(INCLUDE_DIR)/package.mk - -define Package/glproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=glproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,glproto)) diff --git a/Xorg/xorg/proto/inputproto/Makefile b/Xorg/xorg/proto/inputproto/Makefile deleted file mode 100644 index 686c2c6e7..000000000 --- a/Xorg/xorg/proto/inputproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=inputproto -PKG_VERSION:=2.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=0f7acbc14a082f9ae03744396527d23d - -include $(INCLUDE_DIR)/package.mk - -define Package/inputproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=inputproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,inputproto)) diff --git a/Xorg/xorg/proto/kbproto/Makefile b/Xorg/xorg/proto/kbproto/Makefile deleted file mode 100644 index 54c71f8d9..000000000 --- a/Xorg/xorg/proto/kbproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=kbproto -PKG_VERSION:=1.0.4 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7f439166a9b2bf81471a33951883019f - -include $(INCLUDE_DIR)/package.mk - -define Package/kbproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=kbproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,kbproto)) diff --git a/Xorg/xorg/proto/printproto/Makefile b/Xorg/xorg/proto/printproto/Makefile deleted file mode 100644 index f6faa5ed4..000000000 --- a/Xorg/xorg/proto/printproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=printproto -PKG_VERSION:=1.0.4 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7321847a60748b4d2f1fa16db4b6ede8 - -include $(INCLUDE_DIR)/package.mk - -define Package/printproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=printproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,printproto)) diff --git a/Xorg/xorg/proto/randrproto/Makefile b/Xorg/xorg/proto/randrproto/Makefile deleted file mode 100644 index a5a576361..000000000 --- a/Xorg/xorg/proto/randrproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=randrproto -PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=a5c244c36382b0de39b2828cea4b651d - -include $(INCLUDE_DIR)/package.mk - -define Package/randrproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=randrproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,randrproto)) diff --git a/Xorg/xorg/proto/recordproto/Makefile b/Xorg/xorg/proto/recordproto/Makefile deleted file mode 100644 index 487e0a3f9..000000000 --- a/Xorg/xorg/proto/recordproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=recordproto -PKG_VERSION:=1.14 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=70f5998c673aa510e2acd6d8fb3799de - -include $(INCLUDE_DIR)/package.mk - -define Package/recordproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=recordproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,recordproto)) diff --git a/Xorg/xorg/proto/renderproto/Makefile b/Xorg/xorg/proto/renderproto/Makefile deleted file mode 100644 index a7be89b87..000000000 --- a/Xorg/xorg/proto/renderproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=renderproto -PKG_VERSION:=0.11 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b160a9733fe91b666e74fca284333148 - -include $(INCLUDE_DIR)/package.mk - -define Package/renderproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=renderproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,renderproto)) diff --git a/Xorg/xorg/proto/resourceproto/Makefile b/Xorg/xorg/proto/resourceproto/Makefile deleted file mode 100644 index ec35485bf..000000000 --- a/Xorg/xorg/proto/resourceproto/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_NAME:=resourceproto -PKG_RELEASE:=1 -PKG_VERSION:=1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ - -include $(INCLUDE_DIR)/package.mk - -define Package/resourceproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=resourceproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,resourceproto)) diff --git a/Xorg/xorg/proto/scrnsaverproto/Makefile b/Xorg/xorg/proto/scrnsaverproto/Makefile deleted file mode 100644 index 545fda7e5..000000000 --- a/Xorg/xorg/proto/scrnsaverproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=scrnsaverproto -PKG_VERSION:=1.2.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=9040c991a56ee9b5976936f8c65d5c8a - -include $(INCLUDE_DIR)/package.mk - -define Package/scrnsaverproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=scrnsaverproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,scrnsaverproto)) diff --git a/Xorg/xorg/proto/videoproto/Makefile b/Xorg/xorg/proto/videoproto/Makefile deleted file mode 100644 index f934c8c53..000000000 --- a/Xorg/xorg/proto/videoproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=videoproto -PKG_VERSION:=2.3.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=fb762146a18207a1e8bc9f299dfc7ac0 - -include $(INCLUDE_DIR)/package.mk - -define Package/videoproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=videoproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,videoproto)) diff --git a/Xorg/xorg/proto/windowswmproto/Makefile b/Xorg/xorg/proto/windowswmproto/Makefile deleted file mode 100644 index b028be0f0..000000000 --- a/Xorg/xorg/proto/windowswmproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=windowswmproto -PKG_RELEASE:=1 -PKG_VERSION:=1.0.4 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=e74b2ff3172a6117f2a62b655ef99064 - -include $(INCLUDE_DIR)/package.mk - -define Package/windowswmproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=windowswmproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,windowswmproto)) diff --git a/Xorg/xorg/proto/xcmiscproto/Makefile b/Xorg/xorg/proto/xcmiscproto/Makefile deleted file mode 100644 index 92b66a690..000000000 --- a/Xorg/xorg/proto/xcmiscproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xcmiscproto -PKG_VERSION:=1.2.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7b83e4a7e9f4edc9c6cfb0500f4a7196 - -include $(INCLUDE_DIR)/package.mk - -define Package/xcmiscproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xcmiscproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xcmiscproto)) diff --git a/Xorg/xorg/proto/xextproto/Makefile b/Xorg/xorg/proto/xextproto/Makefile deleted file mode 100644 index e4e13f48a..000000000 --- a/Xorg/xorg/proto/xextproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xextproto -PKG_RELEASE:=1 -PKG_VERSION:=7.1.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=fb6ccaae76db7a35e49b12aea60ca6ff - -include $(INCLUDE_DIR)/package.mk - -define Package/xextproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xextproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xextproto)) diff --git a/Xorg/xorg/proto/xf86bigfontproto/Makefile b/Xorg/xorg/proto/xf86bigfontproto/Makefile deleted file mode 100644 index 008740408..000000000 --- a/Xorg/xorg/proto/xf86bigfontproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86bigfontproto -PKG_VERSION:=1.2.0 -PKG_RELEASE:=3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=120e226ede5a4687b25dd357cc9b8efe - -include $(INCLUDE_DIR)/package.mk - -define Package/xf86bigfontproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xf86bigfontproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xf86bigfontproto)) diff --git a/Xorg/xorg/proto/xf86dgaproto/Makefile b/Xorg/xorg/proto/xf86dgaproto/Makefile deleted file mode 100644 index 443025345..000000000 --- a/Xorg/xorg/proto/xf86dgaproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86dgaproto -PKG_VERSION:=2.1 -PKG_RELEASE:=3 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=a036dc2fcbf052ec10621fd48b68dbb1 - -include $(INCLUDE_DIR)/package.mk - -define Package/xf86dgaproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xf86dgaproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xf86dgaproto)) diff --git a/Xorg/xorg/proto/xf86driproto/Makefile b/Xorg/xorg/proto/xf86driproto/Makefile deleted file mode 100644 index 3fd3f0709..000000000 --- a/Xorg/xorg/proto/xf86driproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86driproto -PKG_VERSION:=2.1.0 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=309d552732666c3333d7dc63e80d042f - -include $(INCLUDE_DIR)/package.mk - -define Package/xf86driproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xf86driproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xf86driproto)) diff --git a/Xorg/xorg/proto/xf86vidmodeproto/Makefile b/Xorg/xorg/proto/xf86vidmodeproto/Makefile deleted file mode 100644 index cdccb7189..000000000 --- a/Xorg/xorg/proto/xf86vidmodeproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xf86vidmodeproto -PKG_VERSION:=2.3 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4434894fc7d4eeb4a22e6b876d56fdaa - -include $(INCLUDE_DIR)/package.mk - -define Package/xf86vidmodeproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xf86vidmodeproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xf86vidmodeproto)) diff --git a/Xorg/xorg/proto/xineramaproto/Makefile b/Xorg/xorg/proto/xineramaproto/Makefile deleted file mode 100644 index d37c6fae1..000000000 --- a/Xorg/xorg/proto/xineramaproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xineramaproto -PKG_VERSION:=1.2 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=a8aadcb281b9c11a91303e24cdea45f5 - -include $(INCLUDE_DIR)/package.mk - -define Package/xineramaproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xineramaproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xineramaproto)) diff --git a/Xorg/xorg/proto/xproto/Makefile b/Xorg/xorg/proto/xproto/Makefile deleted file mode 100644 index fb974989c..000000000 --- a/Xorg/xorg/proto/xproto/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xproto -PKG_VERSION:=7.0.16 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=75c9edff1f3823e5ab6bb9e66821a901 - -include $(INCLUDE_DIR)/package.mk - -define Package/xproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xproto)) diff --git a/Xorg/xorg/xserver/xorg-kdrive/Config.in b/Xorg/xorg/xserver/xorg-kdrive/Config.in deleted file mode 100644 index 1644e0602..000000000 --- a/Xorg/xorg/xserver/xorg-kdrive/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -menu "kdrive library support" -depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev || PACKAGE_xserver-kdrive-xglamo || PACKAGE_xserver-kdrive-xephyr - - config X_TSLIB - bool - prompt "enable support for tslib" - -# config X_XCALIBRATE -# bool -# prompt "enable support for xcalibrate" - -# config X_DRI -# bool -# prompt "enable support for DRI" - - config X_COMPOSITE - bool - prompt "enable support for composite" - - config X_XINERAMA - bool - prompt "enable support for xinerama" - -# config X_GLX -# bool -# prompt "enable support for GLX" - -endmenu diff --git a/Xorg/xorg/xserver/xorg-kdrive/Makefile b/Xorg/xorg/xserver/xorg-kdrive/Makefile deleted file mode 100644 index 2712d482e..000000000 --- a/Xorg/xorg/xserver/xorg-kdrive/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xserver-kdrive -PKG_VERSION:=1.7.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/ -PKG_SOURCE:=xorg-server-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)/xorg-server-$(PKG_VERSION)/ -PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1 - -PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \ - xextproto xproto bigreqsproto resourceproto \ - fontsproto inputproto kbproto videoproto resourceproto \ - xf86dgaproto xtrans xf86driproto calibrateproto \ - compositeproto xineramaproto - -PKG_CONFIG_DEPENDS := \ - CONFIG_PACKAGE-xserver-kdrive-fbdev \ - CONFIG_PACKAGE_xserver-kdrive-xephyr \ - CONFIG_X_TSLIB CONFIG_X_COMPOSITE \ - CONFIG_X_XINERAMA CONFIG_X_XCALIBRATE - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -include $(INCLUDE_DIR)/package.mk - -define Package/xserver-kdrive/Default - PROVIDES:=xserver - SECTION:=xorg-server - CATEGORY:=Xorg - SUBMENU:=server - URL:=http://xorg.freedesktop.org/ - DEPENDS:=@!avr32 \ - +xserver-common \ - +libpthread \ - +libxkbfile \ - +libXfont \ - +libXau \ - +libXv \ - +libfontenc \ - +pixman \ - +libopenssl \ - +libdrm \ - +xkbcomp \ - +xkbdata \ - @DISPLAY_SUPPORT \ - +X_TSLIB:tslib -endef - -define Package/xserver-kdrive-xfbdev -$(call Package/xserver-kdrive/Default) - TITLE:=Kdrive framebuffer xserver -endef - -define Package/xserver-kdrive-xephyr -$(call Package/xserver-kdrive/Default) - TITLE:=Kdrive ephyr xserver - DEPENDS += @BROKEN -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-kdrive \ - $(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \ - --enable-xfbdev, \ - --disable-xfbdev) \ - $(if $(CONFIG_PACKAGE_xserver-kdrive-xephyr), \ - --enable-xephyr, \ - --disable-xephyr) \ - $(if $(CONFIG_X_TSLIB),--enable-tslib,--disable-tslib) \ - $(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \ - $(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \ - $(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-unit-tests \ - --disable-builddocs \ - --disable-glx-tls \ - --disable-shm \ - --disable-xres \ - --disable-record \ - --enable-xv \ - --enable-xvmc \ - --disable-dga \ - --disable-screensaver \ - --disable-xdmcp \ - --disable-xdm-auth-1 \ - --disable-glx \ - --enable-dri \ - --disable-dri2 \ - --disable-xf86vidmode \ - --disable-xace \ - --disable-xselinux \ - --disable-xsecurity \ - --disable-multibuffer \ - --disable-dbe \ - --disable-xf86bigfont \ - --enable-dpms \ - --disable-config-dbus \ - --disable-config-hal \ - --disable-xfree86-utils \ - --disable-xaa \ - --enable-vgahw \ - --disable-vbe \ - --enable-int10-module \ - --disable-xorg \ - --disable-dmx \ - --disable-xvfb \ - --disable-xnest \ - --disable-xquartz \ - --disable-standalone-xpbproxy \ - --disable-xwin \ - --disable-xfake \ - --disable-installsetuid \ - --disable-secure-rpc \ - --enable-silent-rules \ - --disable-shave \ - --disable-xsdl \ - ) -endef - -define Package/xserver-kdrive-xfbdev/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/Xfbdev \ - $(1)/usr/bin/ -endef - -define Package/xserver-kdrive-xephyr/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/Xephyr \ - $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,xserver-kdrive-xfbdev)) -$(eval $(call BuildPackage,xserver-kdrive-xephyr)) diff --git a/Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch b/Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch deleted file mode 100644 index 24414414f..000000000 --- a/Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- tslib-1.0/configure.orig 2008-10-05 14:13:43.000000000 +0200 -+++ tslib-1.0/configure 2008-10-05 14:14:35.000000000 +0200 -@@ -38587,12 +38587,12 @@ - pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-0.0" 2>/dev/null` -+ pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-1.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -38603,12 +38603,12 @@ - pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-0.0" 2>/dev/null` -+ pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-1.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -38626,9 +38626,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1` -+ TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-1.0" 2>&1` - else -- TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1` -+ TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-1.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$TSLIB_PKG_ERRORS" >&5 diff --git a/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch b/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch deleted file mode 100644 index f7b3e0268..000000000 --- a/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- xorg-server-1.5.1/hw/kdrive/src/kmode.c.orig 2007-10-23 23:26:50.000000000 +0200 -+++ xorg-server-1.5.1/hw/kdrive/src/kmode.c 2008-10-05 14:55:24.000000000 +0200 -@@ -78,6 +78,12 @@ - 16, 48, 160, KdSyncNegative, /* 31.469 */ - 10, 33, 45, KdSyncNegative, /* 59.940 */ - }, -+ -+ /* 480x640 modes */ -+ { 480, 640, 60, 0, /* VESA */ -+ 0, 0, 0, KdSyncNegative, /* 31.469 */ -+ 0, 0, 0, KdSyncNegative, /* 59.940 */ -+ }, - - /* 800x600 modes */ - { 800, 600, 85, 56250, /* VESA */ -@@ -102,6 +108,10 @@ const KdMonitorTiming kdMonitorTimings[] = { - 24, 128, 224, KdSyncPositive, /* 35.156 */ - 1, 22, 25, KdSyncPositive, /* 56.250 */ - }, -+ { 600, 800, 56, 36000, /* VESA */ -+ 24, 128, 224, KdSyncPositive, /* 35.156 */ -+ 1, 22, 25, KdSyncPositive, /* 56.250 */ -+ }, - - /* 1024x768 modes */ - { 1024, 768, 85, 94500, /* VESA */ diff --git a/Xorg/xorg/xserver/xorg-server/Config.in b/Xorg/xorg/xserver/xorg-server/Config.in deleted file mode 100644 index 1644e0602..000000000 --- a/Xorg/xorg/xserver/xorg-server/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -menu "kdrive library support" -depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev || PACKAGE_xserver-kdrive-xglamo || PACKAGE_xserver-kdrive-xephyr - - config X_TSLIB - bool - prompt "enable support for tslib" - -# config X_XCALIBRATE -# bool -# prompt "enable support for xcalibrate" - -# config X_DRI -# bool -# prompt "enable support for DRI" - - config X_COMPOSITE - bool - prompt "enable support for composite" - - config X_XINERAMA - bool - prompt "enable support for xinerama" - -# config X_GLX -# bool -# prompt "enable support for GLX" - -endmenu diff --git a/Xorg/xorg/xserver/xorg-server/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile deleted file mode 100644 index 4b57d0a8f..000000000 --- a/Xorg/xorg/xserver/xorg-server/Makefile +++ /dev/null @@ -1,193 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xorg-server -PKG_VERSION:=1.7.1 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \ - xextproto xproto scrnsaverproto bigreqsproto resourceproto \ - fontsproto inputproto kbproto videoproto resourceproto \ - compositeproto xf86dgaproto xtrans xf86driproto dri2proto - -PKG_INSTALL:=1 -PKG_FIXUP:=libtool -PKG_BUILD_PARALLEL:=1 - -PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_xserver-xorg CONFIG_PACKAGE_xserver-common - -include $(INCLUDE_DIR)/package.mk - -X_CONFIG=generic -ifeq ($(CONFIG_TARGET_olpc),y) - X_CONFIG=olpc -endif -ifeq ($(CONFIG_TARGET_s3c24xx),y) - X_CONFIG=om_gta02 -endif -ifeq ($(CONFIG_TARGET_omap24xx_n810-gui),y) - X_CONFIG=nokia_n810 -endif - -define Package/xorg/Default - SECTION:=xorg-server - CATEGORY:=Xorg - SUBMENU:=server - DEPENDS:=@!avr32 - URL:=http://xorg.freedesktop.org/ -endef - -define Package/xserver-xorg -$(call Package/xorg/Default) - PROVIDES:=xserver - TITLE:=Xorg xserver - DEPENDS:=+xserver-common \ - +libpthread \ - +xkbcomp \ - +libxkbfile \ - +libXfont \ - +libXau \ - +libXv \ - +libfontenc \ - +pixman \ - +libopenssl \ - +libpciaccess \ - +libdrm \ - +libgl-mesa \ - @DISPLAY_SUPPORT -endef - -define Package/xserver-common -$(call Package/xorg/Default) - TITLE:=meta-package -endef - -EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/Configure - $(call Build/Configure/Default, \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-unit-tests \ - --disable-builddocs \ - --disable-glx-tls \ - --disable-composite \ - --disable-shm \ - --disable-xres \ - --disable-record \ - --enable-xv \ - --enable-xvmc \ - --disable-dga \ - --disable-screensaver \ - --disable-xdmcp \ - --disable-xdm-auth-1 \ - --disable-glx \ - --enable-dri \ - --enable-dri2 \ - --disable-xinerama \ - --disable-xf86vidmode \ - --disable-xace \ - --disable-xselinux \ - --disable-xsecurity \ - --disable-xcalibrate \ - --disable-tslib \ - --disable-multibuffer \ - --disable-dbe \ - --disable-xf86bigfont \ - --enable-dpms \ - --disable-config-dbus \ - --disable-config-hal \ - --disable-xfree86-utils \ - --disable-xaa \ - --enable-vgahw \ - --disable-vbe \ - --enable-int10-module \ - --enable-xorg \ - --disable-dmx \ - --disable-xvfb \ - --disable-xnest \ - --disable-xquartz \ - --disable-standalone-xpbproxy \ - --disable-xwin \ - --disable-kdrive \ - --disable-xfake \ - --disable-xfbdev \ - --disable-installsetuid \ - --disable-secure-rpc \ - --enable-silent-rules \ - --disable-shave \ - ) -endef - -define Package/xserver-common/install - $(INSTALL_DIR) $(1)/etc/{init.d,config,X11} - $(INSTALL_BIN) \ - ./files/x.init \ - $(1)/etc/init.d/x11 - $(INSTALL_DATA) ./files/tmp/x11.uci \ - $(1)/etc/config/x11 - test -f ./files/config.xorg/$(X_CONFIG) && \ - $(INSTALL_DATA) \ - ./files/config.xorg/$(X_CONFIG) \ - $(1)/etc/X11/xorg.conf -# test -f ./files/config.uci/$(X_CONFIG) && \ -# $(INSTALL_DATA) \ -# ./files/config.uci/$(X_CONFIG) \ -# $(1)/etc/config/x11 -endef - -define Package/xserver-xorg/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/Xorg \ - $(1)/usr/bin/ - - $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/*.so \ - $(1)/usr/lib/xorg/modules/ - - $(foreach d,extensions fonts linux multimedia, \ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/$(d)/*.so \ - $(1)/usr/lib/xorg/modules/$(d)/; \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/share/aclocal/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ - $(1)/usr/share/aclocal/ - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ - - $(if $(CONFIG_PACKAGE_xserver-xorg), \ - $(INSTALL_DIR) $(1)/usr/include/xorg; \ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/xorg/*.h \ - $(1)/usr/include/xorg/; \ - ) - $(INSTALL_DIR) $(1)/mk - $(INSTALL_DATA) \ - ./files/xorg-driver.mk \ - $(1)/mk/ - $(SED) 's,@VERSION@,$(PKG_VERSION),' $(1)/mk/xorg-driver.mk -endef - -$(eval $(call BuildPackage,xserver-common)) -$(eval $(call BuildPackage,xserver-xorg)) diff --git a/Xorg/xorg/xserver/xorg-server/files/config.uci/generic b/Xorg/xorg/xserver/xorg-server/files/config.uci/generic deleted file mode 100644 index da66f6616..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.uci/generic +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config screen - option resolution 800x600 - option dpi 285 - -config graphic - option device /dev/fb0 - -config input mouse - option device /dev/psaux - option driver mouse - -config input keybd - option driver keyboard - -config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc b/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc deleted file mode 100644 index 49b7f2ddb..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config screen - option resolution 1200x900 - option dpi 285 - -config graphic - option device /dev/fb0 - -config input mouse - option device /dev/event1 - option driver tslib - -config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 deleted file mode 100644 index 296599f91..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config screen - option resolution 480x640 - option dpi 285 - -config graphic - option device /dev/fb0 - -config input mouse - option device /dev/event1 - option driver tslib - -config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic b/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic deleted file mode 100644 index d9db82f6f..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic +++ /dev/null @@ -1,64 +0,0 @@ -# xorg configuration - -Section "ServerLayout" - Identifier "Default Layout" - Screen 0 "Screen0" 0 0 - InputDevice "Mouse0" "CorePointer" - InputDevice "Mouse1" "CorePointer" - InputDevice "Keyboard0" "CoreKeyboard" -EndSection - -Section "Module" - Load "dbe" - Load "extmod" - Load "fbdevhw" -# Load "glx" - Load "record" - Load "freetype" - Load "type1" -EndSection - -Section "InputDevice" - Identifier "Keyboard0" - Driver "keyboard" -EndSection - -Section "InputDevice" - Identifier "Mouse0" - Driver "mouse" - Option "Protocol" "PS/2" - Option "Device" "/dev/psaux" -EndSection - -Section "InputDevice" - Identifier "Mouse1" - Driver "mouse" - Option "Protocol" "IMPS/2" - Option "Device" "/dev/input/mice" -EndSection - -Section "Monitor" - Identifier "Monitor0" - VendorName "Monitor Vendor" - ModelName "OWRT" - Option "dpms" -EndSection - -Section "Device" - Identifier "Videocard0" - Driver "vesa" - VendorName "Videocard vendor" - BoardName "Vesa driver" -EndSection - -Section "Device" - Identifier "FBDev" - Driver "fbdev" -EndSection - -Section "Screen" - Identifier "Screen0" - Device "Videocard0" - Monitor "Monitor0" -EndSection - diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 b/Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 deleted file mode 100644 index 27f24306c..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 +++ /dev/null @@ -1,43 +0,0 @@ -Section "InputDevice" - Identifier "SlideKeyboard" - Driver "kbd" - Option "XkbRules" "evdev" - Option "XkbModel" "pc105" - Option "XkbLayout" "nokia_vndr/rx-44" - Option "XkbVariant" "de" - Option "XkbOptions" "lv3:ralt_switch" -EndSection - -Section "InputDevice" - Identifier "Touchscreen" - Driver "tslib" - Option "CorePointer" "true" - Option "SendCoreEvents" "true" - Option "Device" "/dev/input/event1" - Option "Protocol" "Auto" - Option "Width" "800" - Option "Height" "480" -EndSection - -Section "Monitor" - Identifier "InternalLCD" -EndSection - -Section "Device" - Identifier "FramebufferDevice" - Driver "omapfb" - Option "fb" "/dev/fb0" -EndSection - -Section "Screen" - Identifier "InternalScreen" - Device "FramebufferDevice" - Monitor "InternalLCD" -EndSection - -Section "ServerLayout" - Identifier "DefaultLayout" - Screen "InternalScreen" - InputDevice "Touchscreen" "CorePointer" - InputDevice "SlideKeyboard" "CoreKeyboard" -EndSection diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc b/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc deleted file mode 100644 index 0bbb1ae67..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc +++ /dev/null @@ -1,78 +0,0 @@ -# xorg configuration - -Section "ServerLayout" - Identifier "Default Layout" - Screen 0 "Screen0" 0 0 - InputDevice "Mouse0" "CorePointer" - InputDevice "Keyboard0" "CoreKeyboard" -EndSection - -Section "Files" - FontPath "/usr/lib/X11/fonts/misc" -EndSection - -Section "Module" - Load "dbe" - Load "extmod" - Load "fbdevhw" -# Load "glx" - Load "record" - Load "freetype" - Load "type1" -EndSection - -Section "InputDevice" - Identifier "Keyboard0" - Driver "keyboard" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Mouse0" - Driver "mouse" -# Option "Protocol" "PS/2" - Option "Protocol" "IMPS/2" -# Option "Device" "/dev/psaux" - Option "Device" "/dev/mice" -# Option "ZAxisMapping" "4 5" -# Option "Emulate3Buttons" "yes" -EndSection - -Section "Monitor" - Identifier "Monitor0" - HorizSync 30-67 - VertRefresh 48-52 - DisplaySize 152 114 - Mode "1200x900" - DotClock 57.275 - HTimings 1200 1208 1216 1240 - VTimings 900 905 908 912 - Flags "-HSync" "-VSync" - EndMode -EndSection - -Section "Device" - Identifier "Videocard0" - Driver "geode" - Option "PanelGeometry" "1200x900" -EndSection - -Section "Screen" - Identifier "Screen0" - Device "Videocard0" - Monitor "Monitor0" - DefaultDepth 16 - - SubSection "Display" - Depth 16 - Modes "1200x900" - EndSubsection - -EndSection - -Section "DRI" - Group 0 - Mode 0666 -EndSection - diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 deleted file mode 100644 index 1e84135f7..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 +++ /dev/null @@ -1,34 +0,0 @@ -# xorg configuration - -Section "ServerLayout" - Identifier "Default Layout" - Screen 0 "Screen0" 0 0 - InputDevice "Mouse0" "CorePointer" -EndSection - -Section "InputDevice" - Identifier "Mouse0" - Driver "tslib" - Option "Device" "/dev/event1" - Option "Width" "480" - Option "Height" "640" -EndSection - -Section "Monitor" - Identifier "Monitor0" - VendorName "Monitor Vendor" - ModelName "OWRT" - Option "dpms" -EndSection - -Section "Device" - Identifier "Videocard0" - Driver "glamo" -EndSection - -Section "Screen" - Identifier "Screen0" - Device "Videocard0" - Monitor "Monitor0" - DefaultDepth 16 -EndSection diff --git a/Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci b/Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci deleted file mode 100644 index 0fc9fa9db..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/x.init b/Xorg/xorg/xserver/xorg-server/files/x.init deleted file mode 100755 index 2685d0418..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/x.init +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org -START=99 - -ARGS="-br" - -#screen() { -# local cfg="$1" -# config_get resolution $cfg resolution -# config_get dpi $cfg dpi -# [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" -# [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" -#} -# -#graphic() { -# local cfg="$1" -# config_get device $cfg device -# [ -n "$device" ] && ARGS="$ARGS -fb $device" -#} -# -#input() { -# local cfg="$1" -# config_get device $cfg device -# config_get driver $cfg driver -# #[ -n "$device" ] || return 0 -# [ -n "$driver" ] || return 0 -# ARGS="$ARGS -$cfg $driver,,device=$device" -#} - -desktop() { - local cfg="$1" - config_get autostart $cfg autostart - [ -n "$autostart" ] && eval $autostart & - config_get fdo_compliance $cfg fdo_compliance - [ -n "`echo \"$fdo_compliance\" 2> /dev/null | grep autostart`" ] && exit # in case the environment provides its own functionality to do the autostart stuff exit here -} - -start() { - export DISPLAY=":0" - config_load x11 -# config_foreach screen screen -# config_foreach graphic graphic -# config_foreach input input - Xorg $ARGS & - sleep 1 # give the xserver some time get initialized - config_foreach desktop desktop - test -d /etc/xdg/autostart || exit - sleep 1 # give the first x11 application some time to get present - afterwards we'll start the x11 autostart applications - for elem in `ls /etc/xdg/autostart/`; do - if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then - continue - fi - exec=`grep "^Exec=" "/etc/xdg/autostart/$elem"` - eval ${exec#*=} & - done -} diff --git a/Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk b/Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk deleted file mode 100644 index 0b1251961..000000000 --- a/Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk +++ /dev/null @@ -1,3 +0,0 @@ -XORG_VERSION:=@VERSION@ - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)$(XORG_VERSION) diff --git a/Xorg/xserver/xglamo/Makefile b/Xorg/xserver/xglamo/Makefile deleted file mode 100644 index d1c0ac5b7..000000000 --- a/Xorg/xserver/xglamo/Makefile +++ /dev/null @@ -1,135 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xglamo -PKG_VERSION:=20081205 -PKG_REV:=3f113f5f4dbaf14dee439eac8d510313fff3aafc -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=git://git.openmoko.org/git/xglamo.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(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_ARGS += --disable-dga \ - --disable-xinerama \ - --disable-xf86misc \ - --disable-xf86vidmode \ - --disable-xf86bigfont \ - --disable-xorgcfg \ - --disable-xkb \ - --disable-xnest \ - --disable-xvfb \ - --disable-xevie \ - --disable-xprint \ - --disable-xtrap \ - --disable-dmx \ - --disable-w100 \ - --disable-glx \ - --disable-xv \ - --disable-record \ - --disable-xephyr \ - --disable-xorg \ - --enable-kdrive \ - --enable-tslib \ - --enable-dri \ - --enable-drm \ - --enable-builtin-fonts \ - --with-default-font-path=built-ins \ - -CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes - -ifeq ($(CONFIG_TARGET_s3c24xx),y) - X_CONFIG=om_gta02 - TS_POINTERCAL=om_gta02 -endif - -define Package/xglamo - # xineramaproto necessary even when xinerama is disabled due to buggy xglamo - TITLE:=xglamo - SECTION:=xorg-server - SUBMENU:=server - CATEGORY:=Xorg - URL:=http://git.openmoko.org/?p=xglamo.git - DEPENDS:=+tslib \ - +recordproto \ - +glproto \ - +libdrm \ - +xf86driproto \ - +xineramaproto \ - +calibrateproto \ - +compositeproto \ - +libpthread \ - +randrproto \ - +renderproto \ - +fixesproto \ - +damageproto \ - +xcmiscproto \ - +xextproto \ - +xproto \ - +scrnsaverproto \ - +bigreqsproto \ - +resourceproto \ - +fontsproto \ - +inputproto \ - +kbproto \ - +videoproto \ - +resourceproto \ - +xtrans \ - +libxkbfile \ - +libXfont \ - +libXau \ - +libfontenc \ - +pixman \ - +libopenssl \ - @DISPLAY_SUPPORT \ - @arm||armeb \ - @TARGET_s3c24xx -endef - -define Package/xglamo/description - kdrive server with acceleration support for the graphics chip by smedia -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR) && \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - ./autogen.sh \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - ); -endef - -define Build/Compile - DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install -endef - -define Package/xglamo/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config $(1)/etc/uci-defaults - $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xglamo $(1)/usr/bin/ - $(CP) ./files/x.init $(1)/etc/init.d/x11 - $(if $(TS_POINTERCAL),$(CP) ./files/pointercal.$(TS_POINTERCAL) $(1)/etc/pointercal) - $(if $(X_CONFIG),$(CP) ./files/config/x11.$(X_CONFIG) $(1)/etc/config/x11) - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,xglamo)) diff --git a/Xorg/xserver/xglamo/files/config/x11.om_gta02 b/Xorg/xserver/xglamo/files/config/x11.om_gta02 deleted file mode 100644 index 705107ca3..000000000 --- a/Xorg/xserver/xglamo/files/config/x11.om_gta02 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config 'screen' - option 'resolution' '480x640' - option 'dpi' '285' - -config 'desktop' diff --git a/Xorg/xserver/xglamo/files/pointercal.om_gta02 b/Xorg/xserver/xglamo/files/pointercal.om_gta02 deleted file mode 100644 index 841ec7fab..000000000 Binary files a/Xorg/xserver/xglamo/files/pointercal.om_gta02 and /dev/null differ diff --git a/Xorg/xserver/xglamo/files/x.init b/Xorg/xserver/xglamo/files/x.init deleted file mode 100755 index ddefa1254..000000000 --- a/Xorg/xserver/xglamo/files/x.init +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org -START=99 - -ARGS="" - -screen() { - local cfg="$1" - config_get resolution $cfg resolution - config_get dpi $cfg dpi - [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" - [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" -} - -desktop() { - local cfg="$1" - config_get autostart $cfg autostart - [ -n "$autostart" ] && eval $autostart & - config_get fdo_compliance $cfg fdo_compliance - [ -n "`echo \"$fdo_compliance\" 2> /dev/null | grep autostart`" ] && exit # in case the environment provides its own functionality to do the autostart stuff exit here -} - -start() { - export DISPLAY=":0" - config_load x11 - config_foreach screen screen - TSLIB_TSDEVICE="/dev/event1" Xglamo $ARGS & - sleep 1 # give the xserver some time get initialized - config_foreach desktop desktop - test -d /etc/xdg/autostart || exit - sleep 1 # give the first x11 application some time to get present - afterwars we'll start the x11 autostart applications - for elem in `ls /etc/xdg/autostart/`; do - if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then - continue - fi - exec=`grep "^Exec=" "/etc/xdg/autostart/$elem"` - eval ${exec#*=} & - done -} diff --git a/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch b/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch deleted file mode 100644 index 8af158fda..000000000 --- a/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN git/configure.ac xglamo/git/configure.ac ---- git.orig/configure.ac 2008-11-18 23:42:32.000000000 +0100 -+++ git/configure.ac 2008-11-18 23:51:31.000000000 +0100 -@@ -1688,7 +1688,9 @@ - DIX_CFLAGS="-DHAVE_DIX_CONFIG_H" - AC_SUBST([DIX_CFLAGS]) - --AC_SUBST([libdir exec_prefix prefix]) -+AC_SUBST([libdir]) -+AC_SUBST([exec_prefix]) -+AC_SUBST([prefix]) - - # Man page sections - used in config utils & generating man pages - XORG_MANPAGE_SECTIONS diff --git a/lang/pycairo/Makefile b/lang/pycairo/Makefile deleted file mode 100644 index d09b6fe55..000000000 --- a/lang/pycairo/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pycairo -PKG_VERSION:=1.8.0 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.cairographics.org/releases/ -PKG_MD5SUM:=847f5377c32228a656819f5bd18eb6b4 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -PKG_INSTALL=1 - -CONFIGURE_ARGS += --enable-static - -define Package/pycairo - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=Cairo bindings to python - URL:=http://www.cairographics.org/pycairo/ - DEPENDS:=+python-mini +cairo -endef - -define Package/pycairo/description - Cairo bindings for python -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/pycairo - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/pycairo/* \ - $(1)/usr/include/pycairo - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/pycairo/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/cairo/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/cairo/*.{py,so,a} \ - $(1)$(PYTHON_PKG_DIR)/cairo/ -endef - -$(eval $(call BuildPackage,pycairo)) diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile deleted file mode 100644 index 961818224..000000000 --- a/lang/pygtk/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (C) 2008-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pygtk -PKG_VERSION:=2.12.1 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.12/ -PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694 -PKG_FIXUP:=libtool - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -$(call include_mk, python-package.mk) - -define Package/python-gtk - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=GTK bindings for python - URL:=http://www.pygtk.org/ - DEPENDS:=+python-mini +python-gobject +gtk2 +pycairo @!LINUX_2_4 -endef - -define Package/python-gtk/description - API to GTK and glade library from python. -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - SUBDIRS="codegen . gtk" \ - all install DESTDIR="$(PKG_INSTALL_DIR)" -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/pygtk-2.0/pygtk - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/pygtk-2.0/pygtk/* \ - $(1)/usr/include/pygtk-2.0/pygtk - - $(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/codegen - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/codegen/*.py \ - $(1)/usr/share/pygtk/2.0/codegen/ - - $(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/defs/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs/* \ - $(1)/usr/share/pygtk/2.0/defs - - $(INSTALL_DIR) $(2)/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/* \ - $(2)/bin - - $(SED) 's,^\(datadir\|prefix\)=,\1=$(STAGING_DIR),g' $(2)/bin/pygtk-codegen-2.0 - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig - - $(SED) 's,^datadir=,datadir=$(STAGING_DIR),g' $(1)/usr/lib/pkgconfig/pygtk-2.0.pc -endef - -define Package/python-gtk/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.so \ - $(1)$(PYTHON_PKG_DIR)/gtk-2.0 - - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/gtk/*{.py,.so}* \ - $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk -endef - -$(eval $(call BuildPackage,python-gtk)) diff --git a/lang/pygtk/patches/001-automake-compat.patch b/lang/pygtk/patches/001-automake-compat.patch deleted file mode 100644 index d141cd68c..000000000 --- a/lang/pygtk/patches/001-automake-compat.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,5 @@ - AUTOMAKE_OPTIONS = 1.7 -+ACLOCAL_AMFLAGS = -I m4 - - if BUILD_GTK - GTK_SUBDIR = gtk diff --git a/lang/pyqt4/Makefile b/lang/pyqt4/Makefile deleted file mode 100644 index 2763d0ed3..000000000 --- a/lang/pyqt4/Makefile +++ /dev/null @@ -1,154 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pyqt4 -PKG_VERSION:=4.8.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=PyQt-x11-gpl-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://bu3sch.de/pyqt4/ -PKG_MD5SUM:=d54fd1c37a74864faf42709c8102f254 -PKG_BUILD_DIR:=$(BUILD_DIR)/PyQt-x11-gpl-$(PKG_VERSION) -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -PKG_BUILD_DEPENDS:=python-sip/host - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) -$(call include_mk, python-sip-package.mk) - -define Package/pyqt4 - SECTION:=language-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Python QT4 - MAINTAINER:=Michael Buesch - URL:=http://www.riverbankcomputing.co.uk/software/pyqt/download - DEPENDS:=+qt4 +qt4-gui +dbus-python +python +python-sip @FEATURE_drawing-backend_libX11 -endef - -define Package/pyqt4/Description - Python QT4 framework bindings. -endef - -TARGET_INCDIRS+=$(STAGING_DIR)/include \ - $(STAGING_DIR)/usr/include \ - $(STAGING_DIR)/usr/include/Qt \ - $(STAGING_DIR)/usr/include/Qt3Support \ - $(STAGING_DIR)/usr/include/QtCore \ - $(STAGING_DIR)/usr/include/QtDBus \ - $(STAGING_DIR)/usr/include/QtGui \ - $(STAGING_DIR)/usr/include/QtNetwork \ - $(STAGING_DIR)/usr/include/QtSql \ - $(STAGING_DIR)/usr/include/QtSvg \ - $(STAGING_DIR)/usr/include/QtTest \ - $(STAGING_DIR)/usr/include/QtXml \ - $(STAGING_DIR)/usr/include/python$(PYTHON_VERSION) \ - $(STAGING_DIR)/usr/lib/dbus-1.0/include \ - $(TOOLCHAIN_DIR)/include \ - $(TOOLCHAIN_DIR)/usr/include - -TARGET_LIBDIRS+=$(STAGING_DIR)/lib \ - $(STAGING_DIR)/usr/lib \ - $(TOOLCHAIN_DIR)/lib \ - $(TOOLCHAIN_DIR)/usr/lib - -EXTRA_CFLAGS:= -EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib/ - -QTDIRSFILE:=$(PKG_BUILD_DIR)/qtdirs.out -SIPCFGFILE:=$(PKG_BUILD_DIR)/sipconfig.macros - -QT_VERSION:=./files/qt_versioning.sh version "$(STAGING_DIR)/usr/include" "$(PKG_BUILD_DIR)/qtver.tmp" -QT_EDITION:=./files/qt_versioning.sh edition "$(STAGING_DIR)/usr/include" "$(PKG_BUILD_DIR)/qtver.tmp" - -# Welcome to cross compilation hell. Dinner is served! - -define Build/Configure - echo "$(STAGING_DIR)/usr" > $(QTDIRSFILE) - echo "$(STAGING_DIR)/usr/include" >> $(QTDIRSFILE) - echo "$(STAGING_DIR)/usr/lib" >> $(QTDIRSFILE) - echo "$(STAGING_DIR)/usr/bin" >> $(QTDIRSFILE) - echo "$(STAGING_DIR)/usr/share" >> $(QTDIRSFILE) - echo "$(STAGING_DIR)/usr/lib/Qt/plugins" >> $(QTDIRSFILE) - $(QT_VERSION) >> $(QTDIRSFILE) - $(QT_EDITION) >> $(QTDIRSFILE) - echo "Open Source" >> $(QTDIRSFILE) - echo "shared" >> $(QTDIRSFILE) - - $(CP) "$(PYTHON_SIP_CONFIG_TEMPLATE)" "$(SIPCFGFILE)" - echo "INCDIR_QT $(STAGING_DIR)/usr/include" >> $(SIPCFGFILE) - echo "LIBDIR_QT $(STAGING_DIR)/usr/lib" >> $(SIPCFGFILE) - echo "MOC $(STAGING_DIR_HOST)/bin/moc" >> $(SIPCFGFILE) - echo "QT_INSTALL_BINS $(STAGING_DIR)/usr/bin" >> $(SIPCFGFILE) - echo "QT_INSTALL_HEADERS $(STAGING_DIR)/usr/include" >> $(SIPCFGFILE) - echo "QT_INSTALL_LIBS $(STAGING_DIR)/usr/lib" >> $(SIPCFGFILE) - echo "INCDIR $(TARGET_INCDIRS)" >> $(SIPCFGFILE) - echo "INCDIR_OPENGL $(TARGET_INCDIRS)" >> $(SIPCFGFILE) - echo "INCDIR_X11 $(TARGET_INCDIRS)" >> $(SIPCFGFILE) - echo "LIBDIR $(TARGET_LIBDIRS)" >> $(SIPCFGFILE) - echo "LIBDIR_OPENGL $(TARGET_LIBDIRS)" >> $(SIPCFGFILE) - echo "LIBDIR_X11 $(TARGET_LIBDIRS)" >> $(SIPCFGFILE) - - $(call HostPython, \ - cd "$(PKG_BUILD_DIR)"; \ - , \ - ./configure.py \ - --use-arch="$(ARCH)" \ - --qmake="$(STAGING_DIR_HOST)/bin/qmake" \ - --qmake-spec="$(STAGING_DIR)/usr/share/mkspecs/linux-openwrt-g++" \ - --qmake-prefix='TARGET_CC="$(TARGET_CROSS)gcc"' \ - --qmake-prefix='TARGET_CXX="$(TARGET_CROSS)g++"' \ - --qmake-prefix='TARGET_AR="$(TARGET_CROSS)ar cqs"' \ - --qmake-prefix='TARGET_OBJCOPY="$(TARGET_CROSS)objcopy"' \ - --qmake-prefix='TARGET_RANLIB="$(TARGET_CROSS)ranlib"' \ - --qmake-prefix='TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)"' \ - --qmake-prefix='TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)"' \ - --qmake-prefix='TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"' \ - --qmake-prefix='TARGET_INCDIRS="$(TARGET_INCDIRS)"' \ - --qmake-prefix='TARGET_LIBDIRS="$(TARGET_LIBDIRS)"' \ - --qmake-prefix='STAGING_DIR_HOST="$(STAGING_DIR)/../host"' \ - --qtdirs-file="$(QTDIRSFILE)" \ - --host-sip-bin="$(STAGING_DIR_HOST)/usr/bin/sip" \ - --sipconfig-macros="$(SIPCFGFILE)" \ - --dbus="$(STAGING_DIR)/usr/include/dbus-1.0" \ - --bindir="$(PKG_INSTALL_DIR)/usr/bin" \ - --destdir="$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)" \ - --plugin-destdir="$(PKG_INSTALL_DIR)/usr/lib/Qt/plugins" \ - --pydbus-installdir="$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)" \ - --sipdir="$(PKG_INSTALL_DIR)/usr/share/sip" \ - --protected-is-public \ - --crosscompile \ - --no-designer-plugin \ - --no-qsci-api \ - --confirm-license \ - --verbose \ - ) - ./files/fixup.sh "$(PKG_BUILD_DIR)" -endef - -define Build/Compile - $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) -endef - -define Build/Install - $(MAKE_VARS) DESTDIR="" $(MAKE) -C $(PKG_BUILD_DIR) install -endef - -define Package/pyqt4/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/$(PYTHON_PKG_DIR)/PyQt4 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{pylupdate4,pyrcc4,pyuic4} $(1)/usr/bin - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)/qt.so $(1)/$(PYTHON_PKG_DIR) - $(CP) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)/PyQt4 $(1)/$(PYTHON_PKG_DIR) -endef - -$(eval $(call BuildPackage,pyqt4)) diff --git a/lang/pyqt4/files/fixup.sh b/lang/pyqt4/files/fixup.sh deleted file mode 100755 index c4203a06c..000000000 --- a/lang/pyqt4/files/fixup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -PKG_BUILD_DIR="$1" - -# SIP uses PyLong_FromUnsignedLong to convert from void * to -# PyLong. This results in a compilation error for the implicit cast -# on C++ compilers. Make an explicit cast. -sed -i -e 's/PyLong_FromUnsignedLong(/PyLong_FromUnsignedLong((unsigned long)/g' $PKG_BUILD_DIR/QtCore/sipQtCoreQThread.cpp - diff --git a/lang/pyqt4/files/qt_versioning.sh b/lang/pyqt4/files/qt_versioning.sh deleted file mode 100755 index ec4fe9480..000000000 --- a/lang/pyqt4/files/qt_versioning.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -die() -{ - echo "PyQt qt_versioning.sh: $*" >&2 - exit 1 -} - -[ $# -eq 3 ] || die "Invalid arguments" - -action="$1" -qtincdir="$2" -tmpfile="$3" - -cp -f "$qtincdir/QtCore/qglobal.h" "$tmpfile" || die "cp failed" -echo "int QT_VERSION_IS = QT_VERSION;" >> "$tmpfile" || die "patching failed (1)" -echo "int QT_EDITION_IS = QT_EDITION;" >> "$tmpfile" || die "patching failed (2)" -# First resolve all preprocessor macros -cpp -x c++ -traditional-cpp "-I$qtincdir" "$tmpfile" > "$tmpfile.processed" || die "CPP failed" - -if [ "$action" = "version" ]; then - raw="$(grep -e 'QT_VERSION_IS' "$tmpfile.processed" | cut -d'=' -f2 | cut -d';' -f1)" -elif [ "$action" = "edition" ]; then - raw="$(grep -e 'QT_EDITION_IS' "$tmpfile.processed" | cut -d'=' -f2 | cut -d';' -f1)" -else - die "Invalid action" -fi -# We use python to evaluate the arithmetic C++ expression. Languages are similar -# enough in that area for this to succeed. -python -c "print \"%d\" % ($raw)" || die "C++ evaluation failed" - -exit 0 diff --git a/lang/pyqt4/patches/100-cross-compile.patch b/lang/pyqt4/patches/100-cross-compile.patch deleted file mode 100644 index 6d8cbe4e6..000000000 --- a/lang/pyqt4/patches/100-cross-compile.patch +++ /dev/null @@ -1,376 +0,0 @@ -Index: PyQt-x11-gpl-4.8.3/configure.py -=================================================================== ---- PyQt-x11-gpl-4.8.3.orig/configure.py 2011-01-23 11:08:20.000000000 +0100 -+++ PyQt-x11-gpl-4.8.3/configure.py 2011-03-13 15:03:08.279673485 +0100 -@@ -33,6 +33,7 @@ import os - import glob - import optparse - import shutil -+import re - - import sipconfig - -@@ -184,25 +185,17 @@ def create_optparser(): - "in the header comments of generated code [default: include " - "timestamps]") - -- if sys.platform != 'win32': -- if sys.platform in ('linux2', 'darwin'): -- pip_default = True -- pip_default_str = "enabled" -- else: -- pip_default = False -- pip_default_str = "disabled" -- -- g.add_option("--protected-is-public", action="store_true", -- default=pip_default, dest="prot_is_public", -- help="enable building with 'protected' redefined as 'public' " -- "[default: %s]" % pip_default_str) -- g.add_option("--protected-not-public", action="store_false", -- dest="prot_is_public", -- help="disable building with 'protected' redefined as 'public'") -- g.add_option("-q", "--qmake", action="callback", metavar="FILE", -- default=qmake, dest="qmake", callback=store_abspath_file, -- type="string", -- help="the pathname of qmake [default: %s]" % (qmake or "none")) -+ g.add_option("--protected-is-public", action="store_true", -+ default=True, dest="prot_is_public", -+ help="enable building with 'protected' redefined as 'public' " -+ "[default: True]") -+ g.add_option("--protected-not-public", action="store_false", -+ dest="prot_is_public", -+ help="disable building with 'protected' redefined as 'public'") -+ g.add_option("-q", "--qmake", action="callback", metavar="FILE", -+ default=qmake, dest="qmake", callback=store_abspath_file, -+ type="string", -+ help="the pathname of qmake [default: %s]" % (qmake or "none")) - - g.add_option("-s", "--dbus", action="callback", metavar="DIR", - dest="pydbusincdir", callback=store_abspath_dir, type="string", -@@ -210,13 +203,13 @@ def create_optparser(): - "[default: supplied by pkg-config]") - p.add_option_group(g) - -- if sys.platform == 'darwin': -- g = optparse.OptionGroup(p, title="MacOS X Configuration") -- g.add_option("--use-arch", action="store", metavar="ARCH", -- dest="use_arch", choices=["i386", "x86_64", "ppc"], -- help="the architecture to use when running pyuic4 " -- "[default: system default]") -- p.add_option_group(g) -+ g = optparse.OptionGroup(p, title="Arch Configuration") -+ g.add_option("--use-arch", action="store", metavar="ARCH", -+ dest="use_arch", choices=["", "i386", "x86_64", "ppc", "arm"], -+ default="", -+ help="the architecture to use when running pyuic4 " -+ "[default: system default]") -+ p.add_option_group(g) - - # Installation. - g = optparse.OptionGroup(p, title="Installation") -@@ -275,12 +268,42 @@ def create_optparser(): - "QTDIR/qsci]") - p.add_option_group(g) - -+ # Crosscompilation -+ g = optparse.OptionGroup(p, title="Crosscompilation") -+ g.add_option("--crosscompile", action="store_true", -+ default=False, dest="crosscompile", -+ help="Set, if cross-compiling") -+ g.add_option("--host-sip-bin", action="callback", metavar="FILE", -+ default=None, dest="host_sip_bin", type="string", -+ callback=store_abspath_file, -+ help="Path to the host SIP binary") -+ g.add_option("--sipconfig-macros", action="callback", metavar="FILE", -+ default=None, dest="sipconfig_macros", type="string", -+ callback=store_abspath_file, -+ help="Path to a file containing sipconfig macros") -+ g.add_option("--qmake-prefix", action="append", -+ default=[], dest="qmake_prefixes", type="string", -+ help="Commandline prefix to qmake") -+ g.add_option("--qmake-spec", action="callback", metavar="FILE", -+ default=None, dest="qmake_spec", callback=store_abspath, -+ type="string", -+ help="the pathname to qmake spec file") -+ g.add_option("--qtdirs-file", action="callback", metavar="FILE", -+ default=None, dest="qtdirs_file", callback=store_abspath_file, -+ type="string", -+ help="Path to a predefined qtdirs file") -+ g.add_option("--pydbus-installdir", action="callback", metavar="DIR", -+ default=None, dest="pydbus_installdir", callback=store_abspath, -+ type="string", -+ help="Install dir for pydbus module") -+ p.add_option_group(g) -+ - return p - - - class pyrccMakefile(sipconfig.ProgramMakefile): - """This class implements the Makefile for pyrcc. This is specialised so -- that pyrcc is automatically run against the examples. -+ that pyrcc is automatically run against the examples, if not crosscompiling. - """ - - def __init__(self): -@@ -294,6 +317,8 @@ class pyrccMakefile(sipconfig.ProgramMak - def generate_target_default(self, mfile): - """Generate the default target.""" - sipconfig.ProgramMakefile.generate_target_default(self, mfile) -+ if opts.crosscompile: -+ return - - # The correct call to pyrcc depends on the Python version. - if sys.hexversion >= 0x03000000: -@@ -807,7 +832,7 @@ include(%s) - - f.close() - -- run_command("%s %s %s" % (opts.qmake, qmake_args, wrapped_pro)) -+ run_qmake("%s %s" % (qmake_args, wrapped_pro)) - os.chdir(cwd) - - sipconfig.inform("Creating QPy support libraries Makefile...") -@@ -861,12 +886,16 @@ include(%s) - # not on Windows (so that normal console use will work). - sipconfig.inform("Creating pyuic4 wrapper...") - -- if sys.platform == 'darwin': -- gui = True -+ if opts.use_arch: -+ gui = False#FIXME - use_arch = opts.use_arch - else: -- gui = False -- use_arch = '' -+ if sys.platform == 'darwin': -+ gui = True -+ use_arch = opts.use_arch -+ else: -+ gui = False -+ use_arch = '' - - # The pyuic directory may not exist if we are building away from the - # source directory. -@@ -926,6 +955,7 @@ include(%s) - - abi = getattr(sys, 'abiflags', '') - -+ print "FIXME CROSSCOMPILE" #FIXME: Crosscompile - if sys.platform == 'win32': - # Use abiflags in case it is supported in a future version. - lib_dir_flag = quote("-L%s" % sipcfg.py_lib_dir) -@@ -988,7 +1018,7 @@ include(%s) - fout.write(prj) - fout.close() - -- run_command("%s %s" % (opts.qmake, qmake_args)) -+ run_qmake(qmake_args) - os.chdir(cwd) - - tool.append("designer") -@@ -1106,6 +1136,14 @@ def create_config(module, template, macr - sipconfig.create_config_module(module, template, content, macros) - - -+def run_qmake(args): -+ pfx = " ".join(opts.qmake_prefixes) -+ if opts.qmake_spec: -+ spec = "-spec \"" + opts.qmake_spec + "\"" -+ else: -+ spec = "" -+ run_command(pfx + " " + opts.qmake + " " + spec + " " + args) -+ - def run_command(cmd, envvars=None): - """Run a command and display the output if verbose mode is enabled. - -@@ -1334,30 +1372,38 @@ def check_dbus(): - """ - sipconfig.inform("Checking to see if the dbus support module should be built...") - -- sout = get_command_stdout("pkg-config --cflags-only-I --libs dbus-1") -- iflags = sout.read().strip() -+ if opts.crosscompile and not opts.pydbusincdir: -+ sipconfig.inform("Crosscompiling but no dbus incdir specified. Disabling dbus.") -+ return -+ -+ if not opts.crosscompile: -+ sout = get_command_stdout("pkg-config --cflags-only-I --libs dbus-1") -+ iflags = sout.read().strip() -+ -+ if not iflags: -+ sipconfig.inform("DBus v1 does not seem to be installed.") -+ return -+ -+ # Using str() means it will work with both Python v2 and v3. -+ for f in str(iflags).split(): -+ if f.startswith("-I"): -+ dbusincdirs.append(f[2:]) -+ elif f.startswith("-L"): -+ dbuslibdirs.append(f[2:]) -+ elif f.startswith("-l"): -+ dbuslibs.append(f[2:]) - -- if not iflags: -- sipconfig.inform("DBus v1 does not seem to be installed.") -- return -- -- # Using str() means it will work with both Python v2 and v3. -- for f in str(iflags).split(): -- if f.startswith("-I"): -- dbusincdirs.append(f[2:]) -- elif f.startswith("-L"): -- dbuslibdirs.append(f[2:]) -- elif f.startswith("-l"): -- dbuslibs.append(f[2:]) -- -- try: -- import dbus.mainloop -- except: -- sipconfig.inform("The Python dbus module doesn't seem to be installed.") -- return -+ try: -+ import dbus.mainloop -+ except: -+ sipconfig.inform("The Python dbus module doesn't seem to be installed.") -+ return - - global pydbusmoddir -- pydbusmoddir = dbus.mainloop.__path__[0] -+ if opts.pydbus_installdir: -+ pydbusmoddir = opts.pydbus_installdir -+ else: -+ pydbusmoddir = dbus.mainloop.__path__[0] - - # Try and find dbus-python.h. We don't use pkg-config because it is broken - # for dbus-python (at least for versions up to and including v0.81.0). -@@ -1443,6 +1489,7 @@ def set_sip_flags(pyqt): - - pyqt is the configuration instance. - """ -+ #FIXME: Needs some crosscompile fixes. - # If we don't check for signed interpreters, we exclude the 'VendorID' - # feature - if not opts.vendorcheck: -@@ -1588,7 +1635,10 @@ def generate_code(mname, extra_include_d - needed_qt_libs(mname, qt_libs) - - # Build the SIP command line. -- argv = ['"' + sipcfg.sip_bin + '"', '-w'] -+ sip_bin = sipcfg.sip_bin -+ if opts.host_sip_bin: -+ sip_bin = opts.host_sip_bin -+ argv = ['"' + sip_bin + '"', '-w'] - - if opts.no_timestamp: - argv.append("-T") -@@ -1890,6 +1940,8 @@ def check_qt_installation(macros): - def fix_qmake_args(args=""): - """Make any platform specific adjustments to the arguments passed to qmake. - """ -+ if opts.crosscompile: -+ return args - if sys.platform == "darwin": - # The Qt binary installer has macx-xcode as the default. - args = "-spec %s %s" % (sipcfg.platform, args) -@@ -2041,7 +2093,7 @@ int main(int, char **) - - # Create the makefile, first making sure it doesn't already exist. - remove_file(make_file) -- run_command("%s %s %s" % (opts.qmake, qmake_args, pro_file)) -+ run_qmake("%s %s" % (qmake_args, pro_file)) - - if not os.access(make_file, os.F_OK): - sipconfig.error("%s failed to create a makefile. %s" % (opts.qmake, MSG_CHECK_QMAKE)) -@@ -2063,15 +2115,30 @@ int main(int, char **) - if not os.access(exe_file, os.X_OK): - sipconfig.error("Failed to determine the layout of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") - -- # Create the output file, first making sure it doesn't exist. -- remove_file(out_file) -- run_command(exe_file) -+ if opts.qtdirs_file: -+ # The user supplied a partial qtdirs.out file. We're probably crosscompiling. -+ # Do _not_ try to execute our qtdirs exe. Take the supplied qtdirs.out files -+ # instead and add the PyQt_... flags by grepping through the executable. -+ # This assumes the executable is not compiled with -O0. -+ read_qtdirs_file(opts.qtdirs_file) -+ global qt_xfeatures -+ print("Got %d features from qtdirs.out file: %s" % (len(qt_xfeatures), str(qt_xfeatures))) -+ found = re.findall(r'PyQt_[\w]+', file(exe_file, "r").read()) -+ print("Grepped %d features from qtdirs.exe file: %s" % (len(found), str(found))) -+ qt_xfeatures.extend(found) -+ else: -+ # Create the output file, first making sure it doesn't exist. -+ remove_file(out_file) -+ run_command(exe_file) -+ -+ if not os.access(out_file, os.F_OK): -+ sipconfig.error("%s failed to create %s. Make sure your Qt v4 installation is correct." % (exe_file, out_file)) - -- if not os.access(out_file, os.F_OK): -- sipconfig.error("%s failed to create %s. Make sure your Qt v4 installation is correct." % (exe_file, out_file)) -+ # Read the directories. -+ read_qtdirs_file(out_file) - -- # Read the directories. -- f = open(out_file, "r") -+def read_qtdirs_file(filename): -+ f = open(filename, "r") - lines = f.read().strip().split("\n") - f.close() - -@@ -2136,6 +2203,24 @@ int main(int, char **) - sipconfig.error("Qt has been built as static libraries so either the -g or -k argument should be used.") - - -+def load_sipconfig_macros(filename): -+ macros = {} -+ fd = file(filename, "r") -+ for line in fd.readlines(): -+ line = line.split() -+ try: -+ key = line[0] -+ except IndexError: -+ sipconfig.error("Invalid sipconfig macros file format") -+ value = "" -+ try: -+ value = " ".join(line[1:]) -+ except IndexError: -+ pass -+ macros[key] = value -+ return macros -+ -+ - def main(): - """Create the configuration module module. - """ -@@ -2154,7 +2239,7 @@ def main(): - opts.no_timestamp = False - - # Provide defaults for platform-specific options. -- if sys.platform == 'win32': -+ if sys.platform == 'win32' and not opts.crosscompile: - opts.qmake = find_default_qmake() - opts.prot_is_public = False - -@@ -2187,12 +2272,14 @@ def main(): - # Install the API file if the default directory exists. - opts.api = os.path.isdir(opts.qscidir) - -- # Replace the existing build macros with the ones from the Qt installation. -- macros = get_build_macros(args) -- -- if macros is None: -- p.print_help() -- sys.exit(2) -+ if opts.sipconfig_macros: -+ macros = load_sipconfig_macros(opts.sipconfig_macros) -+ else: -+ # Replace the existing build macros with the ones from the Qt installation. -+ macros = get_build_macros(args) -+ if macros is None: -+ p.print_help() -+ sys.exit(2) - - sipcfg.set_build_macros(macros) - diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile deleted file mode 100644 index cc971a5de..000000000 --- a/lang/python-gnome-desktop2/Makefile +++ /dev/null @@ -1,88 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gnome-python-desktop -PKG_VERSION:=2.22.0 -PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22 -PKG_MD5SUM:=504877a973f6abc0788283232cd703cb -PKG_FIXUP:=libtool - -# AM_PATH_GTK_2_0 -PKG_BUILD_DEPENDS:=gtk2 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -$(call include_mk, python-package.mk) - -PKG_INSTALL=1 - -EXTRA_CFLAGS += -I$(ICONV_PREFIX) -I$(INTL_PREFIX) -EXTRA_LDFLAGS += -L$(ICONV_PREFIX) -L$(INTL_PREFIX) - -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_python-rsvg CONFIG_PACKAGE_python-wnck) - -define Package/python-gnome-desktop/Default - SECTION:=lang - SUBMENU:=Python - CATEGORY:=Languages - TITLE:=$(1) python bindings - URL:=http://ftp.gnome.org/ - DEPENDS:=+python-mini python-gtk $(2) -endef - -define Package/python-rsvg - $(call Package/python-gnome-desktop/Default,librsvg,+librsvg +pycairo) -endef - -define Package/python-wnck - $(call Package/python-gnome-desktop/Default,libwnck,+PACKAGE_python-wnck:libwnck) -endef - -define Build/Configure - $(call Build/Configure/Default, \ - $(if $(CONFIG_PACKAGE_python-rsvg), --enable-rsvg, --disable-rsvg) \ - $(if $(CONFIG_PACKAGE_python-wnck), --enable-wnck, --disable-wnck) \ - ) -endef - -MAKE_INSTALL_FLAGS += \ - PYGTK_DEFSDIR="$(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs" - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ - $(1)/usr/lib/pkgconfig/ - - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.{a,la,so} \ - $(1)$(PYTHON_PKG_DIR)/gtk-2.0/ -endef - -define Package/python-gnome-desktop/install/Default - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/$(2).so \ - $(1)$(PYTHON_PKG_DIR)/gtk-2.0/ -endef - -define Package/python-rsvg/install - $(call Package/python-gnome-desktop/install/Default,$(1),rsvg) -endef - -define Package/python-wnck/install - $(call Package/python-gnome-desktop/install/Default,$(1),wnck) -endef - -$(eval $(call BuildPackage,python-rsvg)) -$(eval $(call BuildPackage,python-wnck)) - diff --git a/utils/dbus-x/Makefile b/utils/dbus-x/Makefile deleted file mode 100644 index 10c6df1eb..000000000 --- a/utils/dbus-x/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -# Make sure to also update the dbus package -PKG_NAME:=dbus-x -PKG_VERSION:=1.2.12 -PKG_RELEASE:=2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/dbus-x/dbus-$(PKG_VERSION) -PKG_SOURCE:=dbus-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/ -PKG_MD5SUM:=39bd582c3b06a261cac44d4cab6fd60b - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib/ - -define Package/dbus/Default/description - D-Bus is a message bus system, a simple way for applications to talk to one - another. In addition to interprocess communication, D-Bus helps coordinate - process lifecycle; it makes it simple and reliable to code a "single instance" - application or daemon, and to launch applications and daemons on demand when - their services are needed. -endef - -define Package/dbus-launch-x - SECTION:=utils - CATEGORY:=Utilities - TITLE:=dbus launch utility with x support - DEPENDS:=+libexpat +dbus +libX11 - URL:=http://dbus.freedesktop.org/ -endef - -define Package/dbus-launch-x/Description -$(call Package/dbus/Default/description) - This package contains the dbus-launch utility with compiled in x support. -endef - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --disable-abstract-sockets \ - --disable-ansi \ - --disable-asserts \ - --disable-console-owner-file \ - --disable-doxygen-docs \ - --disable-gcov \ - --disable-selinux \ - --disable-tests \ - --disable-verbose-mode \ - --disable-xml-docs \ - --with-xml="expat" \ - --with-dbus-user=root \ - --with-dbus-daemondir="/usr/sbin" \ - --with-system-socket="/var/run/dbus/system_bus_socket" \ - --with-system-pid-file="/var/run/dbus.pid" \ - --with-x \ - --libexecdir=/usr/lib/dbus-1 - -CONFIGURE_VARS+= \ - ac_cv_have_abstract_sockets="yes" \ - -define Package/dbus-launch-x/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) \ - $(PKG_INSTALL_DIR)/usr/bin/dbus-launch \ - $(1)/usr/bin/dbus-launch-x -endef - -$(eval $(call BuildPackage,dbus-launch-x))