summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-06-11 17:35:50 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-06-12 08:11:48 +0200
commitb79d8ce556a58ffeaf8ec27356d98b05a376b506 (patch)
treeb9abc35a6170a73c2d70c87a3c231aa74d2d317b
parent825bddea58e923142ce7c0343fd5ee92df4dce63 (diff)
downloadptxdist-b79d8ce556a58ffeaf8ec27356d98b05a376b506.tar.gz
ptxdist-b79d8ce556a58ffeaf8ec27356d98b05a376b506.tar.xz
replace all xorg-proto-* with xorgproto
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-lndir.in2
-rw-r--r--rules/host-makedepend.in2
-rw-r--r--rules/host-xorg-app-mkfontscale.in2
-rw-r--r--rules/host-xorg-lib-X11.in5
-rw-r--r--rules/host-xorg-lib-Xau.in2
-rw-r--r--rules/host-xorg-lib-Xfont.in3
-rw-r--r--rules/host-xorg-lib-fontenc.in2
-rw-r--r--rules/host-xorg-lib-xkbfile.in2
-rw-r--r--rules/host-xorg-proto-bigreqs.in5
-rw-r--r--rules/host-xorg-proto-bigreqs.make36
-rw-r--r--rules/host-xorg-proto-fonts.in5
-rw-r--r--rules/host-xorg-proto-fonts.make36
-rw-r--r--rules/host-xorg-proto-input.in5
-rw-r--r--rules/host-xorg-proto-input.make36
-rw-r--r--rules/host-xorg-proto-kb.in5
-rw-r--r--rules/host-xorg-proto-kb.make36
-rw-r--r--rules/host-xorg-proto-x.in5
-rw-r--r--rules/host-xorg-proto-x.make36
-rw-r--r--rules/host-xorg-proto-xcmisc.in5
-rw-r--r--rules/host-xorg-proto-xcmisc.make36
-rw-r--r--rules/host-xorg-proto-xext.in5
-rw-r--r--rules/host-xorg-proto-xext.make37
-rw-r--r--rules/mesalib.in3
-rw-r--r--rules/qt4.in6
-rw-r--r--rules/xcb-util.in2
-rw-r--r--rules/xorg-app-xev.in2
-rw-r--r--rules/xorg-app-xinput.in2
-rw-r--r--rules/xorg-driver-input-evdev.in3
-rw-r--r--rules/xorg-driver-input-keyboard.in5
-rw-r--r--rules/xorg-driver-input-mouse.in2
-rw-r--r--rules/xorg-driver-video-apm.in3
-rw-r--r--rules/xorg-driver-video-ati.in9
-rw-r--r--rules/xorg-driver-video-dummy.in2
-rw-r--r--rules/xorg-driver-video-fbdev.in5
-rw-r--r--rules/xorg-driver-video-intel.in8
-rw-r--r--rules/xorg-driver-video-vesa.in3
-rw-r--r--rules/xorg-lib-FS.in3
-rw-r--r--rules/xorg-lib-ICE.in2
-rw-r--r--rules/xorg-lib-SM.in2
-rw-r--r--rules/xorg-lib-WindowsWM.in3
-rw-r--r--rules/xorg-lib-X11.in8
-rw-r--r--rules/xorg-lib-XScrnSaver.in2
-rw-r--r--rules/xorg-lib-Xau.in2
-rw-r--r--rules/xorg-lib-Xaw.in2
-rw-r--r--rules/xorg-lib-Xcomposite.in3
-rw-r--r--rules/xorg-lib-Xcursor.in2
-rw-r--r--rules/xorg-lib-Xdamage.in4
-rw-r--r--rules/xorg-lib-Xdmcp.in2
-rw-r--r--rules/xorg-lib-Xevie.in2
-rw-r--r--rules/xorg-lib-Xext.in3
-rw-r--r--rules/xorg-lib-Xfixes.in4
-rw-r--r--rules/xorg-lib-Xfont.in3
-rw-r--r--rules/xorg-lib-Xft.in2
-rw-r--r--rules/xorg-lib-Xi.in3
-rw-r--r--rules/xorg-lib-Xinerama.in2
-rw-r--r--rules/xorg-lib-Xmu.in2
-rw-r--r--rules/xorg-lib-Xp.in2
-rw-r--r--rules/xorg-lib-Xpm.in2
-rw-r--r--rules/xorg-lib-XprintAppUtil.in2
-rw-r--r--rules/xorg-lib-XprintUtil.in2
-rw-r--r--rules/xorg-lib-Xrandr.in2
-rw-r--r--rules/xorg-lib-Xrender.in2
-rw-r--r--rules/xorg-lib-Xres.in3
-rw-r--r--rules/xorg-lib-Xt.in6
-rw-r--r--rules/xorg-lib-Xtst.in4
-rw-r--r--rules/xorg-lib-Xv.in3
-rw-r--r--rules/xorg-lib-XvMC.in3
-rw-r--r--rules/xorg-lib-Xxf86dga.in2
-rw-r--r--rules/xorg-lib-Xxf86misc.in4
-rw-r--r--rules/xorg-lib-Xxf86vm.in4
-rw-r--r--rules/xorg-lib-dmx.in2
-rw-r--r--rules/xorg-lib-fontenc.in2
-rw-r--r--rules/xorg-lib-xkbfile.in2
-rw-r--r--rules/xorg-lib-xshmfence.in2
-rw-r--r--rules/xorg-proto-bigreqs.in6
-rw-r--r--rules/xorg-proto-bigreqs.make44
-rw-r--r--rules/xorg-proto-composite.in13
-rw-r--r--rules/xorg-proto-composite.make51
-rw-r--r--rules/xorg-proto-damage.in9
-rw-r--r--rules/xorg-proto-damage.make51
-rw-r--r--rules/xorg-proto-dmx.in6
-rw-r--r--rules/xorg-proto-dmx.make40
-rw-r--r--rules/xorg-proto-dri2.in10
-rw-r--r--rules/xorg-proto-dri2.make38
-rw-r--r--rules/xorg-proto-dri3.in4
-rw-r--r--rules/xorg-proto-dri3.make40
-rw-r--r--rules/xorg-proto-evieext.in6
-rw-r--r--rules/xorg-proto-evieext.make40
-rw-r--r--rules/xorg-proto-fixes.in9
-rw-r--r--rules/xorg-proto-fixes.make40
-rw-r--r--rules/xorg-proto-fonts.in6
-rw-r--r--rules/xorg-proto-fonts.make44
-rw-r--r--rules/xorg-proto-gl.in6
-rw-r--r--rules/xorg-proto-gl.make40
-rw-r--r--rules/xorg-proto-input.in6
-rw-r--r--rules/xorg-proto-input.make44
-rw-r--r--rules/xorg-proto-kb.in6
-rw-r--r--rules/xorg-proto-kb.make44
-rw-r--r--rules/xorg-proto-present.in4
-rw-r--r--rules/xorg-proto-present.make39
-rw-r--r--rules/xorg-proto-print.in6
-rw-r--r--rules/xorg-proto-print.make39
-rw-r--r--rules/xorg-proto-randr.in6
-rw-r--r--rules/xorg-proto-randr.make48
-rw-r--r--rules/xorg-proto-record.in6
-rw-r--r--rules/xorg-proto-record.make44
-rw-r--r--rules/xorg-proto-render.in9
-rw-r--r--rules/xorg-proto-render.make51
-rw-r--r--rules/xorg-proto-resource.in6
-rw-r--r--rules/xorg-proto-resource.make40
-rw-r--r--rules/xorg-proto-scrnsaver.in6
-rw-r--r--rules/xorg-proto-scrnsaver.make44
-rw-r--r--rules/xorg-proto-video.in6
-rw-r--r--rules/xorg-proto-video.make48
-rw-r--r--rules/xorg-proto-windowswm.in6
-rw-r--r--rules/xorg-proto-windowswm.make50
-rw-r--r--rules/xorg-proto-x.in6
-rw-r--r--rules/xorg-proto-x.make54
-rw-r--r--rules/xorg-proto-xcmisc.in6
-rw-r--r--rules/xorg-proto-xcmisc.make44
-rw-r--r--rules/xorg-proto-xext.in6
-rw-r--r--rules/xorg-proto-xext.make43
-rw-r--r--rules/xorg-proto-xf86bigfont.in6
-rw-r--r--rules/xorg-proto-xf86bigfont.make51
-rw-r--r--rules/xorg-proto-xf86dga.in6
-rw-r--r--rules/xorg-proto-xf86dga.make51
-rw-r--r--rules/xorg-proto-xf86dri.in6
-rw-r--r--rules/xorg-proto-xf86dri.make40
-rw-r--r--rules/xorg-proto-xf86misc.in6
-rw-r--r--rules/xorg-proto-xf86misc.make51
-rw-r--r--rules/xorg-proto-xf86vidmode.in6
-rw-r--r--rules/xorg-proto-xf86vidmode.make40
-rw-r--r--rules/xorg-proto-xinerama.in6
-rw-r--r--rules/xorg-proto-xinerama.make40
-rw-r--r--rules/xorg-server.in31
135 files changed, 62 insertions, 1966 deletions
diff --git a/rules/host-lndir.in b/rules/host-lndir.in
index 4a52ba31f..7b5101c99 100644
--- a/rules/host-lndir.in
+++ b/rules/host-lndir.in
@@ -3,4 +3,4 @@
config HOST_LNDIR
bool
default y
- select HOST_XORG_PROTO_X
+ select HOST_XORGPROTO
diff --git a/rules/host-makedepend.in b/rules/host-makedepend.in
index f23005c1f..e4c69d3ce 100644
--- a/rules/host-makedepend.in
+++ b/rules/host-makedepend.in
@@ -2,5 +2,5 @@
config HOST_MAKEDEPEND
tristate
- select HOST_XORG_PROTO_X
+ select HOST_XORGPROTO
default ALLYES
diff --git a/rules/host-xorg-app-mkfontscale.in b/rules/host-xorg-app-mkfontscale.in
index 895710144..a90771f24 100644
--- a/rules/host-xorg-app-mkfontscale.in
+++ b/rules/host-xorg-app-mkfontscale.in
@@ -5,5 +5,5 @@ config HOST_XORG_APP_MKFONTSCALE
select HOST_ZLIB
select HOST_XORG_LIB_FONTENC
select HOST_FREETYPE
- select HOST_XORG_PROTO_X
+ select HOST_XORGPROTO
default ALLYES
diff --git a/rules/host-xorg-lib-X11.in b/rules/host-xorg-lib-X11.in
index 22c6815a0..44c1cf31f 100644
--- a/rules/host-xorg-lib-X11.in
+++ b/rules/host-xorg-lib-X11.in
@@ -3,11 +3,8 @@
config HOST_XORG_LIB_X11
tristate
default ALLYES
- select HOST_XORG_PROTO_X
select HOST_LIBXCB
- select HOST_XORG_PROTO_XEXT
- select HOST_XORG_PROTO_KB
- select HOST_XORG_PROTO_INPUT
+ select HOST_XORGPROTO
select HOST_XORG_LIB_XTRANS
diff --git a/rules/host-xorg-lib-Xau.in b/rules/host-xorg-lib-Xau.in
index 2d5bd6c7c..59ff5d0c0 100644
--- a/rules/host-xorg-lib-Xau.in
+++ b/rules/host-xorg-lib-Xau.in
@@ -3,4 +3,4 @@
config HOST_XORG_LIB_XAU
tristate
default ALLYES
- select HOST_XORG_PROTO_X
+ select HOST_XORGPROTO
diff --git a/rules/host-xorg-lib-Xfont.in b/rules/host-xorg-lib-Xfont.in
index 1343febc7..1be4e5eb4 100644
--- a/rules/host-xorg-lib-Xfont.in
+++ b/rules/host-xorg-lib-Xfont.in
@@ -4,7 +4,6 @@ config HOST_XORG_LIB_XFONT
tristate
default ALLYES
select HOST_ZLIB
- select HOST_XORG_PROTO_X
- select HOST_XORG_PROTO_FONTS
+ select HOST_XORGPROTO
select HOST_XORG_LIB_FONTENC
select HOST_XORG_LIB_XTRANS
diff --git a/rules/host-xorg-lib-fontenc.in b/rules/host-xorg-lib-fontenc.in
index adb5be7c8..7b8dbf4a6 100644
--- a/rules/host-xorg-lib-fontenc.in
+++ b/rules/host-xorg-lib-fontenc.in
@@ -3,5 +3,5 @@
config HOST_XORG_LIB_FONTENC
tristate
select HOST_ZLIB
- select HOST_XORG_PROTO_X
+ select HOST_XORGPROTO
default ALLYES
diff --git a/rules/host-xorg-lib-xkbfile.in b/rules/host-xorg-lib-xkbfile.in
index c3f48ed9d..cd7ea994b 100644
--- a/rules/host-xorg-lib-xkbfile.in
+++ b/rules/host-xorg-lib-xkbfile.in
@@ -3,5 +3,5 @@
config HOST_XORG_LIB_XKBFILE
tristate
select HOST_XORG_LIB_X11
- select HOST_XORG_PROTO_KB
+ select HOST_XORGPROTO
default ALLYES
diff --git a/rules/host-xorg-proto-bigreqs.in b/rules/host-xorg-proto-bigreqs.in
deleted file mode 100644
index 5119c0e0d..000000000
--- a/rules/host-xorg-proto-bigreqs.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_BIGREQS
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-bigreqs.make b/rules/host-xorg-proto-bigreqs.make
deleted file mode 100644
index 3b01c6c11..000000000
--- a/rules/host-xorg-proto-bigreqs.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_BIGREQS) += host-xorg-proto-bigreqs
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_BIGREQS_DIR = $(HOST_BUILDDIR)/$(XORG_PROTO_BIGREQS)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_BIGREQS_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_BIGREQS_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_BIGREQS_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/host-xorg-proto-fonts.in b/rules/host-xorg-proto-fonts.in
deleted file mode 100644
index 836410787..000000000
--- a/rules/host-xorg-proto-fonts.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_FONTS
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-fonts.make b/rules/host-xorg-proto-fonts.make
deleted file mode 100644
index 46a372179..000000000
--- a/rules/host-xorg-proto-fonts.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de>
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_FONTS) += host-xorg-proto-fonts
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_FONTS_DIR = $(HOST_BUILDDIR)/$(XORG_PROTO_FONTS)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_FONTS_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_FONTS_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_FONTS_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/host-xorg-proto-input.in b/rules/host-xorg-proto-input.in
deleted file mode 100644
index 07e500d71..000000000
--- a/rules/host-xorg-proto-input.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_INPUT
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-input.make b/rules/host-xorg-proto-input.make
deleted file mode 100644
index ff49b0e53..000000000
--- a/rules/host-xorg-proto-input.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_INPUT) += host-xorg-proto-input
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_INPUT_DIR = $(HOST_BUILDDIR)/$(XORG_PROTO_INPUT)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_INPUT_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_INPUT_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_INPUT_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/host-xorg-proto-kb.in b/rules/host-xorg-proto-kb.in
deleted file mode 100644
index 5471a1df9..000000000
--- a/rules/host-xorg-proto-kb.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_KB
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-kb.make b/rules/host-xorg-proto-kb.make
deleted file mode 100644
index 5d31eee66..000000000
--- a/rules/host-xorg-proto-kb.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_KB) += host-xorg-proto-kb
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_KB_DIR = $(HOST_BUILDDIR)/$(XORG_PROTO_KB)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_KB_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_KB_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_KB_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/host-xorg-proto-x.in b/rules/host-xorg-proto-x.in
deleted file mode 100644
index 95034f291..000000000
--- a/rules/host-xorg-proto-x.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_X
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-x.make b/rules/host-xorg-proto-x.make
deleted file mode 100644
index cc0579fa6..000000000
--- a/rules/host-xorg-proto-x.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-LAZY_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_X) += host-xorg-proto-x
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_X_DIR = $(HOST_BUILDDIR)/$(XORG_PROTO_X)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_X_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_X_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_X_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/host-xorg-proto-xcmisc.in b/rules/host-xorg-proto-xcmisc.in
deleted file mode 100644
index cc92fc76f..000000000
--- a/rules/host-xorg-proto-xcmisc.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_XCMISC
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-xcmisc.make b/rules/host-xorg-proto-xcmisc.make
deleted file mode 100644
index 791dfe77c..000000000
--- a/rules/host-xorg-proto-xcmisc.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_XCMISC) += host-xorg-proto-xcmisc
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_XCMISC_DIR = $(HOST_BUILDDIR)/$(XORG_PROTO_XCMISC)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_XCMISC_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_XCMISC_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_XCMISC_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/host-xorg-proto-xext.in b/rules/host-xorg-proto-xext.in
deleted file mode 100644
index 9a4d96270..000000000
--- a/rules/host-xorg-proto-xext.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XORG_PROTO_XEXT
- tristate
- default ALLYES
diff --git a/rules/host-xorg-proto-xext.make b/rules/host-xorg-proto-xext.make
deleted file mode 100644
index 5a76eb710..000000000
--- a/rules/host-xorg-proto-xext.make
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_XORG_PROTO_XEXT) += host-xorg-proto-xext
-
-#
-# Paths and names
-#
-HOST_XORG_PROTO_XEXT = $(XORG_PROTO_XEXT)
-HOST_XORG_PROTO_XEXT_DIR = $(HOST_BUILDDIR)/$(HOST_XORG_PROTO_XEXT)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_XORG_PROTO_XEXT_PATH := PATH=$(HOST_PATH)
-HOST_XORG_PROTO_XEXT_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_XORG_PROTO_XEXT_AUTOCONF := \
- $(HOST_AUTOCONF) \
- --disable-specs
-
-# vim: syntax=make
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 6b7b59a30..f8e67701e 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -22,13 +22,12 @@ menuconfig MESALIB
select LIBDRM_FREEDRENO if MESALIB_DRI_FREEDRENO
select LIBDRM_ETNAVIV if MESALIB_DRI_ETNAVIV
select LM_SENSORS if MESALIB_LMSENSORS
- select XORG_PROTO_DRI2 if MESALIB_GLX
+ select XORGPROTO if MESALIB_GLX
select XORG_LIB_X11 if MESALIB_GLX
select XORG_LIB_XEXT if MESALIB_GLX
select XORG_LIB_XXF86VM if MESALIB_GLX
select XORG_LIB_XDAMAGE if MESALIB_GLX
select XORG_LIB_XFIXES if MESALIB_GLX
- select XORG_PROTO_GL if MESALIB_GLX
select EXPAT
select ZLIB
help
diff --git a/rules/qt4.in b/rules/qt4.in
index 2e39c2a48..8371f0d55 100644
--- a/rules/qt4.in
+++ b/rules/qt4.in
@@ -29,19 +29,15 @@ menuconfig QT4
select XORG_LIB_X11 if QT4_PLATFORM_X11
select XORG_LIB_SM if QT4_X11_SM
- select XORG_PROTO_XEXT if QT4_X11_XSHAPE
- select XORG_PROTO_XEXT if QT4_X11_XSYNC
+ select XORGPROTO if QT4_PLATFORM_X11
select XORG_LIB_XINERAMA if QT4_X11_XINERAMA
select XORG_LIB_XCURSOR if QT4_X11_XCURSOR
select XORG_LIB_XFIXES if QT4_X11_XFIXES
select XORG_LIB_XRANDR if QT4_X11_XRANDR
select XORG_LIB_XRENDER if QT4_X11_XRENDER
- select XORG_PROTO_XEXT if QT4_X11_MITSHM
select FONTCONFIG if QT4_X11_FONTCONFIG
select FREETYPE if QT4_X11_FONTCONFIG
- select XORG_PROTO_INPUT if QT4_X11_XINPUT
select XORG_LIB_XI if QT4_X11_XINPUT
- select XORG_PROTO_KB if QT4_X11_XKB
select XORG_LIB_XKBUI if QT4_X11_XKB
prompt "qt "
diff --git a/rules/xcb-util.in b/rules/xcb-util.in
index 383d031fc..7063eba6f 100644
--- a/rules/xcb-util.in
+++ b/rules/xcb-util.in
@@ -3,7 +3,7 @@
config XCB_UTIL
tristate
select LIBC_PTHREAD
- select XORG_PROTO_X
+ select XORGPROTO
select XCB_PROTO
select LIBXCB
select HOST_GPERF
diff --git a/rules/xorg-app-xev.in b/rules/xorg-app-xev.in
index 6f7f917c4..a521a1995 100644
--- a/rules/xorg-app-xev.in
+++ b/rules/xorg-app-xev.in
@@ -5,7 +5,7 @@ config XORG_APP_XEV
prompt "xorg xev"
select XORG_LIB_X11
select XORG_LIB_XRANDR
- select XORG_PROTO_X
+ select XORGPROTO
help
Xev creates a window and then asks the X server to send it events
whenever anything happens to the window (such as it being moved,
diff --git a/rules/xorg-app-xinput.in b/rules/xorg-app-xinput.in
index db7b5c49e..876bef4ef 100644
--- a/rules/xorg-app-xinput.in
+++ b/rules/xorg-app-xinput.in
@@ -7,7 +7,7 @@ config XORG_APP_XINPUT
select XORG_LIB_XI
select XORG_LIB_XINERAMA
select XORG_LIB_XRANDR
- select XORG_PROTO_INPUT
+ select XORGPROTO
prompt "xinput"
help
Xinput is an utility for configuring and testing XInput
diff --git a/rules/xorg-driver-input-evdev.in b/rules/xorg-driver-input-evdev.in
index 249654047..a064d0561 100644
--- a/rules/xorg-driver-input-evdev.in
+++ b/rules/xorg-driver-input-evdev.in
@@ -4,8 +4,7 @@ config XORG_DRIVER_INPUT_EVDEV
tristate
prompt "evdev"
depends on XORG_DRIVER_INPUT
- select XORG_PROTO_X
- select XORG_PROTO_INPUT
+ select XORGPROTO
select UDEV
select UDEV_LIBUDEV
select LIBEVDEV
diff --git a/rules/xorg-driver-input-keyboard.in b/rules/xorg-driver-input-keyboard.in
index c9317f893..e1f1446ea 100644
--- a/rules/xorg-driver-input-keyboard.in
+++ b/rules/xorg-driver-input-keyboard.in
@@ -4,10 +4,7 @@ config XORG_DRIVER_INPUT_KEYBOARD
tristate
prompt "Keyboard"
depends on XORG_DRIVER_INPUT
- select XORG_PROTO_X
- select XORG_PROTO_RANDR
- select XORG_PROTO_INPUT
- select XORG_PROTO_KB
+ select XORGPROTO
select XORG_SERVER
select XORG_SERVER_XORG
help
diff --git a/rules/xorg-driver-input-mouse.in b/rules/xorg-driver-input-mouse.in
index f0451a89b..25804ce4d 100644
--- a/rules/xorg-driver-input-mouse.in
+++ b/rules/xorg-driver-input-mouse.in
@@ -3,7 +3,7 @@
config XORG_DRIVER_INPUT_MOUSE
tristate
depends on XORG_DRIVER_INPUT
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_SERVER
select XORG_SERVER_XORG
prompt "Mouse"
diff --git a/rules/xorg-driver-video-apm.in b/rules/xorg-driver-video-apm.in
index 92bd94872..3f001ea34 100644
--- a/rules/xorg-driver-video-apm.in
+++ b/rules/xorg-driver-video-apm.in
@@ -7,8 +7,7 @@ config XORG_DRIVER_VIDEO_APM
depends on XORG_DRIVER_VIDEO
select XORG_SERVER
select XORG_SERVER_XORG
- select XORG_PROTO_X
- select XORG_PROTO_FONTS
+ select XORGPROTO
prompt "APM"
help
This is the Alliance ProMotion video driver for the modular Xorg server.
diff --git a/rules/xorg-driver-video-ati.in b/rules/xorg-driver-video-ati.in
index 51dd29d49..e7c32fc1e 100644
--- a/rules/xorg-driver-video-ati.in
+++ b/rules/xorg-driver-video-ati.in
@@ -8,18 +8,11 @@ config XORG_DRIVER_VIDEO_ATI
select XORG_SERVER
select XORG_SERVER_XORG
- select XORG_PROTO_X
- select XORG_PROTO_FONTS
- select XORG_PROTO_XF86DRI
+ select XORGPROTO
select XORG_SERVER_EXT_XV
select XORG_SERVER_EXT_DRI
select XORG_SERVER_EXT_COMPOSITE
- select XORG_PROTO_RANDR
- select XORG_PROTO_RENDER
- select XORG_PROTO_VIDEO
- select XORG_PROTO_XEXT
-
select LIBDRM
select LIBDRM_RADEON
diff --git a/rules/xorg-driver-video-dummy.in b/rules/xorg-driver-video-dummy.in
index 7224685a7..b2c837296 100644
--- a/rules/xorg-driver-video-dummy.in
+++ b/rules/xorg-driver-video-dummy.in
@@ -5,7 +5,7 @@ config XORG_DRIVER_VIDEO_DUMMY
depends on XORG_DRIVER_VIDEO
select XORG_SERVER
select XORG_SERVER_XORG
- select XORG_PROTO_FONTS
+ select XORGPROTO
prompt "Dummy"
help
This package contains the X.Org xf86-video-dummy driver.
diff --git a/rules/xorg-driver-video-fbdev.in b/rules/xorg-driver-video-fbdev.in
index 50451375c..f1978d9e5 100644
--- a/rules/xorg-driver-video-fbdev.in
+++ b/rules/xorg-driver-video-fbdev.in
@@ -5,10 +5,7 @@ config XORG_DRIVER_VIDEO_FBDEV
depends on XORG_DRIVER_VIDEO
select XORG_SERVER
select XORG_SERVER_XORG
- select XORG_PROTO_FONTS
- select XORG_PROTO_RANDR
- select XORG_PROTO_RENDER
- select XORG_PROTO_VIDEO
+ select XORGPROTO
select XORG_SERVER_EXT_DGA
select XORG_SERVER_EXT_XV
prompt "FBDev"
diff --git a/rules/xorg-driver-video-intel.in b/rules/xorg-driver-video-intel.in
index 16a3072d3..c112fc731 100644
--- a/rules/xorg-driver-video-intel.in
+++ b/rules/xorg-driver-video-intel.in
@@ -10,23 +10,17 @@ menuconfig XORG_DRIVER_VIDEO_INTEL
select PIXMAN
select XCB_UTIL
select XORG_LIB_X11
- select XORG_PROTO_FONTS
- select XORG_PROTO_RANDR
- select XORG_PROTO_RENDER
- select XORG_PROTO_X
- select XORG_PROTO_XEXT
+ select XORGPROTO
select XORG_SERVER
select XORG_SERVER_XORG
# Xorg segfaults without XV extension
select XORG_SERVER_EXT_XV
- select XORG_PROTO_DRI2 if XORG_DRIVER_VIDEO_INTEL_DRI
select XORG_SERVER_EXT_DRI2 if XORG_DRIVER_VIDEO_INTEL_DRI
select XORG_SERVER_EXT_GLX if XORG_DRIVER_VIDEO_INTEL_DRI
select XORG_LIB_XVMC if XORG_DRIVER_VIDEO_INTEL_XVMC
- select XORG_PROTO_DRI2 if XORG_DRIVER_VIDEO_INTEL_XVMC
select XORG_SERVER_EXT_DRI2 if XORG_DRIVER_VIDEO_INTEL_XVMC
select XORG_SERVER_EXT_XVMC if XORG_DRIVER_VIDEO_INTEL_XVMC
select LIBXCB if XORG_DRIVER_VIDEO_INTEL_XVMC
diff --git a/rules/xorg-driver-video-vesa.in b/rules/xorg-driver-video-vesa.in
index 8f07df718..92e59ddd6 100644
--- a/rules/xorg-driver-video-vesa.in
+++ b/rules/xorg-driver-video-vesa.in
@@ -7,8 +7,7 @@ config XORG_DRIVER_VIDEO_VESA
depends on XORG_DRIVER_VIDEO
select XORG_SERVER
select XORG_SERVER_EXT_DGA
- select XORG_PROTO_X
- select XORG_PROTO_FONTS
+ select XORGPROTO
prompt "VESA"
help
This is the VESA video driver for the modular Xorg server.
diff --git a/rules/xorg-lib-FS.in b/rules/xorg-lib-FS.in
index a1bb14f1e..4ecd55a78 100644
--- a/rules/xorg-lib-FS.in
+++ b/rules/xorg-lib-FS.in
@@ -3,8 +3,7 @@
config XORG_LIB_FS
tristate
prompt "libFS"
- select XORG_PROTO_X
- select XORG_PROTO_FONTS
+ select XORGPROTO
select XORG_LIB_XTRANS
help
libFS, the Font Services library, provides various
diff --git a/rules/xorg-lib-ICE.in b/rules/xorg-lib-ICE.in
index 4e74348e4..89dd795ad 100644
--- a/rules/xorg-lib-ICE.in
+++ b/rules/xorg-lib-ICE.in
@@ -3,7 +3,7 @@
config XORG_LIB_ICE
tristate
prompt "libICE"
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_LIB_XTRANS
help
X Inter Client Exchange Library
diff --git a/rules/xorg-lib-SM.in b/rules/xorg-lib-SM.in
index 09fb240b0..dab9f2fea 100644
--- a/rules/xorg-lib-SM.in
+++ b/rules/xorg-lib-SM.in
@@ -4,6 +4,6 @@ config XORG_LIB_SM
tristate
prompt "libSM"
select XORG_LIB_ICE
- select XORG_PROTO_X
+ select XORGPROTO
help
X Session Management Library
diff --git a/rules/xorg-lib-WindowsWM.in b/rules/xorg-lib-WindowsWM.in
index 956ff98bb..33a05df2a 100644
--- a/rules/xorg-lib-WindowsWM.in
+++ b/rules/xorg-lib-WindowsWM.in
@@ -4,8 +4,7 @@ config XORG_LIB_WINDOWSWM
tristate
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_XEXT
- select XORG_PROTO_WINDOWSWM
+ select XORGPROTO
prompt "libWindowsWM"
help
The WindowsWM Library
diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in
index 01ef02fde..ce7a2b9a7 100644
--- a/rules/xorg-lib-X11.in
+++ b/rules/xorg-lib-X11.in
@@ -4,17 +4,11 @@ menuconfig XORG_LIB_X11
tristate
prompt "libX11 "
select LIBC_DL
- select XORG_PROTO_X
- select XORG_PROTO_XEXT
+ select XORGPROTO
select XORG_LIB_XDMCP if !XORG_LIB_X11_XCB_LOW_LEVEL
select XORG_LIB_XAU if !XORG_LIB_X11_XCB_LOW_LEVEL
- select XORG_PROTO_XCMISC if !XORG_LIB_X11_XCB_LOW_LEVEL
- select XORG_PROTO_BIGREQS if !XORG_LIB_X11_XCB_LOW_LEVEL
select LIBXCB
select XORG_LIB_XTRANS
- select XORG_PROTO_XF86BIGFONT if XORG_LIB_X11_XF86BIGFONT
- select XORG_PROTO_INPUT if XORG_LIB_X11_XKB
- select XORG_PROTO_KB if XORG_LIB_X11_XKB
select LIBC_PTHREAD
help
This is the main X library
diff --git a/rules/xorg-lib-XScrnSaver.in b/rules/xorg-lib-XScrnSaver.in
index 71013e8c8..f362a2ffb 100644
--- a/rules/xorg-lib-XScrnSaver.in
+++ b/rules/xorg-lib-XScrnSaver.in
@@ -5,7 +5,7 @@ config XORG_LIB_XSCRNSAVER
prompt "libXScrnSaver"
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_SCRNSAVER
+ select XORGPROTO
help
libXScrnSaver provides access to the MIT-SCREEN-SAVER extension of the
X protocol. The Screen Saver extension allows clients behaving as
diff --git a/rules/xorg-lib-Xau.in b/rules/xorg-lib-Xau.in
index ccd00a1a8..1c5018e99 100644
--- a/rules/xorg-lib-Xau.in
+++ b/rules/xorg-lib-Xau.in
@@ -2,7 +2,7 @@
menuconfig XORG_LIB_XAU
tristate
- select XORG_PROTO_X
+ select XORGPROTO
prompt "libXau "
help
A Sample Authorization Protocol for X for basic authorization.
diff --git a/rules/xorg-lib-Xaw.in b/rules/xorg-lib-Xaw.in
index 2f2abd0ca..45ebab758 100644
--- a/rules/xorg-lib-Xaw.in
+++ b/rules/xorg-lib-Xaw.in
@@ -7,7 +7,7 @@ menuconfig XORG_LIB_XAW
select XORG_LIB_XMU
select XORG_LIB_XPM
select XORG_LIB_XEXT
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_LIB_XAW_V7 if !XORG_LIB_XAW_V6
prompt "libXaw "
help
diff --git a/rules/xorg-lib-Xcomposite.in b/rules/xorg-lib-Xcomposite.in
index 6495209e9..7b34330e8 100644
--- a/rules/xorg-lib-Xcomposite.in
+++ b/rules/xorg-lib-Xcomposite.in
@@ -3,11 +3,10 @@
config XORG_LIB_XCOMPOSITE
tristate
prompt "libXcomposite"
- select XORG_PROTO_COMPOSITE
+ select XORGPROTO
select XORG_LIB_X11
select XORG_LIB_XFIXES
select XORG_LIB_XEXT
- select XORG_PROTO_FIXES
help
The X Composite extension adds support for translucent windows and
non-rectangular windows with anti-aliased edges to the X window system.
diff --git a/rules/xorg-lib-Xcursor.in b/rules/xorg-lib-Xcursor.in
index 15e8bbcc1..d47ee1470 100644
--- a/rules/xorg-lib-Xcursor.in
+++ b/rules/xorg-lib-Xcursor.in
@@ -5,7 +5,7 @@ config XORG_LIB_XCURSOR
select XORG_LIB_XRENDER
select XORG_LIB_XFIXES
select XORG_LIB_X11
- select XORG_PROTO_FIXES
+ select XORGPROTO
prompt "libXcursor"
help
The Xcursor library provides support for colored and animated cursor themes.
diff --git a/rules/xorg-lib-Xdamage.in b/rules/xorg-lib-Xdamage.in
index bf3f3fcfc..f4775427a 100644
--- a/rules/xorg-lib-Xdamage.in
+++ b/rules/xorg-lib-Xdamage.in
@@ -3,9 +3,7 @@
config XORG_LIB_XDAMAGE
tristate
prompt "libXdamage"
- select XORG_PROTO_DAMAGE
- select XORG_PROTO_FIXES
- select XORG_PROTO_XEXT
+ select XORGPROTO
select XORG_LIB_XFIXES
help
The X Damage Extension provides notifications to applications when the content
diff --git a/rules/xorg-lib-Xdmcp.in b/rules/xorg-lib-Xdmcp.in
index fc57d8b26..332c15120 100644
--- a/rules/xorg-lib-Xdmcp.in
+++ b/rules/xorg-lib-Xdmcp.in
@@ -3,6 +3,6 @@
config XORG_LIB_XDMCP
tristate
prompt "libXdmcp"
- select XORG_PROTO_X
+ select XORGPROTO
help
X Display Manager Control Protocol library
diff --git a/rules/xorg-lib-Xevie.in b/rules/xorg-lib-Xevie.in
index da97b494c..9aa9b5ac8 100644
--- a/rules/xorg-lib-Xevie.in
+++ b/rules/xorg-lib-Xevie.in
@@ -7,7 +7,7 @@ config XORG_LIB_XEVIE
prompt "libXevie"
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_EVIEEXT
+ select XORGPROTO
help
XEvIE - X Event Interception Extension
diff --git a/rules/xorg-lib-Xext.in b/rules/xorg-lib-Xext.in
index 53695cc4b..514943dea 100644
--- a/rules/xorg-lib-Xext.in
+++ b/rules/xorg-lib-Xext.in
@@ -3,9 +3,8 @@
config XORG_LIB_XEXT
tristate
prompt "libXext"
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_LIB_X11
- select XORG_PROTO_XEXT
select XORG_LIB_XAU
select XORG_LIB_XDMCP
help
diff --git a/rules/xorg-lib-Xfixes.in b/rules/xorg-lib-Xfixes.in
index b24860d4e..ff32c24a2 100644
--- a/rules/xorg-lib-Xfixes.in
+++ b/rules/xorg-lib-Xfixes.in
@@ -3,9 +3,7 @@
config XORG_LIB_XFIXES
tristate
prompt "libXfixes"
- select XORG_PROTO_X
- select XORG_PROTO_FIXES
- select XORG_PROTO_XEXT
+ select XORGPROTO
select XORG_LIB_X11
help
The X Fixes extension was created to address a number of shortcomings in the
diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in
index cdc66e7b2..0267ca7f2 100644
--- a/rules/xorg-lib-Xfont.in
+++ b/rules/xorg-lib-Xfont.in
@@ -8,8 +8,7 @@
menuconfig XORG_LIB_XFONT
tristate
select LIBC_M
- select XORG_PROTO_X
- select XORG_PROTO_FONTS
+ select XORGPROTO
select XORG_LIB_FONTENC
select XORG_LIB_XTRANS
select ZLIB if XORG_LIB_XFONT_BUILTIN_FONTS
diff --git a/rules/xorg-lib-Xft.in b/rules/xorg-lib-Xft.in
index 9532dcc12..c2633e215 100644
--- a/rules/xorg-lib-Xft.in
+++ b/rules/xorg-lib-Xft.in
@@ -5,7 +5,7 @@ config XORG_LIB_XFT
select FREETYPE
select FONTCONFIG
select XORG_LIB_XRENDER
- select XORG_PROTO_X
+ select XORGPROTO
prompt "libXft"
help
This library is the X Font Library 2.x. (previous versions are called
diff --git a/rules/xorg-lib-Xi.in b/rules/xorg-lib-Xi.in
index 12c70ba19..0677aaa9a 100644
--- a/rules/xorg-lib-Xi.in
+++ b/rules/xorg-lib-Xi.in
@@ -3,11 +3,10 @@
config XORG_LIB_XI
tristate
prompt "libXi"
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_LIB_X11
select XORG_LIB_XEXT
select XORG_LIB_XFIXES
- select XORG_PROTO_INPUT
help
libXi provides an X Window System client interface
to the XINPUT extension to the X protocol.
diff --git a/rules/xorg-lib-Xinerama.in b/rules/xorg-lib-Xinerama.in
index 353ae9254..f8a580a44 100644
--- a/rules/xorg-lib-Xinerama.in
+++ b/rules/xorg-lib-Xinerama.in
@@ -5,7 +5,7 @@ config XORG_LIB_XINERAMA
prompt "libXinerama"
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_XINERAMA
+ select XORGPROTO
help
libXinerama provides an X Window System client interface
to the XINERAMA extension to the X protocol.
diff --git a/rules/xorg-lib-Xmu.in b/rules/xorg-lib-Xmu.in
index 0ab0b55c5..901c6de4d 100644
--- a/rules/xorg-lib-Xmu.in
+++ b/rules/xorg-lib-Xmu.in
@@ -5,7 +5,7 @@ config XORG_LIB_XMU
prompt "libXmu"
select XORG_LIB_XT
select XORG_LIB_XEXT
- select XORG_PROTO_XEXT
+ select XORGPROTO
help
This library contains miscellaneous utilities and is not part of the
Xlib standard. It contains routines which only use public interfaces
diff --git a/rules/xorg-lib-Xp.in b/rules/xorg-lib-Xp.in
index e7c37c22a..6cb8959e7 100644
--- a/rules/xorg-lib-Xp.in
+++ b/rules/xorg-lib-Xp.in
@@ -8,7 +8,7 @@ config XORG_LIB_XP
select XORG_LIB_X11
select XORG_LIB_XEXT
select XORG_LIB_XAU
- select XORG_PROTO_PRINT
+ select XORGPROTO
help
libXp - X Print Client Library: libXp provides public APIs to allow
client applications to render to non-display devices.
diff --git a/rules/xorg-lib-Xpm.in b/rules/xorg-lib-Xpm.in
index ff725ef93..9934bf882 100644
--- a/rules/xorg-lib-Xpm.in
+++ b/rules/xorg-lib-Xpm.in
@@ -4,7 +4,7 @@ config XORG_LIB_XPM
tristate
prompt "libXpm"
select XORG_LIB_X11
- select XORG_PROTO_X
+ select XORGPROTO
help
The XPM (X PixMap) library is a format for storing/retrieving X pixmaps
to/from files.
diff --git a/rules/xorg-lib-XprintAppUtil.in b/rules/xorg-lib-XprintAppUtil.in
index 0c10a9b84..2f4b61ff2 100644
--- a/rules/xorg-lib-XprintAppUtil.in
+++ b/rules/xorg-lib-XprintAppUtil.in
@@ -7,7 +7,7 @@ config XORG_LIB_XPRINTAPPUTIL
select XORG_LIB_X11
select XORG_LIB_XP
select XORG_LIB_XPRINTUTIL
- select XORG_PROTO_PRINT
+ select XORGPROTO
select XORG_LIB_XAU
prompt "libXprintAppUtil"
help
diff --git a/rules/xorg-lib-XprintUtil.in b/rules/xorg-lib-XprintUtil.in
index 988dec485..e8cdf1957 100644
--- a/rules/xorg-lib-XprintUtil.in
+++ b/rules/xorg-lib-XprintUtil.in
@@ -8,7 +8,7 @@ config XORG_LIB_XPRINTUTIL
select XORG_LIB_X11
select XORG_LIB_XT
select XORG_LIB_XAU
- select XORG_PROTO_PRINT
+ select XORGPROTO
select XORG_LIB_XP
help
Xprint printer utility client library
diff --git a/rules/xorg-lib-Xrandr.in b/rules/xorg-lib-Xrandr.in
index ecb5ef579..e4b4204ff 100644
--- a/rules/xorg-lib-Xrandr.in
+++ b/rules/xorg-lib-Xrandr.in
@@ -6,7 +6,7 @@ config XORG_LIB_XRANDR
select XORG_LIB_X11
select XORG_LIB_XEXT
select XORG_LIB_XRENDER
- select XORG_PROTO_RANDR
+ select XORGPROTO
help
X Resize, Rotate and Reflection extension. This extension library lets
you change resolution and colour depth at the X-server's runtime.
diff --git a/rules/xorg-lib-Xrender.in b/rules/xorg-lib-Xrender.in
index 744c83507..64a0cf90a 100644
--- a/rules/xorg-lib-Xrender.in
+++ b/rules/xorg-lib-Xrender.in
@@ -5,7 +5,7 @@ config XORG_LIB_XRENDER
prompt "libXrender"
select XORG_LIB_X11
select XORG_LIB_XDMCP
- select XORG_PROTO_RENDER
+ select XORGPROTO
help
The X Render Extension adds support for alpha-blended icons, anti-aliased
fonts and drawing primitives, as well as true-color animated mouse cursors
diff --git a/rules/xorg-lib-Xres.in b/rules/xorg-lib-Xres.in
index 520186833..54aafe008 100644
--- a/rules/xorg-lib-Xres.in
+++ b/rules/xorg-lib-Xres.in
@@ -3,9 +3,8 @@
config XORG_LIB_XRES
tristate
prompt "libXres"
- select XORG_PROTO_RESOURCE
+ select XORGPROTO
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_XEXT
help
X-Resource extension client library
diff --git a/rules/xorg-lib-Xt.in b/rules/xorg-lib-Xt.in
index 370f509b0..155685387 100644
--- a/rules/xorg-lib-Xt.in
+++ b/rules/xorg-lib-Xt.in
@@ -3,12 +3,10 @@
config XORG_LIB_XT
tristate
prompt "libXt"
- select HOST_XORG_PROTO_X
- select XORG_PROTO_X
- select XORG_PROTO_KB
+ select HOST_XORGPROTO
+ select XORGPROTO
select XORG_LIB_X11
select XORG_LIB_SM
select XORG_LIB_XDMCP
- select XORG_PROTO_KB if XORG_KEYBOARD_MAPPING_SUPPORT
help
X Toolkit Library
diff --git a/rules/xorg-lib-Xtst.in b/rules/xorg-lib-Xtst.in
index 20f4c65b2..05f8c90ec 100644
--- a/rules/xorg-lib-Xtst.in
+++ b/rules/xorg-lib-Xtst.in
@@ -3,9 +3,7 @@
config XORG_LIB_XTST
tristate
prompt "libXtst"
- select XORG_PROTO_RECORD
- select XORG_PROTO_INPUT
- select XORG_PROTO_XEXT
+ select XORGPROTO
select XORG_LIB_X11
select XORG_LIB_XEXT
select XORG_LIB_XI
diff --git a/rules/xorg-lib-Xv.in b/rules/xorg-lib-Xv.in
index d3f6aa2c8..b75c07a53 100644
--- a/rules/xorg-lib-Xv.in
+++ b/rules/xorg-lib-Xv.in
@@ -9,8 +9,7 @@ config XORG_LIB_XV
prompt "libXv"
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_XEXT
- select XORG_PROTO_VIDEO
+ select XORGPROTO
help
The Xv extension provides support for video adaptors attached to an X
display. It takes the approach that a display may have one or more video
diff --git a/rules/xorg-lib-XvMC.in b/rules/xorg-lib-XvMC.in
index 2eb31da43..c3174caa0 100644
--- a/rules/xorg-lib-XvMC.in
+++ b/rules/xorg-lib-XvMC.in
@@ -6,8 +6,7 @@ config XORG_LIB_XVMC
select XORG_LIB_X11
select XORG_LIB_XEXT
select XORG_LIB_XV
- select XORG_PROTO_XEXT
- select XORG_PROTO_VIDEO
+ select XORGPROTO
help
libXvMC provides an X Window System client
interface to the XVideo-MotionCompensation
diff --git a/rules/xorg-lib-Xxf86dga.in b/rules/xorg-lib-Xxf86dga.in
index c0c016f87..e7ea80609 100644
--- a/rules/xorg-lib-Xxf86dga.in
+++ b/rules/xorg-lib-Xxf86dga.in
@@ -5,7 +5,7 @@ config XORG_LIB_XXF86DGA
prompt "libXxf86dga"
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_XF86DGA
+ select XORGPROTO
help
libXxf86dga provides the XFree86-DGA extension,
which allows direct graphics access to a
diff --git a/rules/xorg-lib-Xxf86misc.in b/rules/xorg-lib-Xxf86misc.in
index f3d99cef0..c8340eb9c 100644
--- a/rules/xorg-lib-Xxf86misc.in
+++ b/rules/xorg-lib-Xxf86misc.in
@@ -3,9 +3,7 @@
config XORG_LIB_XXF86MISC
tristate
prompt "libXxf86misc"
- select XORG_PROTO_X
- select XORG_PROTO_XEXT
- select XORG_PROTO_XF86MISC
+ select XORGPROTO
select XORG_LIB_XEXT
select XORG_LIB_X11
help
diff --git a/rules/xorg-lib-Xxf86vm.in b/rules/xorg-lib-Xxf86vm.in
index ae748c037..10f880526 100644
--- a/rules/xorg-lib-Xxf86vm.in
+++ b/rules/xorg-lib-Xxf86vm.in
@@ -3,11 +3,9 @@
config XORG_LIB_XXF86VM
tristate
prompt "libXxf86vm"
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_LIB_X11
- select XORG_PROTO_XEXT
select XORG_LIB_XEXT
- select XORG_PROTO_XF86VIDMODE
help
libXxf86vm provides an interface to the
XFree86-VidModeExtension extension, which
diff --git a/rules/xorg-lib-dmx.in b/rules/xorg-lib-dmx.in
index b075ea8aa..cfb142dec 100644
--- a/rules/xorg-lib-dmx.in
+++ b/rules/xorg-lib-dmx.in
@@ -4,7 +4,7 @@ config XORG_LIB_DMX
tristate
select XORG_LIB_X11
select XORG_LIB_XEXT
- select XORG_PROTO_DMX
+ select XORGPROTO
prompt "libdmx"
help
X Window System DMX (Distributed Multihead X) extension. The DMX
diff --git a/rules/xorg-lib-fontenc.in b/rules/xorg-lib-fontenc.in
index 674116474..d5b2dd431 100644
--- a/rules/xorg-lib-fontenc.in
+++ b/rules/xorg-lib-fontenc.in
@@ -3,7 +3,7 @@
config XORG_LIB_FONTENC
tristate
select ZLIB
- select XORG_PROTO_X
+ select XORGPROTO
prompt "libfontenc"
help
libfontenc is a library which helps font libraries
diff --git a/rules/xorg-lib-xkbfile.in b/rules/xorg-lib-xkbfile.in
index 4e2bedb38..7462dc1ce 100644
--- a/rules/xorg-lib-xkbfile.in
+++ b/rules/xorg-lib-xkbfile.in
@@ -5,7 +5,7 @@ config XORG_LIB_XKBFILE
prompt "libxkbfile"
select XORG_LIB_X11_XKB
select XORG_LIB_X11
- select XORG_PROTO_KB
+ select XORGPROTO
help
The xkbfile library libxkbfile provides an interface
to read and manipulate description files for XKB,
diff --git a/rules/xorg-lib-xshmfence.in b/rules/xorg-lib-xshmfence.in
index a89562932..b1930c267 100644
--- a/rules/xorg-lib-xshmfence.in
+++ b/rules/xorg-lib-xshmfence.in
@@ -2,7 +2,7 @@
config XORG_LIB_XSHMFENCE
tristate
- select XORG_PROTO_X
+ select XORGPROTO
prompt "libxshmfence"
help
This library provides an interface to shared-memory fences for
diff --git a/rules/xorg-proto-bigreqs.in b/rules/xorg-proto-bigreqs.in
deleted file mode 100644
index bd66187d9..000000000
--- a/rules/xorg-proto-bigreqs.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_BIGREQS
- bool
- help
- BigReqs extension headers
diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make
deleted file mode 100644
index f1f534e24..000000000
--- a/rules/xorg-proto-bigreqs.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_BIGREQS) += xorg-proto-bigreqs
-
-#
-# Paths and names
-#
-XORG_PROTO_BIGREQS_VERSION := 1.1.2
-XORG_PROTO_BIGREQS_MD5 := 1a05fb01fa1d5198894c931cf925c025
-XORG_PROTO_BIGREQS := bigreqsproto-$(XORG_PROTO_BIGREQS_VERSION)
-XORG_PROTO_BIGREQS_SUFFIX := tar.bz2
-XORG_PROTO_BIGREQS_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX))
-XORG_PROTO_BIGREQS_SOURCE := $(SRCDIR)/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
-XORG_PROTO_BIGREQS_DIR := $(BUILDDIR)/$(XORG_PROTO_BIGREQS)
-XORG_PROTO_BIGREQS_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_BIGREQS_CONF_TOOL := autoconf
-XORG_PROTO_BIGREQS_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-composite.in b/rules/xorg-proto-composite.in
deleted file mode 100644
index d92a89735..000000000
--- a/rules/xorg-proto-composite.in
+++ /dev/null
@@ -1,13 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_COMPOSITE
- tristate
- help
- The X Composite extension adds support for translucent windows and
- non-rectangular windows with anti-aliased edges to the X window
- system. It also makes the content of obscured windows available to
- for example desktop pagers, and provides backing store which
- eliminates flicker. It also makes it possible for a composition
- manager to draw dynamic effects on the screen, such as window drop
- shadows.
-
diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make
deleted file mode 100644
index 90d4b997d..000000000
--- a/rules/xorg-proto-composite.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_COMPOSITE) += xorg-proto-composite
-
-#
-# Paths and names
-#
-XORG_PROTO_COMPOSITE_VERSION := 0.4.2
-XORG_PROTO_COMPOSITE_MD5 := 98482f65ba1e74a08bf5b056a4031ef0
-XORG_PROTO_COMPOSITE := compositeproto-$(XORG_PROTO_COMPOSITE_VERSION)
-XORG_PROTO_COMPOSITE_SUFFIX := tar.bz2
-XORG_PROTO_COMPOSITE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX))
-XORG_PROTO_COMPOSITE_SOURCE := $(SRCDIR)/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
-XORG_PROTO_COMPOSITE_DIR := $(BUILDDIR)/$(XORG_PROTO_COMPOSITE)
-XORG_PROTO_COMPOSITE_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_COMPOSITE_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_COMPOSITE_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_COMPOSITE_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-composite.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-damage.in b/rules/xorg-proto-damage.in
deleted file mode 100644
index b72b1d4e5..000000000
--- a/rules/xorg-proto-damage.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_DAMAGE
- tristate
- help
- The X Damage Extension provides notifications to applications when the
- content of the screen or individual windows changes as a result of
- applications drawing on them.
-
diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make
deleted file mode 100644
index 907ea906d..000000000
--- a/rules/xorg-proto-damage.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_DAMAGE) += xorg-proto-damage
-
-#
-# Paths and names
-#
-XORG_PROTO_DAMAGE_VERSION := 1.2.1
-XORG_PROTO_DAMAGE_MD5 := 998e5904764b82642cc63d97b4ba9e95
-XORG_PROTO_DAMAGE := damageproto-$(XORG_PROTO_DAMAGE_VERSION)
-XORG_PROTO_DAMAGE_SUFFIX := tar.bz2
-XORG_PROTO_DAMAGE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX))
-XORG_PROTO_DAMAGE_SOURCE := $(SRCDIR)/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
-XORG_PROTO_DAMAGE_DIR := $(BUILDDIR)/$(XORG_PROTO_DAMAGE)
-XORG_PROTO_DAMAGE_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_DAMAGE_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_DAMAGE_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_DAMAGE_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-damage.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-dmx.in b/rules/xorg-proto-dmx.in
deleted file mode 100644
index 61e5bf96c..000000000
--- a/rules/xorg-proto-dmx.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_DMX
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make
deleted file mode 100644
index 35bfafdc9..000000000
--- a/rules/xorg-proto-dmx.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_DMX) += xorg-proto-dmx
-
-#
-# Paths and names
-#
-XORG_PROTO_DMX_VERSION := 2.3.1
-XORG_PROTO_DMX_MD5 := 4ee175bbd44d05c34d43bb129be5098a
-XORG_PROTO_DMX := dmxproto-$(XORG_PROTO_DMX_VERSION)
-XORG_PROTO_DMX_SUFFIX := tar.bz2
-XORG_PROTO_DMX_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX))
-XORG_PROTO_DMX_SOURCE := $(SRCDIR)/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
-XORG_PROTO_DMX_DIR := $(BUILDDIR)/$(XORG_PROTO_DMX)
-XORG_PROTO_DMX_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_DMX_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-dri2.in b/rules/xorg-proto-dri2.in
deleted file mode 100644
index 4e60dcadd..000000000
--- a/rules/xorg-proto-dri2.in
+++ /dev/null
@@ -1,10 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_DRI2
- tristate
- help
- Direct Rendering Infrastructure 2 Extension
- This extension defines a protocol to securely allow user
- applications to access the video hardware without requiring
- data to be passed through the X server.
-
diff --git a/rules/xorg-proto-dri2.make b/rules/xorg-proto-dri2.make
deleted file mode 100644
index 1f92d3988..000000000
--- a/rules/xorg-proto-dri2.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2009 by Erwin Rol
-# Copyright (C) 2009 by Robert Schwebel
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_DRI2) += xorg-proto-dri2
-
-#
-# Paths and names
-#
-XORG_PROTO_DRI2_VERSION := 2.8
-XORG_PROTO_DRI2_MD5 := b2721d5d24c04d9980a0c6540cb5396a
-XORG_PROTO_DRI2 := dri2proto-$(XORG_PROTO_DRI2_VERSION)
-XORG_PROTO_DRI2_SUFFIX := tar.bz2
-XORG_PROTO_DRI2_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_DRI2).$(XORG_PROTO_DRI2_SUFFIX))
-XORG_PROTO_DRI2_SOURCE := $(SRCDIR)/$(XORG_PROTO_DRI2).$(XORG_PROTO_DRI2_SUFFIX)
-XORG_PROTO_DRI2_DIR := $(BUILDDIR)/$(XORG_PROTO_DRI2)
-XORG_PROTO_DRI2_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_DRI2_CONF_TOOL := autoconf
-
-# vim: syntax=make
diff --git a/rules/xorg-proto-dri3.in b/rules/xorg-proto-dri3.in
deleted file mode 100644
index d0a119366..000000000
--- a/rules/xorg-proto-dri3.in
+++ /dev/null
@@ -1,4 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_DRI3
- tristate
diff --git a/rules/xorg-proto-dri3.make b/rules/xorg-proto-dri3.make
deleted file mode 100644
index cbb7a3b5d..000000000
--- a/rules/xorg-proto-dri3.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2009 by Erwin Rol
-# Copyright (C) 2009 by Robert Schwebel
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_DRI3) += xorg-proto-dri3
-
-#
-# Paths and names
-#
-XORG_PROTO_DRI3_VERSION := 1.0
-XORG_PROTO_DRI3_MD5 := a3d2cbe60a9ca1bf3aea6c93c817fee3
-XORG_PROTO_DRI3 := dri3proto-$(XORG_PROTO_DRI3_VERSION)
-XORG_PROTO_DRI3_SUFFIX := tar.bz2
-XORG_PROTO_DRI3_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_DRI3).$(XORG_PROTO_DRI3_SUFFIX))
-XORG_PROTO_DRI3_SOURCE := $(SRCDIR)/$(XORG_PROTO_DRI3).$(XORG_PROTO_DRI3_SUFFIX)
-XORG_PROTO_DRI3_DIR := $(BUILDDIR)/$(XORG_PROTO_DRI3)
-XORG_PROTO_DRI3_LICENSE := MIT
-XORG_PROTO_DRI3_LICENSE_FILES := \
- file://dri3proto.h;startline=2;endline=20;md5=2dd66dffa047e40483dd101640f3043b
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_DRI3_CONF_TOOL := autoconf
-
-# vim: syntax=make
diff --git a/rules/xorg-proto-evieext.in b/rules/xorg-proto-evieext.in
deleted file mode 100644
index 5807ee026..000000000
--- a/rules/xorg-proto-evieext.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_EVIEEXT
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make
deleted file mode 100644
index 9f2c91275..000000000
--- a/rules/xorg-proto-evieext.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_EVIEEXT) += xorg-proto-evieext
-
-#
-# Paths and names
-#
-XORG_PROTO_EVIEEXT_VERSION := 1.1.1
-XORG_PROTO_EVIEEXT_MD5 := 98bd86a13686f65f0873070fdee6efc7
-XORG_PROTO_EVIEEXT := evieext-$(XORG_PROTO_EVIEEXT_VERSION)
-XORG_PROTO_EVIEEXT_SUFFIX := tar.bz2
-XORG_PROTO_EVIEEXT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX))
-XORG_PROTO_EVIEEXT_SOURCE := $(SRCDIR)/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
-XORG_PROTO_EVIEEXT_DIR := $(BUILDDIR)/$(XORG_PROTO_EVIEEXT)
-XORG_PROTO_EVIEEXT_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_EVIEEXT_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-fixes.in b/rules/xorg-proto-fixes.in
deleted file mode 100644
index 7a4507660..000000000
--- a/rules/xorg-proto-fixes.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_FIXES
- tristate
- help
- The X Fixes extension was created to address a number of shortcomings in
- the core X window system that prevented applications from doing some
- things efficiently.
-
diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make
deleted file mode 100644
index 7cd5d20d2..000000000
--- a/rules/xorg-proto-fixes.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_FIXES) += xorg-proto-fixes
-
-#
-# Paths and names
-#
-XORG_PROTO_FIXES_VERSION := 5.0
-XORG_PROTO_FIXES_MD5 := e7431ab84d37b2678af71e29355e101d
-XORG_PROTO_FIXES := fixesproto-$(XORG_PROTO_FIXES_VERSION)
-XORG_PROTO_FIXES_SUFFIX := tar.bz2
-XORG_PROTO_FIXES_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX))
-XORG_PROTO_FIXES_SOURCE := $(SRCDIR)/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
-XORG_PROTO_FIXES_DIR := $(BUILDDIR)/$(XORG_PROTO_FIXES)
-XORG_PROTO_FIXES_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_FIXES_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-fonts.in b/rules/xorg-proto-fonts.in
deleted file mode 100644
index 65ea9aa24..000000000
--- a/rules/xorg-proto-fonts.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_FONTS
- tristate
- help
- Fonts extension headers
diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make
deleted file mode 100644
index 00ade060e..000000000
--- a/rules/xorg-proto-fonts.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_FONTS) += xorg-proto-fonts
-
-#
-# Paths and names
-#
-XORG_PROTO_FONTS_VERSION := 2.1.3
-XORG_PROTO_FONTS_MD5 := 36934d00b00555eaacde9f091f392f97
-XORG_PROTO_FONTS := fontsproto-$(XORG_PROTO_FONTS_VERSION)
-XORG_PROTO_FONTS_SUFFIX := tar.bz2
-XORG_PROTO_FONTS_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX))
-XORG_PROTO_FONTS_SOURCE := $(SRCDIR)/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
-XORG_PROTO_FONTS_DIR := $(BUILDDIR)/$(XORG_PROTO_FONTS)
-XORG_PROTO_FONTS_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_FONTS_CONF_TOOL := autoconf
-XORG_PROTO_FONTS_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-gl.in b/rules/xorg-proto-gl.in
deleted file mode 100644
index ae8a4be52..000000000
--- a/rules/xorg-proto-gl.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_GL
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make
deleted file mode 100644
index 2ae400713..000000000
--- a/rules/xorg-proto-gl.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_GL) += xorg-proto-gl
-
-#
-# Paths and names
-#
-XORG_PROTO_GL_VERSION := 1.4.17
-XORG_PROTO_GL_MD5 := 5565f1b0facf4a59c2778229c1f70d10
-XORG_PROTO_GL := glproto-$(XORG_PROTO_GL_VERSION)
-XORG_PROTO_GL_SUFFIX := tar.bz2
-XORG_PROTO_GL_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX))
-XORG_PROTO_GL_SOURCE := $(SRCDIR)/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
-XORG_PROTO_GL_DIR := $(BUILDDIR)/$(XORG_PROTO_GL)
-XORG_PROTO_GL_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_GL_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-input.in b/rules/xorg-proto-input.in
deleted file mode 100644
index 793ace534..000000000
--- a/rules/xorg-proto-input.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_INPUT
- tristate
- help
- Input extension headers
diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make
deleted file mode 100644
index aac58f524..000000000
--- a/rules/xorg-proto-input.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_INPUT) += xorg-proto-input
-
-#
-# Paths and names
-#
-XORG_PROTO_INPUT_VERSION:= 2.3.1
-XORG_PROTO_INPUT_MD5 := 6caebead4b779ba031727f66a7ffa358
-XORG_PROTO_INPUT := inputproto-$(XORG_PROTO_INPUT_VERSION)
-XORG_PROTO_INPUT_SUFFIX := tar.bz2
-XORG_PROTO_INPUT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX))
-XORG_PROTO_INPUT_SOURCE := $(SRCDIR)/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
-XORG_PROTO_INPUT_DIR := $(BUILDDIR)/$(XORG_PROTO_INPUT)
-XORG_PROTO_INPUT_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_INPUT_CONF_TOOL := autoconf
-XORG_PROTO_INPUT_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- --without-asciidoc
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-kb.in b/rules/xorg-proto-kb.in
deleted file mode 100644
index de850dbe5..000000000
--- a/rules/xorg-proto-kb.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_KB
- tristate
- help
- KB extension headers
diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make
deleted file mode 100644
index 086d0c67b..000000000
--- a/rules/xorg-proto-kb.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_KB) += xorg-proto-kb
-
-#
-# Paths and names
-#
-XORG_PROTO_KB_VERSION := 1.0.6
-XORG_PROTO_KB_MD5 := 677ea8523eec6caca86121ad2dca0b71
-XORG_PROTO_KB := kbproto-$(XORG_PROTO_KB_VERSION)
-XORG_PROTO_KB_SUFFIX := tar.bz2
-XORG_PROTO_KB_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX))
-XORG_PROTO_KB_SOURCE := $(SRCDIR)/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
-XORG_PROTO_KB_DIR := $(BUILDDIR)/$(XORG_PROTO_KB)
-XORG_PROTO_KB_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_KB_CONF_TOOL := autoconf
-XORG_PROTO_KB_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-present.in b/rules/xorg-proto-present.in
deleted file mode 100644
index 419b6ac74..000000000
--- a/rules/xorg-proto-present.in
+++ /dev/null
@@ -1,4 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_PRESENT
- tristate
diff --git a/rules/xorg-proto-present.make b/rules/xorg-proto-present.make
deleted file mode 100644
index a127abc04..000000000
--- a/rules/xorg-proto-present.make
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2014 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_PRESENT) += xorg-proto-present
-
-#
-# Paths and names
-#
-XORG_PROTO_PRESENT_VERSION := 1.0
-XORG_PROTO_PRESENT_MD5 := 2d569c75884455c7148d133d341e8fd6
-XORG_PROTO_PRESENT := presentproto-$(XORG_PROTO_PRESENT_VERSION)
-XORG_PROTO_PRESENT_SUFFIX := tar.bz2
-XORG_PROTO_PRESENT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_PRESENT).$(XORG_PROTO_PRESENT_SUFFIX))
-XORG_PROTO_PRESENT_SOURCE := $(SRCDIR)/$(XORG_PROTO_PRESENT).$(XORG_PROTO_PRESENT_SUFFIX)
-XORG_PROTO_PRESENT_DIR := $(BUILDDIR)/$(XORG_PROTO_PRESENT)
-XORG_PROTO_PRESENT_LICENSE := MIT
-XORG_PROTO_PRESENT_LICENSE_FILES := \
- file://presentproto.h;startline=2;endline=20;md5=2dd66dffa047e40483dd101640f3043b
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_PRESENT_CONF_TOOL := autoconf
-
-# vim: syntax=make
diff --git a/rules/xorg-proto-print.in b/rules/xorg-proto-print.in
deleted file mode 100644
index 656b7ec1c..000000000
--- a/rules/xorg-proto-print.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_PRINT
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make
deleted file mode 100644
index b53a8698d..000000000
--- a/rules/xorg-proto-print.make
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_PRINT) += xorg-proto-print
-
-#
-# Paths and names
-#
-XORG_PROTO_PRINT_VERSION:= 1.0.5
-XORG_PROTO_PRINT_MD5 := 99d0e25feea2fead7d8325b7000b41c3
-XORG_PROTO_PRINT := printproto-$(XORG_PROTO_PRINT_VERSION)
-XORG_PROTO_PRINT_SUFFIX := tar.bz2
-XORG_PROTO_PRINT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX))
-XORG_PROTO_PRINT_SOURCE := $(SRCDIR)/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
-XORG_PROTO_PRINT_DIR := $(BUILDDIR)/$(XORG_PROTO_PRINT)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_PRINT_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-randr.in b/rules/xorg-proto-randr.in
deleted file mode 100644
index 16ee63c0d..000000000
--- a/rules/xorg-proto-randr.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_RANDR
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make
deleted file mode 100644
index a56e5c51c..000000000
--- a/rules/xorg-proto-randr.make
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_RANDR) += xorg-proto-randr
-
-#
-# Paths and names
-#
-XORG_PROTO_RANDR_VERSION:= 1.4.0
-XORG_PROTO_RANDR_MD5 := ce4d0b05675968e4c83e003cc809660d
-XORG_PROTO_RANDR := randrproto-$(XORG_PROTO_RANDR_VERSION)
-XORG_PROTO_RANDR_SUFFIX := tar.bz2
-XORG_PROTO_RANDR_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX))
-XORG_PROTO_RANDR_SOURCE := $(SRCDIR)/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
-XORG_PROTO_RANDR_DIR := $(BUILDDIR)/$(XORG_PROTO_RANDR)
-XORG_PROTO_RANDR_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_RANDR_CONF_TOOL := autoconf
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-randr.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-record.in b/rules/xorg-proto-record.in
deleted file mode 100644
index 0caabe649..000000000
--- a/rules/xorg-proto-record.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_RECORD
- bool
- help
- Record extension headers
diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make
deleted file mode 100644
index e93aece76..000000000
--- a/rules/xorg-proto-record.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_RECORD) += xorg-proto-record
-
-#
-# Paths and names
-#
-XORG_PROTO_RECORD_VERSION := 1.14.2
-XORG_PROTO_RECORD_MD5 := 1b4e5dede5ea51906f1530ca1e21d216
-XORG_PROTO_RECORD := recordproto-$(XORG_PROTO_RECORD_VERSION)
-XORG_PROTO_RECORD_SUFFIX := tar.bz2
-XORG_PROTO_RECORD_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX))
-XORG_PROTO_RECORD_SOURCE := $(SRCDIR)/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
-XORG_PROTO_RECORD_DIR := $(BUILDDIR)/$(XORG_PROTO_RECORD)
-XORG_PROTO_RECORD_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_RECORD_CONF_TOOL := autoconf
-XORG_PROTO_RECORD_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-render.in b/rules/xorg-proto-render.in
deleted file mode 100644
index ad3c3db4d..000000000
--- a/rules/xorg-proto-render.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_RENDER
- bool
- help
- The X Render Extension adds support for alpha-blended icons, anti-aliased
- fonts and drawing primitives, as well as true-color animated mouse cursors
- to the X window system.
-
diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make
deleted file mode 100644
index fd56c3078..000000000
--- a/rules/xorg-proto-render.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_RENDER) += xorg-proto-render
-
-#
-# Paths and names
-#
-XORG_PROTO_RENDER_VERSION := 0.11.1
-XORG_PROTO_RENDER_MD5 := a914ccc1de66ddeb4b611c6b0686e274
-XORG_PROTO_RENDER := renderproto-$(XORG_PROTO_RENDER_VERSION)
-XORG_PROTO_RENDER_SUFFIX := tar.bz2
-XORG_PROTO_RENDER_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX))
-XORG_PROTO_RENDER_SOURCE := $(SRCDIR)/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
-XORG_PROTO_RENDER_DIR := $(BUILDDIR)/$(XORG_PROTO_RENDER)
-XORG_PROTO_RENDER_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_RENDER_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_RENDER_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_RENDER_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-render.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-resource.in b/rules/xorg-proto-resource.in
deleted file mode 100644
index 3717ee32e..000000000
--- a/rules/xorg-proto-resource.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_RESOURCE
- bool
- help
- FIXME
diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make
deleted file mode 100644
index 94e4cad82..000000000
--- a/rules/xorg-proto-resource.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_RESOURCE) += xorg-proto-resource
-
-#
-# Paths and names
-#
-XORG_PROTO_RESOURCE_VERSION := 1.2.0
-XORG_PROTO_RESOURCE_MD5 := cfdb57dae221b71b2703f8e2980eaaf4
-XORG_PROTO_RESOURCE := resourceproto-$(XORG_PROTO_RESOURCE_VERSION)
-XORG_PROTO_RESOURCE_SUFFIX := tar.bz2
-XORG_PROTO_RESOURCE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX))
-XORG_PROTO_RESOURCE_SOURCE := $(SRCDIR)/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
-XORG_PROTO_RESOURCE_DIR := $(BUILDDIR)/$(XORG_PROTO_RESOURCE)
-XORG_PROTO_RESOURCE_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_RESOURCE_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-scrnsaver.in b/rules/xorg-proto-scrnsaver.in
deleted file mode 100644
index 4b1124f2d..000000000
--- a/rules/xorg-proto-scrnsaver.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_SCRNSAVER
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make
deleted file mode 100644
index 3d36a2ce8..000000000
--- a/rules/xorg-proto-scrnsaver.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_SCRNSAVER) += xorg-proto-scrnsaver
-
-#
-# Paths and names
-#
-XORG_PROTO_SCRNSAVER_VERSION := 1.2.2
-XORG_PROTO_SCRNSAVER_MD5 := edd8a73775e8ece1d69515dd17767bfb
-XORG_PROTO_SCRNSAVER := scrnsaverproto-$(XORG_PROTO_SCRNSAVER_VERSION)
-XORG_PROTO_SCRNSAVER_SUFFIX := tar.bz2
-XORG_PROTO_SCRNSAVER_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX))
-XORG_PROTO_SCRNSAVER_SOURCE := $(SRCDIR)/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
-XORG_PROTO_SCRNSAVER_DIR := $(BUILDDIR)/$(XORG_PROTO_SCRNSAVER)
-XORG_PROTO_SCRNSAVER_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_SCRNSAVER_CONF_TOOL := autoconf
-XORG_PROTO_SCRNSAVER_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-video.in b/rules/xorg-proto-video.in
deleted file mode 100644
index 2fbb3fc84..000000000
--- a/rules/xorg-proto-video.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_VIDEO
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make
deleted file mode 100644
index dddd8f1eb..000000000
--- a/rules/xorg-proto-video.make
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_VIDEO) += xorg-proto-video
-
-#
-# Paths and names
-#
-XORG_PROTO_VIDEO_VERSION:= 2.3.2
-XORG_PROTO_VIDEO_MD5 := e658641595327d3990eab70fdb55ca8b
-XORG_PROTO_VIDEO := videoproto-$(XORG_PROTO_VIDEO_VERSION)
-XORG_PROTO_VIDEO_SUFFIX := tar.bz2
-XORG_PROTO_VIDEO_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX))
-XORG_PROTO_VIDEO_SOURCE := $(SRCDIR)/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
-XORG_PROTO_VIDEO_DIR := $(BUILDDIR)/$(XORG_PROTO_VIDEO)
-XORG_PROTO_VIDEO_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_VIDEO_CONF_TOOL := autoconf
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-video.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-windowswm.in b/rules/xorg-proto-windowswm.in
deleted file mode 100644
index 36a747f8e..000000000
--- a/rules/xorg-proto-windowswm.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_WINDOWSWM
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make
deleted file mode 100644
index fb028d105..000000000
--- a/rules/xorg-proto-windowswm.make
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_WINDOWSWM) += xorg-proto-windowswm
-
-#
-# Paths and names
-#
-XORG_PROTO_WINDOWSWM_VERSION := 1.0.4
-XORG_PROTO_WINDOWSWM_MD5 := e74b2ff3172a6117f2a62b655ef99064
-XORG_PROTO_WINDOWSWM := windowswmproto-$(XORG_PROTO_WINDOWSWM_VERSION)
-XORG_PROTO_WINDOWSWM_SUFFIX := tar.bz2
-XORG_PROTO_WINDOWSWM_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX))
-XORG_PROTO_WINDOWSWM_SOURCE := $(SRCDIR)/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
-XORG_PROTO_WINDOWSWM_DIR := $(BUILDDIR)/$(XORG_PROTO_WINDOWSWM)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_WINDOWSWM_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_WINDOWSWM_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_WINDOWSWM_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-windowswm.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-x.in b/rules/xorg-proto-x.in
deleted file mode 100644
index 516adcb16..000000000
--- a/rules/xorg-proto-x.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_X
- tristate
- help
- Basic header files.
diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make
deleted file mode 100644
index af30fdc8c..000000000
--- a/rules/xorg-proto-x.make
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_X) += xorg-proto-x
-
-#
-# Paths and names
-#
-XORG_PROTO_X_VERSION := 7.0.26
-XORG_PROTO_X_MD5 := 4dc2464bfeade23dab5de38da0f6b1b5
-XORG_PROTO_X := xproto-$(XORG_PROTO_X_VERSION)
-XORG_PROTO_X_SUFFIX := tar.bz2
-XORG_PROTO_X_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX))
-XORG_PROTO_X_SOURCE := $(SRCDIR)/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
-XORG_PROTO_X_DIR := $(BUILDDIR)/$(XORG_PROTO_X)
-XORG_PROTO_X_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_X_CONF_TOOL := autoconf
-XORG_PROTO_X_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-#
-# this was valid for an x86 target. Check on other
-# architectures and do not trust the autodetection
-#
-XORG_PROTO_X_CONF_OPT += \
- --enable-const-prototypes \
- --enable-function-prototypes \
- --enable-varargs-prototypes \
- --enable-nested-prototypes \
- --enable-wide-prototypes=no
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xcmisc.in b/rules/xorg-proto-xcmisc.in
deleted file mode 100644
index ebe0b214e..000000000
--- a/rules/xorg-proto-xcmisc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XCMISC
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make
deleted file mode 100644
index e6c275158..000000000
--- a/rules/xorg-proto-xcmisc.make
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XCMISC) += xorg-proto-xcmisc
-
-#
-# Paths and names
-#
-XORG_PROTO_XCMISC_VERSION := 1.2.2
-XORG_PROTO_XCMISC_MD5 := 5f4847c78e41b801982c8a5e06365b24
-XORG_PROTO_XCMISC := xcmiscproto-$(XORG_PROTO_XCMISC_VERSION)
-XORG_PROTO_XCMISC_SUFFIX := tar.bz2
-XORG_PROTO_XCMISC_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX))
-XORG_PROTO_XCMISC_SOURCE := $(SRCDIR)/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
-XORG_PROTO_XCMISC_DIR := $(BUILDDIR)/$(XORG_PROTO_XCMISC)
-XORG_PROTO_XCMISC_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_XCMISC_CONF_TOOL := autoconf
-XORG_PROTO_XCMISC_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xext.in b/rules/xorg-proto-xext.in
deleted file mode 100644
index 70efd0f21..000000000
--- a/rules/xorg-proto-xext.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XEXT
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make
deleted file mode 100644
index c7495aa7f..000000000
--- a/rules/xorg-proto-xext.make
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XEXT) += xorg-proto-xext
-
-#
-# Paths and names
-#
-XORG_PROTO_XEXT_VERSION := 7.3.0
-XORG_PROTO_XEXT_MD5 := 70c90f313b4b0851758ef77b95019584
-XORG_PROTO_XEXT := xextproto-$(XORG_PROTO_XEXT_VERSION)
-XORG_PROTO_XEXT_SUFFIX := tar.bz2
-XORG_PROTO_XEXT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX))
-XORG_PROTO_XEXT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
-XORG_PROTO_XEXT_DIR := $(BUILDDIR)/$(XORG_PROTO_XEXT)
-XORG_PROTO_XEXT_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_XEXT_CONF_TOOL := autoconf
-XORG_PROTO_XEXT_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-specs \
- $(XORG_OPTIONS_DOCS)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xf86bigfont.in b/rules/xorg-proto-xf86bigfont.in
deleted file mode 100644
index b1fd6b825..000000000
--- a/rules/xorg-proto-xf86bigfont.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XF86BIGFONT
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make
deleted file mode 100644
index 1bd6a982d..000000000
--- a/rules/xorg-proto-xf86bigfont.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XF86BIGFONT) += xorg-proto-xf86bigfont
-
-#
-# Paths and names
-#
-XORG_PROTO_XF86BIGFONT_VERSION := 1.2.0
-XORG_PROTO_XF86BIGFONT_MD5 := 120e226ede5a4687b25dd357cc9b8efe
-XORG_PROTO_XF86BIGFONT := xf86bigfontproto-$(XORG_PROTO_XF86BIGFONT_VERSION)
-XORG_PROTO_XF86BIGFONT_SUFFIX := tar.bz2
-XORG_PROTO_XF86BIGFONT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX))
-XORG_PROTO_XF86BIGFONT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
-XORG_PROTO_XF86BIGFONT_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86BIGFONT)
-XORG_PROTO_XF86BIGFONT_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_XF86BIGFONT_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_XF86BIGFONT_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_XF86BIGFONT_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-xf86bigfont.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xf86dga.in b/rules/xorg-proto-xf86dga.in
deleted file mode 100644
index ede33e257..000000000
--- a/rules/xorg-proto-xf86dga.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XF86DGA
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make
deleted file mode 100644
index f0f2c86a9..000000000
--- a/rules/xorg-proto-xf86dga.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XF86DGA) += xorg-proto-xf86dga
-
-#
-# Paths and names
-#
-XORG_PROTO_XF86DGA_VERSION := 2.1
-XORG_PROTO_XF86DGA_MD5 := a036dc2fcbf052ec10621fd48b68dbb1
-XORG_PROTO_XF86DGA := xf86dgaproto-$(XORG_PROTO_XF86DGA_VERSION)
-XORG_PROTO_XF86DGA_SUFFIX := tar.bz2
-XORG_PROTO_XF86DGA_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX))
-XORG_PROTO_XF86DGA_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
-XORG_PROTO_XF86DGA_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86DGA)
-XORG_PROTO_XF86DGA_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_XF86DGA_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_XF86DGA_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_XF86DGA_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-xf86dga.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xf86dri.in b/rules/xorg-proto-xf86dri.in
deleted file mode 100644
index 923b6a4f7..000000000
--- a/rules/xorg-proto-xf86dri.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XF86DRI
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make
deleted file mode 100644
index 1bf5a8c3e..000000000
--- a/rules/xorg-proto-xf86dri.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XF86DRI) += xorg-proto-xf86dri
-
-#
-# Paths and names
-#
-XORG_PROTO_XF86DRI_VERSION := 2.1.1
-XORG_PROTO_XF86DRI_MD5 := 1d716d0dac3b664e5ee20c69d34bc10e
-XORG_PROTO_XF86DRI := xf86driproto-$(XORG_PROTO_XF86DRI_VERSION)
-XORG_PROTO_XF86DRI_SUFFIX := tar.bz2
-XORG_PROTO_XF86DRI_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX))
-XORG_PROTO_XF86DRI_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
-XORG_PROTO_XF86DRI_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86DRI)
-XORG_PROTO_XF86DRI_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_XF86DRI_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xf86misc.in b/rules/xorg-proto-xf86misc.in
deleted file mode 100644
index c5a833c06..000000000
--- a/rules/xorg-proto-xf86misc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XF86MISC
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make
deleted file mode 100644
index 9ecd73245..000000000
--- a/rules/xorg-proto-xf86misc.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XF86MISC) += xorg-proto-xf86misc
-
-#
-# Paths and names
-#
-XORG_PROTO_XF86MISC_VERSION := 0.9.3
-XORG_PROTO_XF86MISC_MD5 := ca63bbb31cf5b7f37b2237e923ff257a
-XORG_PROTO_XF86MISC := xf86miscproto-$(XORG_PROTO_XF86MISC_VERSION)
-XORG_PROTO_XF86MISC_SUFFIX := tar.bz2
-XORG_PROTO_XF86MISC_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX))
-XORG_PROTO_XF86MISC_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
-XORG_PROTO_XF86MISC_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86MISC)
-XORG_PROTO_XF86MISC_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_PROTO_XF86MISC_PATH := PATH=$(CROSS_PATH)
-XORG_PROTO_XF86MISC_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_PROTO_XF86MISC_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-proto-xf86misc.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xf86vidmode.in b/rules/xorg-proto-xf86vidmode.in
deleted file mode 100644
index 0fa64d529..000000000
--- a/rules/xorg-proto-xf86vidmode.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XF86VIDMODE
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make
deleted file mode 100644
index e60734822..000000000
--- a/rules/xorg-proto-xf86vidmode.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XF86VIDMODE) += xorg-proto-xf86vidmode
-
-#
-# Paths and names
-#
-XORG_PROTO_XF86VIDMODE_VERSION := 2.3.1
-XORG_PROTO_XF86VIDMODE_MD5 := e793ecefeaecfeabd1aed6a01095174e
-XORG_PROTO_XF86VIDMODE := xf86vidmodeproto-$(XORG_PROTO_XF86VIDMODE_VERSION)
-XORG_PROTO_XF86VIDMODE_SUFFIX := tar.bz2
-XORG_PROTO_XF86VIDMODE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX))
-XORG_PROTO_XF86VIDMODE_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
-XORG_PROTO_XF86VIDMODE_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86VIDMODE)
-XORG_PROTO_XF86VIDMODE_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_XF86VIDMODE_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-proto-xinerama.in b/rules/xorg-proto-xinerama.in
deleted file mode 100644
index 8020ba561..000000000
--- a/rules/xorg-proto-xinerama.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=multimedia_xorg_proto
-
-config XORG_PROTO_XINERAMA
- tristate
- help
- FIXME
diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make
deleted file mode 100644
index ebbc167cd..000000000
--- a/rules/xorg-proto-xinerama.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2006 by Erwin Rol
-# (C) 2009 by Robert Schwebel
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_PROTO_XINERAMA) += xorg-proto-xinerama
-
-#
-# Paths and names
-#
-XORG_PROTO_XINERAMA_VERSION := 1.2.1
-XORG_PROTO_XINERAMA_MD5 := 9959fe0bfb22a0e7260433b8d199590a
-XORG_PROTO_XINERAMA := xineramaproto-$(XORG_PROTO_XINERAMA_VERSION)
-XORG_PROTO_XINERAMA_SUFFIX := tar.bz2
-XORG_PROTO_XINERAMA_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX))
-XORG_PROTO_XINERAMA_SOURCE := $(SRCDIR)/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
-XORG_PROTO_XINERAMA_DIR := $(BUILDDIR)/$(XORG_PROTO_XINERAMA)
-XORG_PROTO_XINERAMA_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_PROTO_XINERAMA_CONF_TOOL := autoconf
-
-# vim: syntax=make
-
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index be1ace8ed..f3eb13f41 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -18,21 +18,8 @@ menuconfig XORG_SERVER
select LIBC_CRYPT # for SHA1
# protos
- select XORG_PROTO_RECORD
- select XORG_PROTO_RANDR
- select XORG_PROTO_RENDER
- select XORG_PROTO_FIXES
- select XORG_PROTO_DAMAGE
- select XORG_PROTO_XCMISC
- select XORG_PROTO_XEXT
- select XORG_PROTO_X
+ select XORGPROTO
select XORG_LIB_XTRANS
- select XORG_PROTO_BIGREQS
- select XORG_PROTO_RESOURCE
- select XORG_PROTO_FONTS
- select XORG_PROTO_INPUT
- select XORG_PROTO_KB
- select XORG_PROTO_VIDEO
# libs
select XORG_LIB_XFONT
@@ -51,26 +38,19 @@ menuconfig XORG_SERVER
# glx triggered
select XORG_LIB_X11 if XORG_SERVER_EXT_GLX
- select XORG_PROTO_GL if XORG_SERVER_EXT_GLX
select MESALIB if XORG_SERVER_EXT_GLX
# dri triggered
- select XORG_PROTO_XF86DRI if XORG_SERVER_EXT_DRI
- select XORG_PROTO_GL if XORG_SERVER_EXT_DRI
select MESALIB if XORG_SERVER_EXT_DRI
select LIBDRM if XORG_SERVER_EXT_DRI
# dri2 triggered
- select XORG_PROTO_DRI2 if XORG_SERVER_EXT_DRI2
select LIBDRM if XORG_SERVER_EXT_DRI2
# dri3 triggered
- select XORG_PROTO_DRI3 if XORG_SERVER_EXT_DRI3
select LIBDRM if XORG_SERVER_EXT_DRI3
select XORG_LIB_XSHMFENCE if XORG_SERVER_EXT_DRI3
- select XORG_PROTO_PRESENT if XORG_SERVER_EXT_PRESENT
-
# xdmcp extension
select XORG_LIB_XDMCP if XORG_SERVER_EXT_XDMCP
@@ -80,9 +60,6 @@ menuconfig XORG_SERVER
# xorg ddx
select LIBPCIACCESS if XORG_SERVER_XORG
- #select XORG_PROTO_XF86DGA if XORG_SERVER_XORG && XORG_SERVER_EXT_DGA #FIXME: broken
- select XORG_PROTO_XF86DGA if XORG_SERVER_XORG
- select XORG_PROTO_XF86VIDMODE if XORG_SERVER_XORG && XORG_SERVER_EXT_XF86VIDMODE
# xwayland ddx
select WAYLAND if XORG_SERVER_XWAYLAND
@@ -106,9 +83,6 @@ menuconfig XORG_SERVER
# xres triggered
select XORG_LIB_XRES if XORG_SERVER_EXT_XRES
- # xinerama triggered
- select XORG_PROTO_XINERAMA if XORG_SERVER_EXT_XINERAMA
-
# for kdrive
select TSLIB if XORG_SERVER_TSLIB
@@ -116,13 +90,10 @@ menuconfig XORG_SERVER
#select XORG_LIB_XXF86VM if XORG_SERVER_EXT_XV
#select XORG_LIB_X11
#select XORG_LIB_XAW
- #select XORG_PROTO_XF86MISC
- #select XORG_PROTO_XF86BIGFONT
#select XORG_LIB_XT
#select XORG_LIB_XMU
#select XORG_LIB_XTST
#select XORG_LIB_XKBUI if XORG_KEYBOARD_MAPPING_SUPPORT
- #select XORG_PROTO_DMX if XORG_SERVER_EXT_XDMCP
# FIXME: find out which config options need this
#select GCCLIBS_GCC_S