* [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61
@ 2015-06-07 16:14 Bernd Kuhls
2015-06-07 16:14 ` [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bernd Kuhls @ 2015-06-07 16:14 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/libdrm/libdrm.hash | 4 ++--
package/libdrm/libdrm.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash
index 42675bb..99889ea 100644
--- a/package/libdrm/libdrm.hash
+++ b/package/libdrm/libdrm.hash
@@ -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
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index a804ee8..3c3de1d 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 2015-06-07 16:14 [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Bernd Kuhls @ 2015-06-07 16:14 ` Bernd Kuhls 2015-06-07 22:11 ` Peter Korsgaard 2015-06-07 16:14 ` [Buildroot] [PATCH 3/3] package/vlc: Improve libGL detection Bernd Kuhls 2015-06-07 22:09 ` [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Peter Korsgaard 2 siblings, 1 reply; 6+ messages in thread From: Bernd Kuhls @ 2015-06-07 16:14 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 67cdf70..0979406 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -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 diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 9b63e4d..b026245 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -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 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f1f2304..4a419de 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 2015-06-07 16:14 ` [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 Bernd Kuhls @ 2015-06-07 22:11 ` Peter Korsgaard 0 siblings, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2015-06-07 22:11 UTC (permalink / raw) To: buildroot >>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > 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. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] package/vlc: Improve libGL detection 2015-06-07 16:14 [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Bernd Kuhls 2015-06-07 16:14 ` [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 Bernd Kuhls @ 2015-06-07 16:14 ` Bernd Kuhls 2015-06-07 17:29 ` Yann E. MORIN 2015-06-07 22:09 ` [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Peter Korsgaard 2 siblings, 1 reply; 6+ messages in thread From: Bernd Kuhls @ 2015-06-07 16:14 UTC (permalink / raw) To: buildroot 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 <bernd.kuhls@t-online.de> --- 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 diff --git a/package/vlc/0008-ac-check-lib-gl.patch b/package/vlc/0008-ac-check-lib-gl.patch new file mode 100644 index 0000000..7fa46a3 --- /dev/null +++ b/package/vlc/0008-ac-check-lib-gl.patch @@ -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 <bernd.kuhls@t-online.de> + +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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] package/vlc: Improve libGL detection 2015-06-07 16:14 ` [Buildroot] [PATCH 3/3] package/vlc: Improve libGL detection Bernd Kuhls @ 2015-06-07 17:29 ` Yann E. MORIN 0 siblings, 0 replies; 6+ messages in thread From: Yann E. MORIN @ 2015-06-07 17:29 UTC (permalink / raw) To: buildroot Bernd, All, On 2015-06-07 18:14 +0200, Bernd Kuhls spake thusly: > 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 <bernd.kuhls@t-online.de> > --- > 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 > > diff --git a/package/vlc/0008-ac-check-lib-gl.patch b/package/vlc/0008-ac-check-lib-gl.patch > new file mode 100644 > index 0000000..7fa46a3 > --- /dev/null > +++ b/package/vlc/0008-ac-check-lib-gl.patch > @@ -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 <bernd.kuhls@t-online.de> > + > +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. > + ], [ > + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ > + #ifdef _WIN32 > -- > 1.7.10.4 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 2015-06-07 16:14 [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Bernd Kuhls 2015-06-07 16:14 ` [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 Bernd Kuhls 2015-06-07 16:14 ` [Buildroot] [PATCH 3/3] package/vlc: Improve libGL detection Bernd Kuhls @ 2015-06-07 22:09 ` Peter Korsgaard 2 siblings, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2015-06-07 22:09 UTC (permalink / raw) To: buildroot >>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-06-07 22:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-07 16:14 [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Bernd Kuhls
2015-06-07 16:14 ` [Buildroot] [PATCH 2/3] package/{mesa3d, mesa3d-headers}: bump version to 10.5.7 Bernd Kuhls
2015-06-07 22:11 ` Peter Korsgaard
2015-06-07 16:14 ` [Buildroot] [PATCH 3/3] package/vlc: Improve libGL detection Bernd Kuhls
2015-06-07 17:29 ` Yann E. MORIN
2015-06-07 22:09 ` [Buildroot] [PATCH 1/3] package/libdrm: bump version to 2.4.61 Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox