Skip to contentSkip to conversation

package/libdrm: bump version to 2.4.61

PATCH New Bernd Kuhls 3 participants 6 messages Jun 7, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/3 package/libdrm: bump version to 2.4.61

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libdrm/libdrm.hash |    4 ++--
 package/libdrm/libdrm.mk   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libdrm/libdrm.hash +2 -2
index 42675bb..99889ea 100644
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/dri-devel/2015-March/079617.html
-sha256	99575fc6c8e31f59193f5320fd4db7a5478e2641b5266147caab9aa875b59889	libdrm-2.4.60.tar.bz2
+# From http://lists.freedesktop.org/archives/dri-devel/2015-May/082348.html
+sha256	8b549092c8961a393a7e1d9a1bccddcea8e2af67c0d7d7c67babb9fc3b47699c	libdrm-2.4.61.tar.bz2
package/libdrm/libdrm.mk +1 -1
index a804ee8..3c3de1d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBDRM_VERSION = 2.4.60
+LIBDRM_VERSION = 2.4.61
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm
 LIBDRM_LICENSE = MIT
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/3 package/{mesa3d, mesa3d-headers}: bump version to 10.5.7

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mesa3d-headers/mesa3d-headers.mk |    2 +-
 package/mesa3d/mesa3d.hash               |    4 ++--
 package/mesa3d/mesa3d.mk                 |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
package/mesa3d-headers/mesa3d-headers.mk +1 -1
index 67cdf70..0979406 100644
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 10.5.4
+MESA3D_HEADERS_VERSION = 10.5.7
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
 MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
package/mesa3d/mesa3d.hash +2 -2
index 9b63e4d..b026245 100644
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/mesa-announce/2015-April/000151.html
-sha256	b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803	mesa-10.5.4.tar.xz
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-June/000157.html
+sha256	04d06890cd69af8089d6ca76f40e46dcf9cacfe4a9788b32be620574d4638818	mesa-10.5.7.tar.xz
package/mesa3d/mesa3d.mk +1 -1
index f1f2304..4a419de 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 10.5.4
+MESA3D_VERSION = 10.5.7
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 MESA3D_LICENSE = MIT, SGI, Khronos
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 package/{mesa3d, mesa3d-headers}: bump version to 10.5.7

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mesa3d-headers/mesa3d-headers.mk |    2 +-
 package/mesa3d/mesa3d.hash               |    4 ++--
 package/mesa3d/mesa3d.mk                 |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 3/3 package/vlc: Improve libGL detection

In reply to Bernd Kuhls

mesa3d defaults to --enable-opengl due to its weird configure.ac:
http://git.buildroot.net/buildroot/commit/package/mesa3d/mesa3d.mk?id=384d601d4ea2c41bb7928f756bfe88af4d38b38b

This leads to include/GL/gl.h and lib/pkgconfig/gl.pc being installed to STAGING_DIR. These files are enough for vlc to think that libGL.so is present which it is not in the defconfig being fixed by this patch.

Fixes
http://autobuild.buildroot.net/results/e63/e639dabfb260006acb8a204851b96f9275ce53a7/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/vlc/0008-ac-check-lib-gl.patch |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/vlc/0008-ac-check-lib-gl.patch
package/vlc/0008-ac-check-lib-gl.patch new file +18 -0
new file mode 100644
index 0000000..7fa46a3
@@ -0,0 +1,18 @@
+Improve libGL detection
+
+The presence of gl.pc does not mean that libGL.so was installed.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr vlc-2.2.1.org/configure.ac vlc-2.2.1/configure.ac
+--- vlc-2.2.1.org/configure.ac	2015-04-13 09:57:54.000000000 +0200
++++ vlc-2.2.1/configure.ac	2015-06-07 17:35:22.014022842 +0200
+@@ -3054,7 +3054,7 @@
+ 
+ have_gl="no"
+ PKG_CHECK_MODULES([GL], [gl], [
+-  have_gl="yes"
++  AC_CHECK_LIB([GL],  [main],[ have_gl="yes"])
+ ], [
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef _WIN32
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 3/3 package/vlc: Improve libGL detection

Bernd, All,

On 2015-06-07 18:14 +0200, Bernd Kuhls spake thusly:

Quoted 27 lines

mesa3d defaults to --enable-opengl due to its weird configure.ac:
http://git.buildroot.net/buildroot/commit/package/mesa3d/mesa3d.mk?id=384d601d4ea2c41bb7928f756bfe88af4d38b38b

This leads to include/GL/gl.h and lib/pkgconfig/gl.pc being installed to STAGING_DIR. These files are enough for vlc to think that libGL.so is present which it is not in the defconfig being fixed by this patch.

Fixes
http://autobuild.buildroot.net/results/e63/e639dabfb260006acb8a204851b96f9275ce53a7/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/vlc/0008-ac-check-lib-gl.patch |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/vlc/0008-ac-check-lib-gl.patch
package/vlc/0008-ac-check-lib-gl.patch new file +5 -0
new file mode 100644
index 0000000..7fa46a3
@@ -0,0 +1,18 @@
+Improve libGL detection
+
+The presence of gl.pc does not mean that libGL.so was installed.
+
+Signed-off-by: Bernd Kuhls <[email protected]>

package/vlc/0008-ac-check-lib-gl.patch line 15

Quoted 10 lines
package/vlc/0008-ac-check-lib-gl.patch new file +10 -0
+
+diff -uNr vlc-2.2.1.org/configure.ac vlc-2.2.1/configure.ac
+--- vlc-2.2.1.org/configure.ac	2015-04-13 09:57:54.000000000 +0200
++++ vlc-2.2.1/configure.ac	2015-06-07 17:35:22.014022842 +0200
+@@ -3054,7 +3054,7 @@
+ 
+ have_gl="no"
+ PKG_CHECK_MODULES([GL], [gl], [
+-  have_gl="yes"
++  AC_CHECK_LIB([GL],  [main],[ have_gl="yes"])

Instead of patching vlc, can't we fix mesa3d, by removing the offending files when mesa3d is not configured to install them?

This patch only fixes vlc, but there might be other packages that would mis-detect OpenGL in that situation, so rather than fixing each of those, it would be better to fix mesa3d.

Regards,
Yann E. MORIN.

Quoted 10 lines
package/vlc/0008-ac-check-lib-gl.patch new file +3 -0
+ ], [
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef _WIN32
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'