summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Wagner <will_wagner@carallon.com>2010-04-14 17:06:42 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-04-22 10:26:38 (GMT)
commitfca42cd645243f133095fa3ba737de973fe04524 (patch)
tree57253dc585d6a2b9115c17e03d10b2d76aac9a15
parent9638be1acfb1b1d8f1e492efa6cae70335422d9c (diff)
downloadbuildroot-fca42cd645243f133095fa3ba737de973fe04524.tar.gz
buildroot-fca42cd645243f133095fa3ba737de973fe04524.tar.bz2
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>
-rw-r--r--CHANGES3
-rw-r--r--package/x11r7/Config.in2
-rw-r--r--package/x11r7/xapp_xdpyinfo/Config.in2
-rw-r--r--package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ati/Config.in1
-rw-r--r--package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sis/Config.in1
-rw-r--r--package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sisusb/Config.in1
-rw-r--r--package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk2
-rw-r--r--package/x11r7/xlib_libXxf86misc/Config.in8
-rw-r--r--package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk15
-rw-r--r--package/x11r7/xproto_xf86miscproto/Config.in4
-rw-r--r--package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk14
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in2
15 files changed, 6 insertions, 55 deletions
diff --git a/CHANGES b/CHANGES
index 0a3314f..2c97865 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 9c43aca..74c6510 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 ffe579d..aa3332b 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 64ef8a0..36cc067 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 ee4dd1a..dcc12bf 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 e2c40da..59c9acf 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 aac628e..d24679a 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 cfcb3f1..40ccab5 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 af68d89..f4074f2 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 36a683f..5068606 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 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
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
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
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 e850aba..e3d72cc 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