summaryrefslogtreecommitdiff
path: root/media-libs/libglvnd
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libglvnd')
-rw-r--r--media-libs/libglvnd/Manifest9
-rw-r--r--media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch219
-rw-r--r--media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild (renamed from media-libs/libglvnd/libglvnd-1.1.1.ebuild)9
-rw-r--r--media-libs/libglvnd/libglvnd-1.2.0.ebuild (renamed from media-libs/libglvnd/libglvnd-1.1.0.20190213.ebuild)32
-rw-r--r--media-libs/libglvnd/libglvnd-9999.ebuild21
5 files changed, 263 insertions, 27 deletions
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 5fb2d79c8c9d..d967f76be13d 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,7 @@
-DIST libglvnd-1.1.0.20190213.tar.gz 829094 BLAKE2B cf977846693a5de3485e23fe8b4c8e2bc0472d994dc85530ecd85c685d71abd7aa69e815292141f60fd69a299cf39ac16dda5822128295747bfd42db3408df66 SHA512 772445cbb5574c1900109b3e0d8aab442b8c8d9790c4d91e1400fccdff4a53b653b59120e4fb631a45fc47af02949288924e62a22c3d877d4f741d5596736e37
+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
-EBUILD libglvnd-1.1.0.20190213.ebuild 1073 BLAKE2B 0d0724d15fd6e1589235e5b1cdb8f39590535ea741c3213b20af42a1572b73e155b72e927cfa4a832b525b568e810a9d3785316d8152dddb61bb8632e06d2f45 SHA512 291b176d21ad08b26b427273ec0827b83e3cc6a660aef187457691c2768299b88175b78da8266b50e38295674b6d91d5540b5fbe98a17f030e3cffa012ee07fb
-EBUILD libglvnd-1.1.1.ebuild 943 BLAKE2B 398dce9c19a9776302b05cec211a2697a4fa44aabfb1e922fa37a6a4a666af4fe1967246bae025025003afb9377f3b4dcab1f1ebe4973ef9a842f96cb2f245a8 SHA512 6a63feb7ac9e92ab15e5cb7e50da5802dc5c8912a1927aa516f1b6e4ad6f2983c11a36301b38451cbe185079a216299cbbbd0e63732ebbf4629a6259bfdbb014
-EBUILD libglvnd-9999.ebuild 987 BLAKE2B 2bfa2707e24c90bb9945715f256a956328a00e981e380670320166e516c9d4820ec2a6d706758e069a2b5c28aa91f374969dd470c8770607bf0970a3ccb67090 SHA512 f8c41a37fa7874d1d3e3a15261d555640c1ce87df8e35dec09f9855c493777fb44af0bfcd510f63c7d5c82aae7f335b8d2781e2e9322d9d3fd27967f5fad66cc
+DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
+EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c
+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
new file mode 100644
index 000000000000..02996f4f3d34
--- /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 <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.ebuild b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild
index 89d10684b842..090fdd736c49 100644
--- a/media-libs/libglvnd/libglvnd-1.1.1.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-PYTHON_COMPAT=( python2_7 )
+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"
@@ -27,14 +27,19 @@ 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
- [[ $PV = 9999* ]] && eautoreconf
+ eautoreconf
}
multilib_src_configure() {
diff --git a/media-libs/libglvnd/libglvnd-1.1.0.20190213.ebuild b/media-libs/libglvnd/libglvnd-1.2.0.ebuild
index c1e812ba70bc..c7d45b570081 100644
--- a/media-libs/libglvnd/libglvnd-1.1.0.20190213.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.2.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-PYTHON_COMPAT=( python2_7 )
+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"
@@ -18,34 +18,36 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
KEYWORDS="~amd64"
- COMMIT="f92208be88dd06a70b6f79a1cb95571e2762a9ec"
- SRC_URI="https://github.com/NVIDIA/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- S=${WORKDIR}/${PN}-${COMMIT}
+ SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
fi
LICENSE="MIT"
SLOT="0"
-IUSE=""
+IUSE="X"
RDEPEND="
!media-libs/mesa[-libglvnd(-)]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- "
+ !<media-libs/mesa-19.2.0_rc1
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ )"
DEPEND="${PYTHON_DEPS}
- ${RDEPEND}"
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
+ ${RDEPEND}
+ X? ( x11-base/xorg-proto )"
src_prepare() {
default
- eautoreconf
+ [[ $PV = 9999* ]] && eautoreconf
}
multilib_src_configure() {
- ECONF_SOURCE=${S} econf
+ myconf=(
+ --disable-headers
+ $(use_enable X x11)
+ $(use_enable X glx)
+ )
+ ECONF_SOURCE=${S} econf "${myconf[@]}"
}
multilib_src_install() {
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 494820dda945..846bfd27931f 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-PYTHON_COMPAT=( python2_7 )
+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"
@@ -25,14 +25,18 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE=""
+IUSE="X"
RDEPEND="
!media-libs/mesa[-libglvnd(-)]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- "
+ !<media-libs/mesa-19.2.0_rc1
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ )"
DEPEND="${PYTHON_DEPS}
- ${RDEPEND}"
+ ${RDEPEND}
+ X? ( x11-base/xorg-proto )"
src_prepare() {
default
@@ -40,7 +44,12 @@ src_prepare() {
}
multilib_src_configure() {
- ECONF_SOURCE=${S} econf
+ myconf=(
+ --disable-headers
+ $(use_enable X x11)
+ $(use_enable X glx)
+ )
+ ECONF_SOURCE=${S} econf "${myconf[@]}"
}
multilib_src_install() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 17:31:00 +0000