Remove XFree86-Misc (lib & proto) as removed from X11R7.5

[Peter: also remove selects from affected Config.in's]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 0a3314f038192d9c56d2c1eb23f473f684cfdcda..2c97865d3fc78b29fbc0c6d3de8d766bd5cab0e1 100644 (file)
--- 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 9c43aca3814f9104408fe7084a15fdb72c35cc92..74c651077dd77afafd51410fe0c535ec0dbf8132 100644 (file)
--- 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 ffe579d1aab06b6b71db547a1a5fc533726ff3e2..aa3332b57675a5f4109f2b369c30e321b4114f09 100644 (file)
--- 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 64ef8a0cbbee004048860817c749c40d538aa6d8..36cc0679b5b229adf359a90788501869213514af 100644 (file)
--- 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 ee4dd1a6d12dd1e1a9cafe322f32d6818bb89bb1..dcc12bf6fbed205dad8f6d5f9f2c4b34920a6544 100644 (file)
--- 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 e2c40da415f2daec37fb6011026c27dd70d64326..59c9acf3ecfdc34116da4622f1fe64c5aa56da71 100644 (file)
--- 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 aac628ef6674dcd02ac3387097befa3870fc2011..d24679a119f16ad18909cf82ea5626f1e691ca1c 100644 (file)
--- 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 cfcb3f1b7d52087228478c08c1eb72d6dd382f6d..40ccab50c8ead2b2006bca249ebe0251112f384b 100644 (file)
--- 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 af68d89f21246d314987ce85ec8ece063223afc9..f4074f223989bde017fa908916a93976312f271f 100644 (file)
--- 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 36a683f1503c0216bdf7798dda2889ab8ce73815..5068606099a77381c6dee48b613906168d27af0a 100644 (file)
--- 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 (file)
index 205140c..0000000
--- 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 (file)
index 5f4b793..0000000
--- 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 (file)
index cd19ff3..0000000
--- 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 (file)
index 8cf8482..0000000
--- 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 e850aba55df57e5e91ba762f09d947b8c26ee95a..e3d72cc89cb10b2e7b40579b47271f79bd7cbc18 100644 (file)
--- 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