* [gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/files/, media-libs/libglvnd/
@ 2019-09-25 18:18 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2019-09-25 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 3878d4f1f1b60702ba890711f694cc71783f6b41
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 18:17:53 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 18:18:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3878d4f1
media-libs/libglvnd: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/libglvnd/Manifest | 1 -
...-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch | 219 ---------------------
media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild | 56 ------
3 files changed, 276 deletions(-)
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index f1d1bbc8d4b..111dfb6a2d9 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,2 +1 @@
-DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7
DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
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
deleted file mode 100644
index 02996f4f3d3..00000000000
--- a/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 0dfaea2bcb7cdcc785f95e244223bd004a2d7fba Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-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 0000000..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 0000000..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
-@@ -38,3 +38,5 @@ libGLESv1_CM_la_LIBADD = \
- ../GLdispatch/vnd-glapi/libglapi_glesv1.la \
- ../util/libutils_misc.la
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glesv1_cm.pc
-diff --git a/src/GLESv1/glesv1_cm.pc.in b/src/GLESv1/glesv1_cm.pc.in
-new file mode 100644
-index 0000000..daa247f
---- /dev/null
-+++ b/src/GLESv1/glesv1_cm.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: glesv1_cm
-+Description: OpenGL ES-CM v1 library and headers
-+Version: 1.0
-+Libs: -L${libdir} -lGLESv1_CM
-+Cflags: -I${includedir}
-diff --git a/src/GLESv2/Makefile.am b/src/GLESv2/Makefile.am
-index a9c2351..f40e06f 100644
---- a/src/GLESv2/Makefile.am
-+++ b/src/GLESv2/Makefile.am
-@@ -38,3 +38,5 @@ libGLESv2_la_LIBADD = \
- ../GLdispatch/vnd-glapi/libglapi_glesv2.la \
- ../util/libutils_misc.la
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glesv2.pc
-diff --git a/src/GLESv2/glesv2.pc.in b/src/GLESv2/glesv2.pc.in
-new file mode 100644
-index 0000000..a9fe839
---- /dev/null
-+++ b/src/GLESv2/glesv2.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: gles2
-+Description: OpenGL ES v2/v3 library and headers
-+Version: 3.2
-+Libs: -L${libdir} -lGLESv2
-+Cflags: -I${includedir}
-diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am
-index 030836b..0d19674 100644
---- a/src/GLX/Makefile.am
-+++ b/src/GLX/Makefile.am
-@@ -69,3 +69,5 @@ libGLX_la_SOURCES = \
- libglxmapping.c \
- libglxproto.c
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glx.pc
-diff --git a/src/GLX/glx.pc.in b/src/GLX/glx.pc.in
-new file mode 100644
-index 0000000..1561181
---- /dev/null
-+++ b/src/GLX/glx.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: glx
-+Description: GLX library and headers
-+Version: 1.4
-+Libs: -L${libdir} -lGLX
-+Cflags: -I${includedir}
-diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am
-index 647d9e4..4b34dd5 100644
---- a/src/OpenGL/Makefile.am
-+++ b/src/OpenGL/Makefile.am
-@@ -47,3 +47,5 @@ libOpenGL_la_LIBADD = \
- ../GLdispatch/vnd-glapi/libglapi_opengl.la \
- ../util/libutils_misc.la
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = opengl.pc
-diff --git a/src/OpenGL/opengl.pc.in b/src/OpenGL/opengl.pc.in
-new file mode 100644
-index 0000000..d560c06
---- /dev/null
-+++ b/src/OpenGL/opengl.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: opengl
-+Description: OpenGL (without GLX) headers and interface
-+Version: 4.5
-+Libs: -L${libdir} -lOpenGL
-+Cflags: -I${includedir}
---
-2.21.0
-
diff --git a/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild
deleted file mode 100644
index 090fdd736c4..00000000000
--- a/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://github.com/NVIDIA/libglvnd"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- !media-libs/mesa[-libglvnd(-)]
- !<media-libs/mesa-19.2.0_rc1
- x11-libs/libX11[${MULTILIB_USEDEP}]
- "
-DEPEND="${PYTHON_DEPS}
- ${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
- emake check
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/files/, media-libs/libglvnd/
@ 2019-12-06 17:25 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2019-12-06 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 630f6f5ed9e3d1b80d0947a3a751578a862d6449
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 6 17:14:44 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 17:25:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=630f6f5e
media-libs/libglvnd: Fix a couple of mistakes
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch | 54 ++++++++++++++++++++++
.../libglvnd-1.3.0-meson-Fix-the-armv7-build.patch | 36 +++++++++++++++
media-libs/libglvnd/libglvnd-1.3.0.ebuild | 5 ++
3 files changed, 95 insertions(+)
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
new file mode 100644
index 00000000000..51a26c8e0dc
--- /dev/null
+++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
@@ -0,0 +1,54 @@
+From 5ffb8df0ae243f611a0752950443e7a9877e502c Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+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
new file mode 100644
index 00000000000..e520ae7ff4a
--- /dev/null
+++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
@@ -0,0 +1,36 @@
+From 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc Mon Sep 17 00:00:00 2001
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+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 a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
+index c5319fc..ce20178 100644
+--- a/src/GLdispatch/vnd-glapi/meson.build
++++ b/src/GLdispatch/vnd-glapi/meson.build
+@@ -39,7 +39,7 @@ if gl_dispatch_type == 'pure_c'
+ _entry_files += 'entry_pure_c.c'
+ else
+ _entry_files += 'entry_common.c'
+- if gl_dispatch_type != 'arm_tsd'
++ if gl_dispatch_type != 'armv7_tsd'
+ _entry_files += 'entry_simple_asm.c'
+ endif
+ if gl_dispatch_type == 'x86_tls'
+@@ -50,7 +50,7 @@ else
+ _entry_files += 'entry_x86_64_tls.c'
+ elif gl_dispatch_type == 'x86_64_tsd'
+ _entry_files += 'entry_x86_64_tsd.c'
+- elif gl_dispatch_type == 'arm_tsd'
++ elif gl_dispatch_type == 'armv7_tsd'
+ _entry_files += 'entry_armv7_tsd.c'
+ elif gl_dispatch_type == 'aarch64_tsd'
+ _entry_files += 'entry_aarch64_tsd.c'
+--
+2.23.0
+
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
index b19c93a7923..3998ef2e3b8 100644
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
@@ -41,6 +41,11 @@ RDEPEND="
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-Fix-the-armv7-build.patch
+ "${FILESDIR}"/${P}-meson-Fix-the-PPC64-build.patch
+)
+
multilib_src_configure() {
local emesonargs=(
$(meson_feature X x11)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-06 17:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-25 18:18 [gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/files/, media-libs/libglvnd/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2019-12-06 17:25 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox