summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/libglvnd/Manifest1
-rw-r--r--media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch54
-rw-r--r--media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch36
-rw-r--r--media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch28
-rw-r--r--media-libs/libglvnd/libglvnd-1.3.0.ebuild72
5 files changed, 0 insertions, 191 deletions
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 3f8bab80cf45..2d46b7953ce6 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 51a26c8e0dc8..000000000000
--- 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 <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
deleted file mode 100644
index e520ae7ff4a8..000000000000
--- 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 <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/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
deleted file mode 100644
index f3492462ddb7..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a322bd006c5e505a1a2406828211736a93c99924 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-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
deleted file mode 100644
index 75f6c80d4e7a..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
- SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
- S=${WORKDIR}/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
- !media-libs/mesa[-libglvnd(-)]
- !<media-libs/mesa-19.2.2
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-
-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() {
- local emesonargs=(
- $(meson_feature X x11)
- $(meson_feature X glx)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- if use X; then
- virtx meson_src_test
- else
- meson_src_test
- fi
-}
-
-multilib_src_install() {
- meson_src_install
-}