NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
bac9bb2047
kumquat-buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

214 lines
6.1 KiB
Makefile
Raw Normal View History

Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
################################################################################
#
Remove description and url from header Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:29 +02:00
# xserver_xorg-server
Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
#
################################################################################
package/x11r7/xserver_xorg-server: security bump to version 1.17.1 Fixes: CVE-2015-0255 - Information leak in the XkbSetGeometry request of X servers http://www.x.org/wiki/Development/Security/Advisory-2015-02-10/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-02-15 13:13:56 +01:00
XSERVER_XORG_SERVER_VERSION = 1.17.1
Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
xserver_xorg-server: add license informations Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-09 07:51:03 +02:00
XSERVER_XORG_SERVER_LICENSE = MIT
XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
Revert "xserver_xorg-server: Use $(MAKE1) for make install" This reverts commit b7acacaf6e84ec05ed76dd419e645cfbd6683f7a. Closes #1855 We DO need to install into staging for all the xdriver-* packages, so revert this commit. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-30 20:11:23 +02:00
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
xorg server: beautify list of dependencies Reorganize the list of depencies with a sane indentation level, and one dependency per line. Yes, the list is long, but is easier to read, and future patches modifying this list will be easier to review. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-17 14:46:19 +02:00
XSERVER_XORG_SERVER_DEPENDENCIES = \
xutil_util-macros \
xlib_libXfont \
xlib_libX11 \
xlib_libXau \
xlib_libXdmcp \
xlib_libXext \
xlib_libXfixes \
xlib_libXi \
xlib_libXrender \
xlib_libXres \
xlib_libXft \
xlib_libXcursor \
xlib_libXinerama \
xlib_libXrandr \
xlib_libXdamage \
xlib_libXxf86vm \
xlib_libxkbfile \
xlib_xtrans \
xdata_xbitmaps \
xproto_bigreqsproto \
xproto_compositeproto \
xproto_damageproto \
xproto_fixesproto \
xproto_fontsproto \
xproto_glproto \
xproto_inputproto \
xproto_kbproto \
xorg: Bump xserver_xorg-server version to 1.15.0 - remove patches applied upstream - parallel make works - add new dependency xproto_presentproto Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-29 21:56:07 +01:00
xproto_presentproto \
xorg server: beautify list of dependencies Reorganize the list of depencies with a sane indentation level, and one dependency per line. Yes, the list is long, but is easier to read, and future patches modifying this list will be easier to review. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-17 14:46:19 +02:00
xproto_randrproto \
xproto_renderproto \
xproto_resourceproto \
xproto_videoproto \
xproto_xcmiscproto \
xproto_xextproto \
xproto_xf86bigfontproto \
xproto_xf86dgaproto \
xproto_xf86vidmodeproto \
xproto_xproto \
xserver: Add xkeyboard-config as a dependency xkeyboard-config is required to install keymap files to the target, without which the X server does not start. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-22 16:22:32 +02:00
xkeyboard-config \
xorg server: beautify list of dependencies Reorganize the list of depencies with a sane indentation level, and one dependency per line. Yes, the list is long, but is easier to read, and future patches modifying this list will be easier to review. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-17 14:46:19 +02:00
pixman \
xorg-xserver: configure needs pkg-config Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-25 08:44:26 +02:00
mcookie \
packages: switch to host-pkgconf Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-22 17:47:52 +02:00
host-pkgconf
xorg_server: cleanup .mk Rearrange lines and get rid of unneeded variables. Should have no functional change.
2009-03-16 16:47:44 +01:00
package: indentation cleanup Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-24 08:54:24 +01:00
XSERVER_XORG_SERVER_CONF_OPTS = \
--disable-config-hal \
--disable-xnest \
--disable-xephyr \
--disable-dmx \
--with-builder-addr=buildroot@buildroot.org \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
--with-fontrootdir=/usr/share/fonts/X11/ \
--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
packages: fix xorg to compile modular and tiny versions Based on googlecode r558 by John Voltz.
2008-06-30 14:55:29 +02:00
xserver_xorg-server: rename server-style configuration options The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options used to select the style of X.org server to use are not named consistently with the rest of the Buildroot options (in capital letters and prefixed with the package name). Therefore, we rename those options, and we take care to add the old option names in the BR2_LEGACY infrastructure. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:17 +01:00
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
xlib_libpciaccess: Rename package to libpciaccess While libpciaccess is part of the X libraries, it does not depend upon X11 or any other X library. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-18 19:41:30 +02:00
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess libdrm
packages: fix xorg to compile modular and tiny versions Based on googlecode r558 by John Voltz.
2008-06-30 14:55:29 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
packages: fix xorg to compile modular and tiny versions Based on googlecode r558 by John Voltz.
2008-06-30 14:55:29 +02:00
endif
xserver_xorg-server: rename server-style configuration options The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options used to select the style of X.org server to use are not named consistently with the rest of the Buildroot options (in capital letters and prefixed with the package name). Therefore, we rename those options, and we take care to add the old option names in the BR2_LEGACY infrastructure. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:17 +01:00
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
package: indentation cleanup Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-24 08:54:24 +01:00
XSERVER_XORG_SERVER_CONF_OPTS += \
--enable-kdrive \
--enable-xfbdev \
--disable-glx \
--disable-dri \
--disable-xsdl
Create X symlink for TinyX When installing TinyX to target create /usr/bin/X symlink to Xfbdev as it is the only TinyX driver we build. This makes utils like startx happy :) Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-04 09:58:33 +01:00
define XSERVER_CREATE_X_SYMLINK
package: indentation cleanup Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-23 10:43:37 +02:00
ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
Create X symlink for TinyX When installing TinyX to target create /usr/bin/X symlink to Xfbdev as it is the only TinyX driver we build. This makes utils like startx happy :) Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-04 09:58:33 +01:00
endef
XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
xserver_xorg-server: option to build KDrive input drivers When the Kdrive variant of the X server is selected, the drivers are directly built into the X server. The X server therefore provides options to enable or disable certain drivers, especially input drivers. This patch adds options to be able to enable or disable the evdev, kbd and mouse drivers of Kdrive. [Peter: fix Config.in indentation as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:18 +01:00
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev
packages: fix xorg to compile modular and tiny versions Based on googlecode r558 by John Voltz.
2008-06-30 14:55:29 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev
xserver_xorg-server: option to build KDrive input drivers When the Kdrive variant of the X server is selected, the drivers are directly built into the X server. The X server therefore provides options to enable or disable certain drivers, especially input drivers. This patch adds options to be able to enable or disable the evdev, kbd and mouse drivers of Kdrive. [Peter: fix Config.in indentation as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:18 +01:00
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd
xserver_xorg-server: option to build KDrive input drivers When the Kdrive variant of the X server is selected, the drivers are directly built into the X server. The X server therefore provides options to enable or disable certain drivers, especially input drivers. This patch adds options to be able to enable or disable the evdev, kbd and mouse drivers of Kdrive. [Peter: fix Config.in indentation as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:18 +01:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd
xserver_xorg-server: option to build KDrive input drivers When the Kdrive variant of the X server is selected, the drivers are directly built into the X server. The X server therefore provides options to enable or disable certain drivers, especially input drivers. This patch adds options to be able to enable or disable the evdev, kbd and mouse drivers of Kdrive. [Peter: fix Config.in indentation as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:18 +01:00
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse
xserver_xorg-server: option to build KDrive input drivers When the Kdrive variant of the X server is selected, the drivers are directly built into the X server. The X server therefore provides options to enable or disable certain drivers, especially input drivers. This patch adds options to be able to enable or disable the evdev, kbd and mouse drivers of Kdrive. [Peter: fix Config.in indentation as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:18 +01:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse
xserver_xorg-server: option to build KDrive input drivers When the Kdrive variant of the X server is selected, the drivers are directly built into the X server. The X server therefore provides options to enable or disable certain drivers, especially input drivers. This patch adds options to be able to enable or disable the evdev, kbd and mouse drivers of Kdrive. [Peter: fix Config.in indentation as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:18 +01:00
endif
else # modular
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
packages: fix xorg to compile modular and tiny versions Based on googlecode r558 by John Voltz.
2008-06-30 14:55:29 +02:00
endif
xserver_xorg-server: Fix DRI detection Fixes http://autobuild.buildroot.net/results/b8a/b8a905b864b01aa09940668130a62d9d90ef5f9a/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-30 06:44:22 +02:00
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
Make Mesa3D optional for X11 [Peter: XF86DRIPROTO should only be selected if mesa is enabled] Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-29 22:24:18 +02:00
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
Make Mesa3D optional for X11 [Peter: XF86DRIPROTO should only be selected if mesa is enabled] Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-29 22:24:18 +02:00
endif
xserver_xorg: add options for builtin fonts and aiglx Patch by Dan Lykowski <lykowdk@gmail.com>
2009-03-13 20:46:03 +01:00
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-aiglx
xserver_xorg: add options for builtin fonts and aiglx Patch by Dan Lykowski <lykowdk@gmail.com>
2009-03-13 20:46:03 +01:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-aiglx
xserver_xorg: add options for builtin fonts and aiglx Patch by Dan Lykowski <lykowdk@gmail.com>
2009-03-13 20:46:03 +01:00
endif
some fixes for X
2008-04-24 15:22:14 +02:00
# Optional packages
package/: get rid of unneeded $(strip ..)
2008-12-08 09:15:27 +01:00
ifeq ($(BR2_PACKAGE_TSLIB),y)
some fixes for X
2008-04-24 15:22:14 +02:00
XSERVER_XORG_SERVER_DEPENDENCIES += tslib
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts"
some fixes for X
2008-04-24 15:22:14 +02:00
endif
udev: convert to virtual package This patch converts udev to a virtual package. For the moment, there is only one provider for the udev features: eudev. Packages meant to provide udev-like features must select the symbol BR2_PACKAGE_HAS_UDEV. Packages depending on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV or BR2_PACKAGE_UDEV have been converted to use the new symbol. [Peter: move legacy symbols under 2014.05] Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-07 14:21:33 +01:00
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
xserver_xorg-server: fix dbus/udev configure problem If both the dbus and udev packages are selected, then the configure step for the xserver_xorg-server package fails as follows. configure: error: Hotplugging through both libudev and dbus/hal not allowed The configure script no longer allows both the --enable-config-dbus and --enable-config-udev options to be specified. This patch changes the xserver_xorg-server makefile to use udev in preference to dbus, when both are available. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-23 04:18:20 +02:00
XSERVER_XORG_SERVER_DEPENDENCIES += udev
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
package/x11r7/xserver_xorg-server: Udev kms support depends on libdrm Fixes http://autobuild.buildroot.net/results/18c/18c554d148fc00f85690c1638976dd6d0d7ff219/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-17 13:28:38 +02:00
# udev kms support depends on libdrm
ifeq ($(BR2_PACKAGE_LIBDRM),y)
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
package/x11r7/xserver_xorg-server: Udev kms support depends on libdrm Fixes http://autobuild.buildroot.net/results/18c/18c554d148fc00f85690c1638976dd6d0d7ff219/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-17 13:28:38 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
package/x11r7/xserver_xorg-server: Udev kms support depends on libdrm Fixes http://autobuild.buildroot.net/results/18c/18c554d148fc00f85690c1638976dd6d0d7ff219/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-17 13:28:38 +02:00
endif
xserver_xorg-server: fix dbus/udev configure problem If both the dbus and udev packages are selected, then the configure step for the xserver_xorg-server package fails as follows. configure: error: Hotplugging through both libudev and dbus/hal not allowed The configure script no longer allows both the --enable-config-dbus and --enable-config-udev options to be specified. This patch changes the xserver_xorg-server makefile to use udev in preference to dbus, when both are available. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-23 04:18:20 +02:00
else
xserver-xorg: dbus is optional
2009-03-16 16:48:07 +01:00
ifeq ($(BR2_PACKAGE_DBUS),y)
XSERVER_XORG_SERVER_DEPENDENCIES += dbus
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus
xserver-xorg: dbus is optional
2009-03-16 16:48:07 +01:00
endif
xserver_xorg-server: bump version Based on patch by Allan W. Nielsen. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-22 15:18:27 +02:00
endif
xserver-xorg: more optional dependencies
2009-03-16 16:48:14 +01:00
ifeq ($(BR2_PACKAGE_FREETYPE),y)
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
endif
xserver_xorg-server: disable libunwind on MIPS with 32-bit pointers libunwind support in xorg-server is not only broken for MIPS64 n32 but for all MIPS variants with 32-bit pointers. The reason is exactly the same one. libunwind defines a uint64 variable to store the words. Then, xorg-server casts that variable (64-bit) into a pointer (32-bit), and the compilation fails: backtrace.c:98:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] Related: https://bugs.freedesktop.org/show_bug.cgi?id=79939 Fixes: http://autobuild.buildroot.net/results/87b/87be2c95957f9925c1258812e536df72689fc5da/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-05 12:17:02 +01:00
# libunwind support is broken on all MIPS variants with 32-bit pointers
package/x11r7/xserver_xorg-server: libunwind support is broken on mips64 Fixes http://autobuild.buildroot.net/results/e8f/e8f68163802f31359cee15fa3ca52547e06d1f27/ http://autobuild.buildroot.net/results/994/9947222da8682a358f81f8ac924c12596fd09ee8/ http://autobuild.buildroot.net/results/df9/df92d9b682976b77d9e1e4c39afca52b7512d847/ [Peter: use official bugtracker URL, fix check] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-29 23:10:35 +01:00
# https://bugs.freedesktop.org/show_bug.cgi?id=79939
xserver_xorg-server: disable libunwind on MIPS with 32-bit pointers libunwind support in xorg-server is not only broken for MIPS64 n32 but for all MIPS variants with 32-bit pointers. The reason is exactly the same one. libunwind defines a uint64 variable to store the words. Then, xorg-server casts that variable (64-bit) into a pointer (32-bit), and the compilation fails: backtrace.c:98:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] Related: https://bugs.freedesktop.org/show_bug.cgi?id=79939 Fixes: http://autobuild.buildroot.net/results/87b/87be2c95957f9925c1258812e536df72689fc5da/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-05 12:17:02 +01:00
ifeq ($(BR2_PACKAGE_LIBUNWIND)-$(BR2_MIPS_OABI32)-$(BR2_MIPS_NABI32),y--)
xserver_xorg-server: add optional libunwind support Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-06 23:52:05 +02:00
XSERVER_XORG_SERVER_DEPENDENCIES += libunwind
xserver_xorg-server: disable libunwind on MIPS with 32-bit pointers libunwind support in xorg-server is not only broken for MIPS64 n32 but for all MIPS variants with 32-bit pointers. The reason is exactly the same one. libunwind defines a uint64 variable to store the words. Then, xorg-server casts that variable (64-bit) into a pointer (32-bit), and the compilation fails: backtrace.c:98:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] Related: https://bugs.freedesktop.org/show_bug.cgi?id=79939 Fixes: http://autobuild.buildroot.net/results/87b/87be2c95957f9925c1258812e536df72689fc5da/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-05 12:17:02 +01:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-libunwind
xserver_xorg-server: add optional libunwind support Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-06 23:52:05 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
xserver_xorg-server: add optional libunwind support Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-06 23:52:05 +02:00
endif
xserver-xorg: more optional dependencies
2009-03-16 16:48:14 +01:00
ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-record
x11r7: xserver_xorg-server: Amend record proto selection Record proto is not really required. It can be disabled. Signed-off-by: Valentine Barshak <gvaxon@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-25 14:44:03 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
xserver-xorg: more optional dependencies
2009-03-16 16:48:14 +01:00
endif
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
endif
xserver_xorg-server: Add optional package xlib_libXcomposite as dependency Make sure that xlib_libXcomposite is build before xserver_xorg-server. With this defconfig BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y BR2_PACKAGE_XLIB_LIBXCOMPOSITE=y and "make xserver_xorg-server" the package xlib_libXcomposite was ignored. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 22:26:35 +02:00
ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXcomposite
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
endif
xserver_xorg-server: rename server-style configuration options The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options used to select the style of X.org server to use are not named consistently with the rest of the Buildroot options (in capital letters and prefixed with the package name). Therefore, we rename those options, and we take care to add the old option names in the BR2_LEGACY infrastructure. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:17 +01:00
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
Bump xorg-server to 1.7.1 Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
2010-02-28 10:33:37 +01:00
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
Bump xorg-server to 1.7.1 Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
2010-02-28 10:33:37 +01:00
endif
xserver_xorg-server: Add support for DRI3 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-29 23:34:15 +02:00
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
xserver_xorg-server: Add support for DRI3 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-29 23:34:15 +02:00
endif
package/x11r7/xserver_xorg-server: bump version to 1.17.0 - remove patches, all were applied upstream - add support for libglamor, needed by package/x11r7/xdriver_xf86-video-ati Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-02-07 21:11:48 +01:00
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor
endif
xserver: dri support is only for the modular server Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-21 09:53:51 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 --disable-dri3
xserver: dri support is only for the modular server Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-21 09:53:51 +02:00
endif
xserver-xorg: more optional dependencies
2009-03-16 16:48:14 +01:00
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --enable-screensaver
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
endif
ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx
xserver_xorg-server: bump version, improve option support Later version of xserver no longer need configure hack to say where mesa3d is located. Signed-off-by: Will Wagner <will_wagner@carallon.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 19:06:40 +02:00
endif
xserver_xorg-server: provide more options for SHA1 library Until now, the X.org server was forcefully selecting OpenSSL, just to have a SHA1 implementation. However, in fact, the X.org server is capable of using a SHA1 implementation from multiple libraries: OpenSSL, libgcrypt and libsha1 amongst others. So, this patch changes the X.org server package so that we use the SHA1 functions from OpenSSL is OpenSSL is already available, or the SHA1 functions from libgcrypt is libgcrypt is already available, or if neither OpenSSL nor libgcrypt are enabled in the configuration, we select the much smaller libsha1, that has been specifically written to fulfill the X.org server requirements. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:24 +01:00
ifeq ($(BR2_PACKAGE_OPENSSL),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto
xserver_xorg-server: provide more options for SHA1 library Until now, the X.org server was forcefully selecting OpenSSL, just to have a SHA1 implementation. However, in fact, the X.org server is capable of using a SHA1 implementation from multiple libraries: OpenSSL, libgcrypt and libsha1 amongst others. So, this patch changes the X.org server package so that we use the SHA1 functions from OpenSSL is OpenSSL is already available, or the SHA1 functions from libgcrypt is libgcrypt is already available, or if neither OpenSSL nor libgcrypt are enabled in the configuration, we select the much smaller libsha1, that has been specifically written to fulfill the X.org server requirements. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:24 +01:00
XSERVER_XORG_SERVER_DEPENDENCIES += openssl
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libgcrypt
xserver_xorg-server: provide more options for SHA1 library Until now, the X.org server was forcefully selecting OpenSSL, just to have a SHA1 implementation. However, in fact, the X.org server is capable of using a SHA1 implementation from multiple libraries: OpenSSL, libgcrypt and libsha1 amongst others. So, this patch changes the X.org server package so that we use the SHA1 functions from OpenSSL is OpenSSL is already available, or the SHA1 functions from libgcrypt is libgcrypt is already available, or if neither OpenSSL nor libgcrypt are enabled in the configuration, we select the much smaller libsha1, that has been specifically written to fulfill the X.org server requirements. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:24 +01:00
XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt
else
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1
xserver_xorg-server: provide more options for SHA1 library Until now, the X.org server was forcefully selecting OpenSSL, just to have a SHA1 implementation. However, in fact, the X.org server is capable of using a SHA1 implementation from multiple libraries: OpenSSL, libgcrypt and libsha1 amongst others. So, this patch changes the X.org server package so that we use the SHA1 functions from OpenSSL is OpenSSL is already available, or the SHA1 functions from libgcrypt is libgcrypt is already available, or if neither OpenSSL nor libgcrypt are enabled in the configuration, we select the much smaller libsha1, that has been specifically written to fulfill the X.org server requirements. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 12:29:24 +01:00
XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
endif
all packages: rename XXXTARGETS to xxx-package Also remove the redundant $(call ...). This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:07:32 +02:00
$(eval $(autotools-package))
Reference in New Issue Copy Permalink