Skip to contentSkip to conversation

Bump libdrm to 2.4.14

PATCH New Paul Jones 3 participants 3 messages Mar 29, 2010

lore
Share & tools
lore

Paul Jones

author
#0 lore raw

PATCH 1/1 Bump libdrm to 2.4.14

Also adds proper dependency information to stop build errors.

---
 package/libdrm/Config.in |    6 ++++++
 package/libdrm/libdrm.mk |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)
package/libdrm/Config.in +6 -0
index 3d8a731..e1d35ad 100644
@@ -1,5 +1,11 @@
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XPROTO_DRI2PROTO
+	select BR2_PACKAGE_PTHREAD_STUBS
 	help
 	  Direct Rendering Manager
 
package/libdrm/libdrm.mk +3 -1
index eb04867..e56f542 100644
@@ -3,7 +3,7 @@
 # libdrm
 #
 #############################################################
-LIBDRM_VERSION = 2.4.11
+LIBDRM_VERSION = 2.4.14
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
 LIBDRM_AUTORECONF = NO
@@ -11,4 +11,6 @@ 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
+
 $(eval $(call AUTOTARGETS,package,libdrm))
Signature · 1 line
1.6.4.4
#1 lore raw

PATCH 1/1 Bump libdrm to 2.4.14

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Jones <[email protected]> writes:

Paul> Also adds proper dependency information to stop build errors. Paul> Signed-off-by: Paul Jones <[email protected]> Paul> ---

 Paul>  package/libdrm/Config.in |    6 ++++++
 Paul>  package/libdrm/libdrm.mk |    4 +++-

Paul> 2 files changed, 9 insertions(+), 1 deletions(-)

Paul> diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in Paul> index 3d8a731..e1d35ad 100644
Paul> --- a/package/libdrm/Config.in
Paul> +++ b/package/libdrm/Config.in
Paul> @@ -1,5 +1,11 @@
Paul> config BR2_PACKAGE_LIBDRM
Paul> bool "libdrm"
Paul> + select BR2_PACKAGE_XPROTO_GLPROTO
Paul> + select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
Paul> + select BR2_PACKAGE_XLIB_LIBXXF86VM
Paul> + select BR2_PACKAGE_XLIB_LIBXMU
Paul> + select BR2_PACKAGE_XPROTO_DRI2PROTO
Paul> + select BR2_PACKAGE_PTHREAD_STUBS

That won't work unless we make libdrm depend on the X stuff, as those packages are only available when BR2_PACKAGE_XORG7 is enabled - E.G.:

make: *** No rule to make target xproto_glproto', needed by libdrm-depends'. Stop.

Care to fix?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 Bump libdrm to 2.4.14

Quoted 23 lines · Peter Korsgaard
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Paul" == Paul Jones<[email protected]> writes:

  Paul>  Also adds proper dependency information to stop build errors.
  Paul>  Signed-off-by: Paul Jones<[email protected]>
  Paul>  ---
  Paul>   package/libdrm/Config.in |    6 ++++++
  Paul>   package/libdrm/libdrm.mk |    4 +++-

Paul> 2 files changed, 9 insertions(+), 1 deletions(-)

  Paul>  diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
  Paul>  index 3d8a731..e1d35ad 100644
  Paul>  --- a/package/libdrm/Config.in
  Paul>  +++ b/package/libdrm/Config.in
  Paul>  @@ -1,5 +1,11 @@
  Paul>   config BR2_PACKAGE_LIBDRM
  Paul>   	bool "libdrm"
  Paul>  +	select BR2_PACKAGE_XPROTO_GLPROTO
  Paul>  +	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
  Paul>  +	select BR2_PACKAGE_XLIB_LIBXXF86VM
  Paul>  +	select BR2_PACKAGE_XLIB_LIBXMU
  Paul>  +	select BR2_PACKAGE_XPROTO_DRI2PROTO
  Paul>  +	select BR2_PACKAGE_PTHREAD_STUBS
Quoted 7 lines

That won't work unless we make libdrm depend on the X stuff, as those packages are only available when BR2_PACKAGE_XORG7 is enabled - E.G.:

make: *** No rule to make target xproto_glproto', needed by libdrm-depends'. Stop.

Care to fix?

I should have put a "depends on BR2_PACKAGE_XORG7" in there, as that's the first thing that's listed under dependencies on the libdrm website. There was something in my configuration that selected libdrm when I enabled X so I'll dig around and see if I can make it work better.