From fca42cd645243f133095fa3ba737de973fe04524 Mon Sep 17 00:00:00 2001 From: Will Wagner Date: Wed, 14 Apr 2010 18:06:42 +0100 Subject: [PATCH] Remove XFree86-Misc (lib & proto) as removed from X11R7.5 [Peter: also remove selects from affected Config.in's] Signed-off-by: Will Wagner Acked-by: Paulius Zaleckas Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- CHANGES | 3 ++- package/x11r7/Config.in | 2 -- package/x11r7/xapp_xdpyinfo/Config.in | 2 -- package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 2 +- package/x11r7/xdriver_xf86-video-ati/Config.in | 1 - .../xdriver_xf86-video-ati.mk | 2 +- package/x11r7/xdriver_xf86-video-sis/Config.in | 1 - .../xdriver_xf86-video-sis.mk | 2 +- package/x11r7/xdriver_xf86-video-sisusb/Config.in | 1 - .../xdriver_xf86-video-sisusb.mk | 2 +- package/x11r7/xlib_libXxf86misc/Config.in | 8 -------- .../x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk | 15 --------------- package/x11r7/xproto_xf86miscproto/Config.in | 4 ---- .../xproto_xf86miscproto/xproto_xf86miscproto.mk | 14 -------------- package/x11r7/xserver_xorg-server/Config.in | 2 -- 15 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 package/x11r7/xlib_libXxf86misc/Config.in delete mode 100644 package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk delete mode 100644 package/x11r7/xproto_xf86miscproto/Config.in delete mode 100644 package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk diff --git a/CHANGES b/CHANGES index 0a3314f038..2c97865d3f 100644 --- a/CHANGES +++ b/CHANGES @@ -23,7 +23,8 @@ xlib_libpciaccess, xproto_dri2proto, xproto_eviext, xproto_fontcacheproto, xproto_xf86miscproto, xserver_xorg-server - Removed packages: xapp_xtrap, xlib_libXTrap, xproto_trapproto + Removed packages: xapp_xtrap, xlib_libXTrap, xlib_libXxf86misc, + xproto_trapproto, xproto_xf86miscproto Issues resolved (http://bugs.uclibc.org): diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 9c43aca381..74c651077d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -77,7 +77,6 @@ endmenu source package/x11r7/xlib_libXv/Config.in source package/x11r7/xlib_libXvMC/Config.in source package/x11r7/xlib_libXxf86dga/Config.in - source package/x11r7/xlib_libXxf86misc/Config.in source package/x11r7/xlib_libXxf86vm/Config.in source package/x11r7/xlib_libdmx/Config.in source package/x11r7/xlib_libfontenc/Config.in @@ -300,7 +299,6 @@ endmenu source package/x11r7/xproto_xf86bigfontproto/Config.in source package/x11r7/xproto_xf86dgaproto/Config.in source package/x11r7/xproto_xf86driproto/Config.in - source package/x11r7/xproto_xf86miscproto/Config.in source package/x11r7/xproto_xf86rushproto/Config.in source package/x11r7/xproto_xf86vidmodeproto/Config.in source package/x11r7/xproto_xineramaproto/Config.in diff --git a/package/x11r7/xapp_xdpyinfo/Config.in b/package/x11r7/xapp_xdpyinfo/Config.in index ffe579d1aa..aa3332b576 100644 --- a/package/x11r7/xapp_xdpyinfo/Config.in +++ b/package/x11r7/xapp_xdpyinfo/Config.in @@ -7,14 +7,12 @@ config BR2_PACKAGE_XAPP_XDPYINFO select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXXF86DGA - select BR2_PACKAGE_XLIB_LIBXXF86MISC select BR2_PACKAGE_XLIB_LIBXXF86VM select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XPROTO_KBPROTO select BR2_PACKAGE_XPROTO_PRINTPROTO select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XF86MISCPROTO select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO help xdpyinfo 1.1.0 diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index 64ef8a0cbb..36cc0679b5 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -8,6 +8,6 @@ XAPP_XDPYINFO_VERSION = 1.1.0 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDPYINFO_AUTORECONF = NO -XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto xlib_libdmx +XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx $(eval $(call AUTOTARGETS,package/x11r7,xapp_xdpyinfo)) diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in index ee4dd1a6d1..dcc12bf6fb 100644 --- a/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI select BR2_PACKAGE_XPROTO_VIDEOPROTO select BR2_PACKAGE_XPROTO_XEXTPROTO select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XF86MISCPROTO select BR2_PACKAGE_XPROTO_XINERAMAPROTO select BR2_PACKAGE_XPROTO_XPROTO help diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index e2c40da415..59c9acf3ec 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -8,7 +8,7 @@ XDRIVER_XF86_VIDEO_ATI_VERSION = 6.12.4 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES -XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto +XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto XDRIVER_XF86_VIDEO_ATI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati)) diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in index aac628ef66..d24679a119 100644 --- a/package/x11r7/xdriver_xf86-video-sis/Config.in +++ b/package/x11r7/xdriver_xf86-video-sis/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS select BR2_PACKAGE_XPROTO_XEXTPROTO select BR2_PACKAGE_XPROTO_XF86DGAPROTO select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XF86MISCPROTO select BR2_PACKAGE_XPROTO_XINERAMAPROTO select BR2_PACKAGE_XPROTO_XPROTO help diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index cfcb3f1b7d..40ccab50c8 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -8,7 +8,7 @@ XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.2 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES -XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto +XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto XDRIVER_XF86_VIDEO_SIS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis)) diff --git a/package/x11r7/xdriver_xf86-video-sisusb/Config.in b/package/x11r7/xdriver_xf86-video-sisusb/Config.in index af68d89f21..f4074f2239 100644 --- a/package/x11r7/xdriver_xf86-video-sisusb/Config.in +++ b/package/x11r7/xdriver_xf86-video-sisusb/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SISUSB select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_VIDEOPROTO select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86MISCPROTO select BR2_PACKAGE_XPROTO_XINERAMAPROTO select BR2_PACKAGE_XPROTO_XPROTO help diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk index 36a683f150..5068606099 100644 --- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk +++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk @@ -8,7 +8,7 @@ XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.3 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO -XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto +XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto XDRIVER_XF86_VIDEO_SISUSB_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sisusb)) diff --git a/package/x11r7/xlib_libXxf86misc/Config.in b/package/x11r7/xlib_libXxf86misc/Config.in deleted file mode 100644 index 205140c27b..0000000000 --- a/package/x11r7/xlib_libXxf86misc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXXF86MISC - bool "libXxf86misc" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_XF86MISCPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xxf86misc library diff --git a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk deleted file mode 100644 index 5f4b7939c8..0000000000 --- a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libXxf86misc -- X.Org Xxf86misc library -# -################################################################################ - -XLIB_LIBXXF86MISC_VERSION = 1.0.2 -XLIB_LIBXXF86MISC_SOURCE = libXxf86misc-$(XLIB_LIBXXF86MISC_VERSION).tar.bz2 -XLIB_LIBXXF86MISC_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXXF86MISC_AUTORECONF = NO -XLIB_LIBXXF86MISC_INSTALL_STAGING = YES -XLIB_LIBXXF86MISC_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86miscproto xproto_xproto -XLIB_LIBXXF86MISC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static - -$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86misc)) diff --git a/package/x11r7/xproto_xf86miscproto/Config.in b/package/x11r7/xproto_xf86miscproto/Config.in deleted file mode 100644 index cd19ff3b61..0000000000 --- a/package/x11r7/xproto_xf86miscproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XF86MISCPROTO - bool "xf86miscproto" - help - X.Org XF86Misc protocol headers diff --git a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk deleted file mode 100644 index 8cf8482394..0000000000 --- a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xproto_xf86miscproto -- X.Org XF86Misc protocol headers -# -################################################################################ - -XPROTO_XF86MISCPROTO_VERSION = 0.9.3 -XPROTO_XF86MISCPROTO_SOURCE = xf86miscproto-$(XPROTO_XF86MISCPROTO_VERSION).tar.bz2 -XPROTO_XF86MISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XF86MISCPROTO_AUTORECONF = NO -XPROTO_XF86MISCPROTO_INSTALL_STAGING = YES -XPROTO_XF86MISCPROTO_INSTALL_TARGET = NO - -$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86miscproto)) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index e850aba55d..e3d72cc89c 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -23,7 +23,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXRES - select BR2_PACKAGE_XLIB_LIBXXF86MISC select BR2_PACKAGE_XLIB_LIBXXF86VM select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_XTRANS @@ -46,7 +45,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO select BR2_PACKAGE_XPROTO_XF86DGAPROTO select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XF86MISCPROTO select BR2_PACKAGE_XPROTO_XF86RUSHPROTO select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO select BR2_PACKAGE_XPROTO_XPROTO -- 2.30.2