xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

 configure.ac    |    1 +
 src/Makefile.am |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b795d1e137b34a314b4b41d025d96ca9251d6bbe
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu May 7 18:05:32 2015 +0900

    Link against libgbm
    
    Fixes unresolved symbol "gbm_create_device".
    
    Reported-and-Tested-by: Brian Paterni <bpaterni at gmail.com>

diff --git a/configure.ac b/configure.ac
index ead206e..946c70e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 # Checks for libraries.
 PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.46])
 PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu])
+PKG_CHECK_MODULES(GBM, [gbm])
 
 # Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7 xproto fontsproto xf86driproto $REQUIRED_MODULES])
diff --git a/src/Makefile.am b/src/Makefile.am
index 817da2d..8715eb3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,11 +26,12 @@
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
-amdgpu_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_AMDGPU_LIBS)
+amdgpu_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_AMDGPU_LIBS) $(GBM_LIBS)
 
 AMDGPU_KMS_SRCS=amdgpu_dri2.c amdgpu_kms.c drmmode_display.c amdgpu_bo_helper.c
 
 AM_CFLAGS = \
+            @GBM_CFLAGS@ \
             @LIBDRM_AMDGPU_CFLAGS@ \
             @XORG_CFLAGS@ \
             @LIBUDEV_CFLAGS@