diff options
Diffstat (limited to 'media-libs/libglvnd')
3 files changed, 0 insertions, 282 deletions
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index a08b7a0bbb23..bf4434decf83 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,11 +1,4 @@ -<<<<<<< HEAD -AUX libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch 6596 BLAKE2B 0528a825fbbfe8c7530e841c1542a9a4d3e08159abc379f09df3789ccbde583243c1ed478ab14638ffef7b7949090a24b2a9204cb5b4641f8b9bef4e1540bd3d SHA512 5c3ea6d4f0c683945ff2178fe43cc2ac3876bba5f66dc9291a8129213ba3235a732fe86b53bfeeb5df08134ed782967027b7387c12e9bc1a1be795e0c1400a55 -DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7 DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c -EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c -======= -DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c ->>>>>>> next EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455 EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c 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 02996f4f3d34..000000000000 --- 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 090fdd736c49..000000000000 --- 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 -} |