Commit 72e184b7 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

libdrm: Remove dependency towards X11 



Using this defconfig

BR2_x86_pentium_mmx=y
BR2_ENABLE_DEBUG=y
BR2_OPTIMIZE_2=y
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
# BR2_UCLIBC_INSTALL_UTILS is not set
BR2_BINUTILS_VERSION_2_23_2=y
BR2_GCC_VERSION_4_8_X=y
BR2_PACKAGE_LIBDRM=y
BR2_PACKAGE_LIBDRM_RADEON=y
BR2_PACKAGE_LIBDRM_NOUVEAU=y
BR2_PACKAGE_LIBDRM_VMWGFX=y

libdrm (w/o Intel API) compiles without BR2_PACKAGE_LIBATOMIC_OPS and without
BR2_PACKAGE_XLIB_LIBPCIACCESS, so USE_WCHAR, TOOLCHAIN_HAS_THREADS and
!BR2_PREFER_STATIC_LIB, previously added by the Xorg dependency, do not seem
to be necessary for libdrm at all.

Signed-off-by: default avatarBernd Kuhls <berndkuhls@hotmail.com>
Signed-Off-By: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarSpenser Gilliland <spenser@gillilanding.com>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5562be13

package/libdrm/Config.in

+1 −6
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBDRM

	bool "libdrm"

	select BR2_PACKAGE_LIBPTHREAD_STUBS

	depends on BR2_PACKAGE_XORG7

	depends on BR2_LARGEFILE

	help

	  Direct Rendering Manager
@@ -14,6 +13,7 @@ menu "DRM Drivers" 


config BR2_PACKAGE_LIBDRM_INTEL

	bool "intel"

	depends on BR2_PACKAGE_XORG7

	select BR2_PACKAGE_LIBATOMIC_OPS

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64
@@ -22,22 +22,18 @@ config BR2_PACKAGE_LIBDRM_INTEL 


config BR2_PACKAGE_LIBDRM_RADEON

	bool "radeon"

	select BR2_PACKAGE_LIBATOMIC_OPS

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  install AMD/ATI graphics driver



config BR2_PACKAGE_LIBDRM_NOUVEAU

	bool "nouveau"

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  install Nvidia graphics driver



config BR2_PACKAGE_LIBDRM_VMWGFX

	bool "vmwgfx"

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  installs Vmware graphics driver
@@ -65,5 +61,4 @@ endmenu 
endif



comment "libdrm needs a toolchain w/ largefile"

	depends on BR2_PACKAGE_XORG7

	depends on !BR2_LARGEFILE

package/libdrm/libdrm.mk

+0 −3
Original line number Diff line number Diff line
@@ -28,21 +28,18 @@ endif 


ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y)

LIBDRM_CONF_OPT += --enable-radeon

LIBDRM_DEPENDENCIES += xlib_libpciaccess

else

LIBDRM_CONF_OPT += --disable-radeon

endif



ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y)

LIBDRM_CONF_OPT += --enable-nouveau

LIBDRM_DEPENDENCIES += xlib_libpciaccess

else

LIBDRM_CONF_OPT += --disable-nouveau

endif



ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y)

LIBDRM_CONF_OPT += --enable-vmwgfx

LIBDRM_DEPENDENCIES += xlib_libpciaccess

else

LIBDRM_CONF_OPT += --disable-vmwgfx

endif