libdrm: enable/disable features according to driver selection

Also cleanup autotools symbols and add libatomic_ops dependency
for Intel part.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 445eb72e1bc70c3f69d5759efe9c065102c17afa..ab8c2d8830075ea9799837a57ac56185da70a12a 100644 (file)
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_XLIB_LIBXMU
        select BR2_PACKAGE_XPROTO_DRI2PROTO
        select BR2_PACKAGE_PTHREAD_STUBS
+       select BR2_PACKAGE_LIBATOMIC_OPS if BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
        help
          Direct Rendering Manager
 

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 791e67dcf0222049ccbaba1e1d633376cc8ced55..38cb636fdc1c076036f031e7e4560c5e091bd623 100644 (file)
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -6,11 +6,20 @@
 LIBDRM_VERSION = 2.4.19
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
-LIBDRM_AUTORECONF = NO
 LIBDRM_LIBTOOL_PATCH = NO
 LIBDRM_INSTALL_STAGING = YES
-LIBDRM_INSTALL_TARGET = YES
 
 LIBDRM_DEPENDENCIES = xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xproto_dri2proto pthread-stubs
 
+ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)
+LIBDRM_CONF_OPT += --enable-intel
+LIBDRM_DEPENDENCIES += libatomic_ops
+else
+LIBDRM_CONF_OPT += --disable-intel
+endif
+
+ifneq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI),y)
+LIBDRM_CONF_OPT += --disable-radeon
+endif
+
 $(eval $(call AUTOTARGETS,package,libdrm))