[gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/, media-libs/libglvnd/files/
commit: 1ba30220c8bc5753bffd4a84844c4fed1ae4a264
Author: Matt Turner gentoo org>
AuthorDate: Fri Feb 21 21:33:27 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Feb 21 21:33:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba30220
media-libs/libglvnd: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/libglvnd/Manifest | 1 -
.../libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch | 54
.../libglvnd-1.3.0-meson-Fix-the-armv7-build.patch | 36 ---
..._GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch | 28 -
media-libs/libglvnd/libglvnd-1.3.0.ebuild | 72 --
5 files changed, 191 deletions(-)
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 3f8bab80cf4..2d46b7953ce 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,2 +1 @@
-DIST libglvnd-1.3.0.tar.bz2 713781 BLAKE2B
15014038e8a0f14fc29892354b282535735af0f29e244e4826b945071deec151783fc042f3588add24c31f35a5c72c53bfb1090c109117466f8b8c805cc67356
SHA512
d573fc4a1114be9468afd6e035b3815111f9a7e7453bc2b127c93a1b8a01c7f20440ff8872fbae8fc93aab98862dac3224ceca7f28d02e93f3b9a641d1a248e3
DIST libglvnd-1.3.1.tar.bz2 714436 BLAKE2B
31b91f678b0335a7db3e697129dabd157c37fee0ec0f81f7d0be68ffcf9d6be2989a929f7b1fb87b505168ab4a3cc07b4cecf103f1d5a2a3b866eedb5a3a494b
SHA512
99bbe8447f7791c8a4b2ab4e9f3067309ea3ffb9a042b0b5e80d1eac7e6e36af8b5ec56ec3266f34343d705521827956f2fdca27be386f40e130cec300e8342c
diff --git
a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
deleted file mode 100644
index 51a26c8e0dc..000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 5ffb8df0ae243f611a0752950443e7a9877e502c Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman
-Date: Fri, 6 Dec 2019 07:27:54 -0700
-Subject: [PATCH 2/2] meson: Fix the PPC64 build.
-
-Check for a cpu_family value of 'ppc64', not 'ppc'. 'ppc' is for 32-bit power.
-
-In GLdispatch, fix the file list for the PPC64 entrypoints.
- meson.build | 4 ++--
- src/GLdispatch/vnd-glapi/meson.build | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 44c7172..602e837 100644
a/meson.build
-+++ b/meson.build
-@@ -55,7 +55,7 @@ if not with_asm.disabled()
- add_project_arguments('-DUSE_ARMV7_ASM', language : 'c')
- elif host_machine.cpu_family() == 'aarch64'
- add_project_arguments('-DUSE_AARCH64_ASM', language : 'c')
-- elif host_machine.cpu_family() == 'ppc' and host_machine.endian() ==
'little'
-+ elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() ==
'little'
- add_project_arguments('-DUSE_PPC64LE_ASM', language : 'c')
- elif with_asm.enabled()
- error('No ASM available for @0@ (@1@
endian)'.format(host_machine.system(), host_machine.endian()))
-@@ -118,7 +118,7 @@ if use_asm
- elif host_machine.cpu_family() == 'aarch64'
- gl_dispatch_type = 'aarch64_tsd'
- elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() ==
'little'
--gl_dispatch_type = 'ppc64le_@1@'.format(have_tls ? 'tls' : 'tsd')
-+gl_dispatch_type = 'ppc64le_@0@'.format(have_tls ? 'tls' : 'tsd')
- endif
- endif
-
add_project_arguments('-DGLDISPATCH_TYPE_@0@'.format(gl_dispatch_type.to_upper()),
language : ['c'])
-diff --git a/src/GLdispatch/vnd-glapi/meson.build
b/src/GLdispatch/vnd-glapi/meson.build
-index ce20178..200d476 100644
a/src/GLdispatch/vnd-glapi/meson.build
-+++ b/src/GLdispatch/vnd-glapi/meson.build
-@@ -55,9 +55,9 @@ else
- elif gl_dispatch_type == 'aarch64_tsd'
- _entry_files += 'entry_aarch64_tsd.c'
- elif gl_dispatch_type == 'ppc64le_tls'
--_entry_files += 'entry_aarch64_tls.c'
-+_entry_files += 'entry_ppc64le_tls.c'
- elif gl_dispatch_type == 'ppc64le_tsd'
--_entry_files += 'entry_aarch64_tsd.c'
-+_entry_files += 'entry_ppc64le_tsd.c'
- else
- error('No matching ASM file for @0@'.format(gl_dispatch_type))
- endif
---
-2.23.0
-
diff --git
a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
deleted file mode 100644
index e520ae7ff4a..000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman
-Date: Fri, 6 Dec 2019 07:22:40 -0700
-Subject: [PATCH 1/2] meson: Fix the armv7 build.
-
-Fix the GLdispatch meson file so that it checks for the value "armv7_tsd" for
-gl_dispatch_type instead of "arm_tsd".
- src/GLdispatch/vnd-glapi/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git
[gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/, media-libs/libglvnd/files/
commit: 9e64f3c5696dfa34125cebd5255ee3b35cfac2df
Author: Matt Turner gentoo org>
AuthorDate: Fri Jan 17 22:27:16 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Jan 17 22:48:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e64f3c5
media-libs/libglvnd: Add patch to fix test suite on HPPA
Signed-off-by: Matt Turner gentoo.org>
..._GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch | 28 ++
media-libs/libglvnd/libglvnd-1.3.0.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git
a/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
b/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
new file mode 100644
index 000..f3492462ddb
--- /dev/null
+++
b/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
@@ -0,0 +1,28 @@
+From a322bd006c5e505a1a2406828211736a93c99924 Mon Sep 17 00:00:00 2001
+From: Matt Turner
+Date: Wed, 15 Jan 2020 19:21:02 -0800
+Subject: [PATCH] tests: Add _GLOBAL_OFFSET_TABLE_ to PLATFORM_SYMBOLS
+
+On PA-RISC, the _GLOBAL_OFFSET_TABLE_ symbol is always exposed. See
+
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob;f=bfd/elf32-hppa.c;h=2e653083ce05a77b3e33c056e2f9a51b327c2b22#l1001
+https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=blob;f=sysdeps/hppa/dl-machine.h;h=9e98366ea3b09612d54a3e956d5c35c1bdc86560#l80
+---
+ bin/symbols-check.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/symbols-check.py b/bin/symbols-check.py
+index 1c028e4..1548638 100644
+--- a/bin/symbols-check.py
b/bin/symbols-check.py
+@@ -30,6 +30,7 @@ import subprocess
+
+ # This list contains symbols that _might_ be exported for some platforms
+ PLATFORM_SYMBOLS = [
++'_GLOBAL_OFFSET_TABLE_',
+ '__bss_end__',
+ '__bss_start__',
+ '__bss_start',
+--
+2.24.1
+
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
index cb18f71aa5c..0da5d4de4b1 100644
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
@@ -44,6 +44,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-meson-Fix-the-armv7-build.patch
"${FILESDIR}"/${P}-meson-Fix-the-PPC64-build.patch
+
"${FILESDIR}"/${P}-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
)
multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/, media-libs/libglvnd/files/
commit: 178a6a0b5c7e20e6ae2ae61cf1bc62b95bf4448d
Author: Matt Turner gentoo org>
AuthorDate: Wed Sep 18 19:14:14 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Sep 18 20:09:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178a6a0b
media-libs/libglvnd: Install pkg-config files
Signed-off-by: Matt Turner gentoo.org>
...-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch | 219 +
...glvnd-1.1.1.ebuild => libglvnd-1.1.1-r1.ebuild} | 7 +-
2 files changed, 225 insertions(+), 1 deletion(-)
diff --git
a/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
new file mode 100644
index 000..02996f4f3d3
--- /dev/null
+++
b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
@@ -0,0 +1,219 @@
+From 0dfaea2bcb7cdcc785f95e244223bd004a2d7fba Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman
+Date: Tue, 3 Sep 2019 08:13:34 -0600
+Subject: [PATCH] Add pkg-config files for EGL, GL, GLES, and GLX.
+
+This preserves the names from Mesa's gl, glesv1_cm, glesv2, and egl pkgconfig
+data, and for compatibility with that, gl.pc gives you libGL.
+
+Also added glx.pc and opengl.pc for libglvnd's libGLX and libOpenGL libraries.
+If newer applications want to explicitly depend on libGLX and the appropriate
+rendering API they can ask for the new pkgconfig names.
+
+Note that the version numbers in each file are the API versions that each
+library exposes, not the libglvnd package version.
+---
+ configure.ac | 6 ++
+ src/EGL/Makefile.am| 3 +++
+ src/EGL/egl.pc.in | 10 ++
+ src/GL/Makefile.am | 3 +++
+ src/GL/gl.pc.in| 10 ++
+ src/GLESv1/Makefile.am | 2 ++
+ src/GLESv1/glesv1_cm.pc.in | 10 ++
+ src/GLESv2/Makefile.am | 2 ++
+ src/GLESv2/glesv2.pc.in| 10 ++
+ src/GLX/Makefile.am| 2 ++
+ src/GLX/glx.pc.in | 10 ++
+ src/OpenGL/Makefile.am | 2 ++
+ src/OpenGL/opengl.pc.in| 10 ++
+ 13 files changed, 80 insertions(+)
+ create mode 100644 src/EGL/egl.pc.in
+ create mode 100644 src/GL/gl.pc.in
+ create mode 100644 src/GLESv1/glesv1_cm.pc.in
+ create mode 100644 src/GLESv2/glesv2.pc.in
+ create mode 100644 src/GLX/glx.pc.in
+ create mode 100644 src/OpenGL/opengl.pc.in
+
+diff --git a/configure.ac b/configure.ac
+index cdbb138..7feec30 100644
+--- a/configure.ac
b/configure.ac
+@@ -324,11 +324,17 @@ AC_CONFIG_FILES([Makefile
+ include/Makefile
+ src/Makefile
+ src/GL/Makefile
++ src/GL/gl.pc
++ src/OpenGL/opengl.pc
+ src/OpenGL/Makefile
++ src/GLESv1/glesv1_cm.pc
+ src/GLESv1/Makefile
++ src/GLESv2/glesv2.pc
+ src/GLESv2/Makefile
++ src/GLX/glx.pc
+ src/GLX/Makefile
+ src/EGL/Makefile
++ src/EGL/egl.pc
+ src/GLdispatch/Makefile
+ src/GLdispatch/vnd-glapi/Makefile
+ src/util/Makefile
+diff --git a/src/EGL/Makefile.am b/src/EGL/Makefile.am
+index 5c036dc..c55c83e 100644
+--- a/src/EGL/Makefile.am
b/src/EGL/Makefile.am
+@@ -106,3 +106,6 @@ g_egldispatchstubs.c : $(GENERATE_DEPS)
+ g_egldispatchstubs.h : $(GENERATE_DEPS)
+ $(AM_V_GEN)$(PYTHON) $(GENERATE_DISPATCH_SCRIPT) header
$(GENERATE_LIST_FILES) > $@
+ endif
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = egl.pc
+diff --git a/src/EGL/egl.pc.in b/src/EGL/egl.pc.in
+new file mode 100644
+index 000..ffae9e2
+--- /dev/null
b/src/EGL/egl.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: egl
++Description: EGL library and headers
++Version: 1.5
++Libs: -L${libdir} -lEGL
++Cflags: -I${includedir}
+diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am
+index ecdcbd0..225fdcb 100644
+--- a/src/GL/Makefile.am
b/src/GL/Makefile.am
+@@ -70,3 +70,6 @@ libGL_la_LIBADD += ../GLdispatch/libGLdispatch.la
+ libGL_la_LIBADD += ../GLdispatch/vnd-glapi/libglapi_gl.la
+ libGL_la_LIBADD += ../util/libutils_misc.la
+ libGL_la_LIBADD += @LIB_DL@
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = gl.pc
+diff --git a/src/GL/gl.pc.in b/src/GL/gl.pc.in
+new file mode 100644
+index 000..0eaa149
+--- /dev/null
b/src/GL/gl.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: gl
++Description: Legacy OpenGL and GLX library and headers
++Version: 1.2
++Libs: -L${libdir} -lGL
++Cflags: -I${includedir}
+diff --git a/src/GLESv1/Makefile.am b/src/GLESv1/Makefile.am
+index d20017d..88e07bc 100644
+--- a/src/GLESv1/Makefile.am
b/src/GLESv1/Makefile.am
