[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
commit: 5de9423fbf17e94be54f48d9b5c613c2b8a7fb20
Author: Sam James gentoo org>
AuthorDate: Thu Jan 13 05:48:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 13 05:49:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de9423f
dev-util/apitrace: fix build with glibc-2.34
Closes: https://bugs.gentoo.org/812155
Thanks-to: Mihai Moldovan ionic.de>
Signed-off-by: Sam James gentoo.org>
dev-util/apitrace/apitrace-9.0-r3.ebuild | 3 ++-
.../apitrace-9.0-libc-dlopen-glibc-2.34.patch | 29 ++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild
b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index 7c0a0190acac..a150636da799 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}"/${P}-disable-multiarch.patch
"${FILESDIR}"/${P}-brotli-unbundle.patch
+ "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch
)
src_prepare() {
diff --git a/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
new file mode 100644
index ..6c1aff4bcb31
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
@@ -0,0 +1,29 @@
+https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb.patch
+https://bugs.gentoo.org/812155
+
+(rebased by sam)
+
+From: Jose Fonseca
+Date: Wed, 1 Sep 2021 16:34:54 +0100
+Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC
+ 2.34.
+
+These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of
+libdl.so onto libc.so.
+
+This means apitrace can't defend against infinite recursion when
+used with Steam Overlay, but at least it should work otherwise.
+
+Fixes https://github.com/apitrace/apitrace/issues/756
+--- a/wrappers/dlsym.cpp
b/wrappers/dlsym.cpp
+@@ -34,7 +34,7 @@
+ #include "os.hpp"
+
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
+
+
+ #include
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
commit: 6f55d4c1f7db9395524b94d62cfec7c71f6419fd
Author: Matt Turner gentoo org>
AuthorDate: Fri Feb 21 22:32:08 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Feb 21 22:33:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f55d4c1
dev-util/apitrace: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
dev-util/apitrace/Manifest | 1 -
dev-util/apitrace/apitrace-8.0.ebuild | 101 -
.../files/apitrace-8.0-brotli-unbundle.patch | 159 -
.../files/apitrace-8.0-disable-multiarch.patch | 53 ---
.../apitrace/files/apitrace-8.0-docs-install.patch | 54 ---
.../files/apitrace-8.0-glxtrace-only.patch | 49 ---
.../files/apitrace-8.0-system-snappy1.patch| 21 ---
.../files/apitrace-8.0-system-snappy2.patch| 41 --
dev-util/apitrace/metadata.xml | 5 -
9 files changed, 484 deletions(-)
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index defda19b6e8..8aee6fea902 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,2 +1 @@
-DIST apitrace-8.0.tar.gz 3601109 BLAKE2B
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
SHA512
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
DIST apitrace-9.0.tar.gz 3623693 BLAKE2B
885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc
SHA512
4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild
b/dev-util/apitrace/apitrace-8.0.ebuild
deleted file mode 100644
index 25faf457158..000
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-multilib python-single-r1
-
-DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT !system-snappy? ( BSD CC-BY-3.0 CC-BY-4.0 public-domain )"
#bundled snappy
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt5 system-snappy"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-arch/brotli:=
- media-libs/libpng:0=
- media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- sys-process/procps:=
- x11-libs/libX11
- egl? (
- >=media-libs/mesa-8.0[gles1,gles2]
- media-libs/waffle[egl]
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5[-gles2]
- )
- system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- # TODO: upstream
- "${FILESDIR}"/${P}-disable-multiarch.patch
- "${FILESDIR}"/${P}-glxtrace-only.patch
- "${FILESDIR}"/${P}-docs-install.patch
- "${FILESDIR}"/${P}-brotli-unbundle.patch
- # git master
- "${FILESDIR}"/${P}-system-snappy{1,2}.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # The apitrace code grubs around in the internal zlib structures.
- # We have to extract this header and clean it up to keep that working.
- # Do not be surprised if a zlib upgrade breaks things ...
- rm -rf
thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
- if use system-snappy ; then
- rm -rf thirdparty/snappy || die
- fi
-}
-
-src_configure() {
- my_configure() {
- local mycmakeargs=(
- -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
- -DENABLE_EGL=$(usex egl)
- -DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
- )
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- -DENABLE_CLI=$(usex cli)
- -DENABLE_GUI=$(usex qt5)
- )
- else
- mycmakeargs+=(
- -DBUILD_LIB_ONLY=ON
- -DENABLE_CLI=OFF
- -DENABLE_GUI=OFF
- )
- fi
- cmake_src_configure
- }
-
- multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
- cmake-multilib_src_install
-
- dosym glxtrace.so
[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
commit: 50a8d17875e524c22f2c7d8be63e6f5c3d81b73b
Author: Matt Turner gentoo org>
AuthorDate: Fri Feb 7 18:13:29 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Feb 7 21:47:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a8d178
dev-util/apitrace: Version bump to 9.0.0
A lot of changes in this version bump:
- Python3 support
- Python2 support dropped
- IUSE=cli dropped. Enabled always
- IUSE=system-snappy dropped. Enabled always
- IUSE=egl dropped. Enabled always
- Install CLI binaries for all ABIs
- media-libs/waffle support enabled
Closes: https://bugs.gentoo.org/684830
Closes: https://bugs.gentoo.org/684964
Closes: https://bugs.gentoo.org/693116
Closes: https://bugs.gentoo.org/705320
Signed-off-by: Matt Turner gentoo.org>
dev-util/apitrace/Manifest | 1 +
dev-util/apitrace/apitrace-9.0.ebuild | 85 +++
.../files/apitrace-9.0-brotli-unbundle.patch | 158 +
.../files/apitrace-9.0-disable-multiarch.patch | 53 +++
4 files changed, 297 insertions(+)
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 001d549c4d9..defda19b6e8 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1 +1,2 @@
DIST apitrace-8.0.tar.gz 3601109 BLAKE2B
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
SHA512
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
+DIST apitrace-9.0.tar.gz 3623693 BLAKE2B
885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc
SHA512
4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
diff --git a/dev-util/apitrace/apitrace-9.0.ebuild
b/dev-util/apitrace/apitrace-9.0.ebuild
new file mode 100644
index 000..8c100383021
--- /dev/null
+++ b/dev-util/apitrace/apitrace-9.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ app-arch/brotli:=[${MULTILIB_USEDEP}]
+ >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=
+ media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}]
+ >=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ sys-process/procps:=[${MULTILIB_USEDEP}]
+ x11-libs/libX11
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2]
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5[-gles2]
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # TODO: upstream
+ "${FILESDIR}"/${P}-disable-multiarch.patch
+ "${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # The apitrace code grubs around in the internal zlib structures.
+ # We have to extract this header and clean it up to keep that working.
+ # Do not be surprised if a zlib upgrade breaks things ...
+ rm -rf
thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} ||
die
+}
+
+src_configure() {
+ my_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DENABLE_EGL=ON
+ -DENABLE_CLI=ON
+ -DENABLE_GUI=$(multilib_native_usex qt5)
+ -DENABLE_STATIC_SNAPPY=OFF
+ -DENABLE_WAFFLE=ON
+ )
+ cmake_src_configure
+ }
+
+ multilib_foreach_abi my_configure
+}
+
+src_install() {
+ MULTILIB_CHOST_TOOLS=(
+ /usr/bin/apitrace$(get_exeext)
+ /usr/bin/eglretrace$(get_exeext)
+ /usr/bin/glretrace$(get_exeext)
+ )
+
+ cmake-multilib_src_install
+
+ make_libgl_symlinks() {
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+ }
+ multilib_foreach_abi make_libgl_symlinks
+}
diff --git a/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
commit: 1c8cdb76debcadda786b60cda76a1c535841ac96
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 29 19:23:04 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 29 19:44:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8cdb76
dev-util/apitrace: Drop 7.1-r1
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-util/apitrace/Manifest | 1 -
dev-util/apitrace/apitrace-7.1-r1.ebuild | 96 --
.../files/apitrace-7.1-disable-multiarch.patch | 35
.../apitrace/files/apitrace-7.1-docs-install.patch | 23 --
.../files/apitrace-7.1-glxtrace-only.patch | 32
.../files/apitrace-7.1-snappy-license.patch| 11 ---
6 files changed, 198 deletions(-)
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 18ef76c6bb4..001d549c4d9 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,2 +1 @@
-DIST apitrace-7.1.tar.gz 2343156 BLAKE2B
ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce
SHA512
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
DIST apitrace-8.0.tar.gz 3601109 BLAKE2B
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
SHA512
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild
b/dev-util/apitrace/apitrace-7.1-r1.ebuild
deleted file mode 100644
index c39555ef493..000
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-multilib python-single-r1
-
-DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-LICENSE+=" BSD CC-BY-3.0 CC-BY-4.0 public-domain" #bundled snappy
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt5 system-snappy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- media-libs/libpng:0=
- media-libs/mesa[egl?,${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}]
- sys-process/procps
- x11-libs/libX11
- egl? (
- >=media-libs/mesa-8.0[gles1,gles2]
- media-libs/waffle[egl]
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qtnetwork:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5[-gles2]
- )
- system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.1-glxtrace-only.patch
- "${FILESDIR}"/${PN}-7.1-disable-multiarch.patch
- "${FILESDIR}"/${PN}-7.1-docs-install.patch
- "${FILESDIR}"/${PN}-7.1-snappy-license.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # The apitrace code grubs around in the internal zlib structures.
- # We have to extract this header and clean it up to keep that working.
- # Do not be surprised if a zlib upgrade breaks things ...
- rm -rf
"${S}"/thirdparty/{getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
- if use system-snappy ; then
- rm -rf "${S}"/thirdparty/snappy || die
- fi
-}
-
-src_configure() {
- my_configure() {
- local mycmakeargs=(
- -DENABLE_EGL=$(usex egl)
- -DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
- )
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- -DENABLE_CLI=$(usex cli)
- -DENABLE_GUI=$(usex qt5)
- )
- else
- mycmakeargs+=(
- -DBUILD_LIB_ONLY=ON
- -DENABLE_CLI=OFF
- -DENABLE_GUI=OFF
- )
- fi
- cmake-utils_src_configure
- }
-
- multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
- cmake-multilib_src_install
-
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
- rm docs/INSTALL.markdown || die
- dodoc docs/* README.markdown
-
- exeinto
[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
commit: 88dc354ba18d93a07d46164bcb22bade72989186
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 29 19:21:28 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 29 19:44:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dc354b
dev-util/apitrace: 8.0 version bump, EAPI-7, unbundle brotli
Getting rid of deprecated dev-qt/qtwebkit:5 dependency.
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-util/apitrace/Manifest | 1 +
dev-util/apitrace/apitrace-8.0.ebuild | 97 +
.../files/apitrace-8.0-brotli-unbundle.patch | 159 +
.../files/apitrace-8.0-disable-multiarch.patch | 53 +++
.../apitrace/files/apitrace-8.0-docs-install.patch | 54 +++
.../files/apitrace-8.0-glxtrace-only.patch | 49 +++
6 files changed, 413 insertions(+)
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 659d9519d6d..18ef76c6bb4 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1 +1,2 @@
DIST apitrace-7.1.tar.gz 2343156 BLAKE2B
ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce
SHA512
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
+DIST apitrace-8.0.tar.gz 3601109 BLAKE2B
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
SHA512
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild
b/dev-util/apitrace/apitrace-8.0.ebuild
new file mode 100644
index 000..96e336ad5ad
--- /dev/null
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT !system-snappy? ( BSD CC-BY-3.0 CC-BY-4.0 public-domain )"
#bundled snappy
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt5 system-snappy"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ app-arch/brotli:=
+ media-libs/libpng:0=
+ media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ sys-process/procps:=
+ x11-libs/libX11
+ egl? (
+ >=media-libs/mesa-8.0[gles1,gles2]
+ media-libs/waffle[egl]
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2]
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5[-gles2]
+ )
+ system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-disable-multiarch.patch
+ "${FILESDIR}"/${P}-glxtrace-only.patch
+ "${FILESDIR}"/${P}-docs-install.patch
+ "${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # The apitrace code grubs around in the internal zlib structures.
+ # We have to extract this header and clean it up to keep that working.
+ # Do not be surprised if a zlib upgrade breaks things ...
+ rm -rf
thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
+ if use system-snappy ; then
+ rm -rf thirdparty/snappy || die
+ fi
+}
+
+src_configure() {
+ my_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DENABLE_EGL=$(usex egl)
+ -DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
+ )
+ if multilib_is_native_abi ; then
+ mycmakeargs+=(
+ -DENABLE_CLI=$(usex cli)
+ -DENABLE_GUI=$(usex qt5)
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_LIB_ONLY=ON
+ -DENABLE_CLI=OFF
+ -DENABLE_GUI=OFF
+ )
+ fi
+ cmake-utils_src_configure
+ }
+
+ multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+ dosym glxtrace.so
[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
commit: 7151840bfeaf4a2c5bd3416f3dc464c43b08e91e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 14 20:42:36 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 14 20:46:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7151840b
dev-util/apitrace: Cleanup old, Qt4WebKit-rdeps
Gentoo-bug: 631806
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-util/apitrace/Manifest | 4 -
dev-util/apitrace/apitrace-4.0.ebuild | 95 --
dev-util/apitrace/apitrace-5.0.ebuild | 91 -
dev-util/apitrace/apitrace-6.0.ebuild | 91 -
dev-util/apitrace/apitrace-6.1.ebuild | 91 -
.../files/apitrace-4.0-disable-multiarch.patch | 32
.../files/apitrace-4.0-glext-texture-storage.patch | 73 -
.../files/apitrace-4.0-glxcopysubbuffermesa.patch | 80 --
.../files/apitrace-4.0-glxtrace-only.patch | 49 ---
dev-util/apitrace/files/apitrace-4.0-memcpy.patch | 13 ---
.../apitrace/files/apitrace-4.0-multilib.patch | 59 --
.../apitrace/files/apitrace-4.0-system-libs.patch | 72
.../files/apitrace-5.0-disable-multiarch.patch | 34
.../files/apitrace-5.0-glxtrace-only.patch | 53
.../files/apitrace-6.0-disable-multiarch.patch | 35
15 files changed, 872 deletions(-)
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 80ca682896a..822be0470bb 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,5 +1 @@
-DIST apitrace-4.0.tar.gz 1736912 SHA256
078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512
063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c
WHIRLPOOL
a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
-DIST apitrace-5.0.tar.gz 1868044 SHA256
c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512
af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424
WHIRLPOOL
ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
-DIST apitrace-6.0.tar.gz 1738830 SHA256
4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512
e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c
WHIRLPOOL
1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
-DIST apitrace-6.1.tar.gz 1741041 SHA256
0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512
218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd
WHIRLPOOL
6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
DIST apitrace-7.1.tar.gz 2343156 SHA256
2103386d747d34f3d6fb1d01fde9078a45ad2e9976afab3a7489c95b08dde0a2 SHA512
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
WHIRLPOOL
d61aa9470faf61d4ffa3cd12a24fa13f993f9e21fc0bfcf0f2b9bf3d15803bc1c2120a1ed7e8c43668082dfe61f86434d5e297c5e21e4f2bbb1b88bf80b9bbe3
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild
b/dev-util/apitrace/apitrace-4.0.ebuild
deleted file mode 100644
index 9b529af0490..000
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace;
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
- egl? ( || (
- >=media-libs/mesa-8.0[gles1,gles2]
- =dev-qt/qtcore-4.7:4
- >=dev-qt/qtgui-4.7:4
- >=dev-qt/qtwebkit-4.7:4
- >=dev-libs/qjson-0.5
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-system-libs.patch
- "${FILESDIR}"/${P}-glxtrace-only.patch
- "${FILESDIR}"/${P}-glext-texture-storage.patch
-
