Skip to contentSkip to conversation

Couple fixes for X11 Intel driver compilation

PATCH New Paulius Zaleckas 2 participants 4 messages Apr 14, 2010

lore
Share & tools
lore

Paulius Zaleckas

author
#0 lore raw

cover Couple fixes for X11 Intel driver compilation

X11 Intel driver compilation was broken since libdrm had no support for Intel driver enabled. It was disabled because libdrm needs libatomic_ops library.

---

Paulius Zaleckas (2):
libdrm: enable/disable features according to driver selection Add libatomic_ops 1.2 needed by libdrm Intel support

 package/Config.in                      |    1 +
 package/libatomic_ops/Config.in        |    4 ++++
 package/libatomic_ops/libatomic_ops.mk |   12 ++++++++++++
 package/libdrm/Config.in               |    1 +
 package/libdrm/libdrm.mk               |   13 +++++++++++--
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 package/libatomic_ops/Config.in
 create mode 100644 package/libatomic_ops/libatomic_ops.mk
author
#1 lore raw

PATCH 1/2 Add libatomic_ops 1.2 needed by libdrm Intel support

Signed-off-by Paulius Zaleckas <[email protected]>

---

 package/Config.in                      |    1 +
 package/libatomic_ops/Config.in        |    4 ++++
 package/libatomic_ops/libatomic_ops.mk |   12 ++++++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 package/libatomic_ops/Config.in
 create mode 100644 package/libatomic_ops/libatomic_ops.mk
package/Config.in +1 -0
index 2501903..25cfdb9 100644
@@ -300,6 +300,7 @@ source "package/libupnp/Config.in"
 endmenu
 
 menu "Other"
+source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
package/libatomic_ops/Config.in new file +4 -0
new file mode 100644
index 0000000..b9f14d1
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_LIBATOMIC_OPS
+	bool "libatomic_ops"
+	help
+	  Atomic operations library
package/libatomic_ops/libatomic_ops.mk new file +12 -0
new file mode 100644
index 0000000..f26a5fa
@@ -0,0 +1,12 @@
+#############################################################
+#
+# Atomic_ops library
+#
+#############################################################
+
+LIBATOMIC_OPS_VERSION = 1.2
+LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
+LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
+LIBATOMIC_OPS_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libatomic_ops))
author
#2 lore raw

PATCH 2/2 libdrm: enable/disable features according to driver selection

In reply to Paulius Zaleckas

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

Signed-off-by Paulius Zaleckas <[email protected]>

---

 package/libdrm/Config.in |    1 +
 package/libdrm/libdrm.mk |   13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
package/libdrm/Config.in +1 -0
index 445eb72..ab8c2d8 100644
@@ -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
package/libdrm/libdrm.mk +11 -2
index 791e67d..38cb636 100644
@@ -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))
#3 lore raw

cover Couple fixes for X11 Intel driver compilation

In reply to Paulius Zaleckas
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paulius" == Paulius Zaleckas <[email protected]> writes:

Paulius> X11 Intel driver compilation was broken since libdrm had no Paulius> support for Intel driver enabled. It was disabled because libdrm Paulius> needs libatomic_ops library.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard