Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] Bump libdrm to 2.4.14
@ 2010-03-29  7:52 Paul Jones
  2010-03-29 14:45 ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Jones @ 2010-03-29  7:52 UTC (permalink / raw)
  To: buildroot

Also adds proper dependency information to stop build errors.

Signed-off-by: Paul Jones <paul@pauljones.id.au>
---
 package/libdrm/Config.in |    6 ++++++
 package/libdrm/libdrm.mk |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 3d8a731..e1d35ad 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -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
 
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index eb04867..e56f542 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -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))
-- 
1.6.4.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH] Bump libdrm to 2.4.14
  2010-03-29  7:52 Paul Jones
@ 2010-03-29 14:45 ` Peter Korsgaard
  2010-03-29 20:36   ` Paul Jones
  0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2010-03-29 14:45 UTC (permalink / raw)
  To: buildroot

>>>>> "Paul" == Paul Jones <paul@pauljones.id.au> writes:

 Paul> Also adds proper dependency information to stop build errors.
 Paul> Signed-off-by: Paul Jones <paul@pauljones.id.au>
 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?

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH] Bump libdrm to 2.4.14
  2010-03-29 14:45 ` Peter Korsgaard
@ 2010-03-29 20:36   ` Paul Jones
  0 siblings, 0 replies; 5+ messages in thread
From: Paul Jones @ 2010-03-29 20:36 UTC (permalink / raw)
  To: buildroot

On 30/03/2010 1:45 AM, Peter Korsgaard wrote:
>>>>>> "Paul" == Paul Jones<paul@pauljones.id.au>  writes:
>>>>>>              
>   Paul>  Also adds proper dependency information to stop build errors.
>   Paul>  Signed-off-by: Paul Jones<paul@pauljones.id.au>
>   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?
>    
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.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH] Bump libdrm to 2.4.14
@ 2010-03-31 10:02 Paul Jones
  2010-03-31 10:17 ` Paul Jones
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Jones @ 2010-03-31 10:02 UTC (permalink / raw)
  To: buildroot

Also adds proper dependency information to stop build errors.

Signed-off-by: Paul Jones <paul@pauljones.id.au>
---
 package/libdrm/Config.in |    7 +++++++
 package/libdrm/libdrm.mk |    4 +++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 3d8a731..116bf13 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,5 +1,12 @@
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
+	depends on BR2_PACKAGE_XORG7
+	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
 
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index eb04867..e56f542 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -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))
-- 
1.6.4.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH] Bump libdrm to 2.4.14
  2010-03-31 10:02 [Buildroot] [PATCH] Bump libdrm to 2.4.14 Paul Jones
@ 2010-03-31 10:17 ` Paul Jones
  0 siblings, 0 replies; 5+ messages in thread
From: Paul Jones @ 2010-03-31 10:17 UTC (permalink / raw)
  To: buildroot

My apologies, I got the wrong version number from an outdated website
page. Please use the following patch with 2.4.19

Paul.

On 03/31/10 21:02, Paul Jones wrote:
> Also adds proper dependency information to stop build errors.
>
> Signed-off-by: Paul Jones <paul@pauljones.id.au>
> ---
>  package/libdrm/Config.in |    7 +++++++
>  package/libdrm/libdrm.mk |    4 +++-
>  2 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
> index 3d8a731..116bf13 100644
> --- a/package/libdrm/Config.in
> +++ b/package/libdrm/Config.in
> @@ -1,5 +1,12 @@
>  config BR2_PACKAGE_LIBDRM
>  	bool "libdrm"
> +	depends on BR2_PACKAGE_XORG7
> +	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
>  
> diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
> index eb04867..e56f542 100644
> --- a/package/libdrm/libdrm.mk
> +++ b/package/libdrm/libdrm.mk
> @@ -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))
>   

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-03-31 10:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-31 10:02 [Buildroot] [PATCH] Bump libdrm to 2.4.14 Paul Jones
2010-03-31 10:17 ` Paul Jones
  -- strict thread matches above, loose matches on Subject: below --
2010-03-29  7:52 Paul Jones
2010-03-29 14:45 ` Peter Korsgaard
2010-03-29 20:36   ` Paul Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox