drm: Branch 'master' - 4 commits

 Android.mk                 |   19 +++++++++++++++++++
 amdgpu/libdrm_amdgpu.pc.in |    1 +
 libkms/libkms.pc.in        |    1 +
 radeon/libdrm_radeon.pc.in |    1 +
 4 files changed, 22 insertions(+)

New commits:
commit 682eaa05e6bc6b191b826e1c9db4446caea43c49
Author: Sumit Semwal <[email protected]>
Date:   Fri Jan 29 10:00:47 2016 -0600

    android: enable building static version of libdrm
    
    Android needs libdrm built statically for recovery;
    enable that as well.
    
    Signed-off-by: Sumit Semwal <[email protected]>
    Signed-off-by: Rob Herring <[email protected]>
    Cc: Chih-Wei Huang <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/Android.mk b/Android.mk
index 90cdcb3..1d8cd65 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,8 @@ include $(CLEAR_VARS)
 # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
 include $(LOCAL_PATH)/Makefile.sources
 
+#static library for the device (recovery)
+include $(CLEAR_VARS)
 LOCAL_MODULE := libdrm
 LOCAL_MODULE_TAGS := optional
 
@@ -41,7 +43,24 @@ LOCAL_C_INCLUDES := \
 LOCAL_CFLAGS := \
 	-DHAVE_VISIBILITY=1 \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+include $(BUILD_STATIC_LIBRARY)
+
+# Shared library for the device
+include $(CLEAR_VARS)
+LOCAL_MODULE := libdrm
+LOCAL_MODULE_TAGS := optional
 
+LOCAL_SRC_FILES := $(LIBDRM_FILES)
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+        $(LOCAL_PATH) \
+        $(LOCAL_PATH)/include/drm
+
+LOCAL_C_INCLUDES := \
+        $(LOCAL_PATH)/include/drm
+
+LOCAL_CFLAGS := \
+        -DHAVE_VISIBILITY=1 \
+        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
commit ca5017b69c43ef3bfada0abb77a82de1de345075
Author: Emil Velikov <[email protected]>
Date:   Thu Jan 28 11:39:03 2016 +0000

    libkms: add libdrm to Requires.private
    
    Analogous to last two changes (amdgpu and radeon).
    
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Jakob Bornecrantz <[email protected]>
    Reviewed-by: Michel Dänzer <[email protected]>

diff --git a/libkms/libkms.pc.in b/libkms/libkms.pc.in
index 511535a..1421b3e 100644
--- a/libkms/libkms.pc.in
+++ b/libkms/libkms.pc.in
@@ -8,3 +8,4 @@ Description: Library that abstract aways the different mm interface for kernel d
 Version: 1.0.0
 Libs: -L${libdir} -lkms
 Cflags: -I${includedir}/libkms
+Requires.private: libdrm
commit 31badf031c90aba4609e1464e252311f96733a5e
Author: Emil Velikov <[email protected]>
Date:   Thu Jan 28 11:33:34 2016 +0000

    radeon: add libdrm to Requires.private
    
    Equivalent to the amdgpu commit before. Additionally, when libdrm is
    installed to a 'non-default' location, users of libdrm_radeon will fail
    to build, as radeon_cs.h (and maybe others) won't have their
    dependencies (drm.h radeon_drm.h) fulfilled.
    
    Cc: Christian König <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Michel Dänzer <[email protected]>

diff --git a/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in
index 68ef0ab..432993a 100644
--- a/radeon/libdrm_radeon.pc.in
+++ b/radeon/libdrm_radeon.pc.in
@@ -8,3 +8,4 @@ Description: Userspace interface to kernel DRM services for radeon
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm_radeon
 Cflags: -I${includedir} -I${includedir}/libdrm
+Requires.private: libdrm
commit 87b3bf643de35223d9d038febc7d5e232325e7b2
Author: Emil Velikov <[email protected]>
Date:   Thu Jan 28 11:26:24 2016 +0000

    amdgpu: add libdrm as private requirement/dependency
    
    Otherwise libdrm.so won't end up in the --libs, when one static links
    libdrm_amdgpu.
    
    Cc: Christian König <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Michel Dänzer <[email protected]>

diff --git a/amdgpu/libdrm_amdgpu.pc.in b/amdgpu/libdrm_amdgpu.pc.in
index 417865e..f1c552a 100644
--- a/amdgpu/libdrm_amdgpu.pc.in
+++ b/amdgpu/libdrm_amdgpu.pc.in
@@ -8,3 +8,4 @@ Description: Userspace interface to kernel DRM services for amdgpu
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm_amdgpu
 Cflags: -I${includedir} -I${includedir}/libdrm
+Requires.private: libdrm

------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches