* [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
@ 2017-10-14 20:46 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-10-14 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 7151840bfeaf4a2c5bd3416f3dc464c43b08e91e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 20:42:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 20:46:40 2017 +0000
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 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 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..00000000000
--- 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]
- <media-libs/mesa-8.0[gles]
- ) )
- media-libs/libpng:0=
- sys-process/procps
- x11-libs/libX11
- qt4? (
- >=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
- "${FILESDIR}"/${P}-glxcopysubbuffermesa.patch
- "${FILESDIR}"/${P}-multilib.patch
- "${FILESDIR}"/${P}-disable-multiarch.patch
- "${FILESDIR}"/${P}-memcpy.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 ...
- sed -r \
- -e 's:OF[(]([^)]*)[)]:\1:' \
- thirdparty/zlib/gzguts.h > gzguts.h
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
- my_configure() {
- mycmakeargs=(
- -DARCH_SUBDIR=
- $(cmake-utils_use_enable egl EGL)
- )
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- $(cmake-utils_use_enable cli CLI)
- $(cmake-utils_use_enable qt4 GUI)
- )
- 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
-
- dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
- exeinto /usr/$(get_libdir)/${PN}/scripts
- doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-5.0.ebuild b/dev-util/apitrace/apitrace-5.0.ebuild
deleted file mode 100644
index 712b310b558..00000000000
--- a/dev-util/apitrace/apitrace-5.0.ebuild
+++ /dev/null
@@ -1,91 +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]
- <media-libs/mesa-8.0[gles]
- ) )
- media-libs/libpng:0=
- sys-process/procps
- x11-libs/libX11
- qt4? (
- >=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}"/${PN}-4.0-system-libs.patch
- "${FILESDIR}"/${P}-glxtrace-only.patch
- "${FILESDIR}"/${P}-disable-multiarch.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 ...
- sed -r \
- -e 's:OF[(]([^)]*)[)]:\1:' \
- thirdparty/zlib/gzguts.h > gzguts.h
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
- my_configure() {
- mycmakeargs=(
- -DARCH_SUBDIR=
- $(cmake-utils_use_enable egl EGL)
- )
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- $(cmake-utils_use_enable cli CLI)
- $(cmake-utils_use_enable qt4 GUI)
- )
- 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
-
- dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
- exeinto /usr/$(get_libdir)/${PN}/scripts
- doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild
deleted file mode 100644
index 9e36010d4e4..00000000000
--- a/dev-util/apitrace/apitrace-6.0.ebuild
+++ /dev/null
@@ -1,91 +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
-
-DESCRIPTION="A 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="+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]
- <media-libs/mesa-8.0[gles]
- ) )
- media-libs/libpng:0=
- sys-process/procps
- x11-libs/libX11
- qt4? (
- >=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}"/${PN}-4.0-system-libs.patch
- "${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
- "${FILESDIR}"/${P}-disable-multiarch.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 ...
- sed -r \
- -e 's:OF[(]([^)]*)[)]:\1:' \
- thirdparty/zlib/gzguts.h > gzguts.h
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
- my_configure() {
- mycmakeargs=(
- -DARCH_SUBDIR=
- $(cmake-utils_use_enable egl EGL)
- )
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- $(cmake-utils_use_enable cli CLI)
- $(cmake-utils_use_enable qt4 GUI)
- )
- 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
-
- dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
-
- exeinto /usr/$(get_libdir)/${PN}/scripts
- doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild
deleted file mode 100644
index 3439c4a2830..00000000000
--- a/dev-util/apitrace/apitrace-6.1.ebuild
+++ /dev/null
@@ -1,91 +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
-
-DESCRIPTION="A 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="+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]
- <media-libs/mesa-8.0[gles]
- ) )
- media-libs/libpng:0=
- sys-process/procps
- x11-libs/libX11
- qt4? (
- >=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}"/${PN}-4.0-system-libs.patch
- "${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
- "${FILESDIR}"/${PN}-6.0-disable-multiarch.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 ...
- sed -r \
- -e 's:OF[(]([^)]*)[)]:\1:' \
- thirdparty/zlib/gzguts.h > gzguts.h
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
- my_configure() {
- mycmakeargs=(
- -DARCH_SUBDIR=
- $(cmake-utils_use_enable egl EGL)
- )
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- $(cmake-utils_use_enable cli CLI)
- $(cmake-utils_use_enable qt4 GUI)
- )
- 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
-
- dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
-
- exeinto /usr/$(get_libdir)/${PN}/scripts
- doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
deleted file mode 100644
index 0ced4d84cbf..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-respect the libdir cmake already set up for us instead of using the multiarch crap
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -184,12 +184,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- # Installation directories
-
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- # Debian multiarch support
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-- OUTPUT_VARIABLE ARCH_SUBDIR
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
- CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
- if (READPROC_H_FOUND)
- add_definitions (-DHAVE_READPROC_H)
-@@ -205,11 +205,11 @@ if (WIN32 OR APPLE)
- set (LIB_ARCH_INSTALL_DIR lib)
- else ()
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
-- set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
- if (ARCH_SUBDIR)
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
- else ()
-- set (LIB_ARCH_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
- endif ()
-
diff --git a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch b/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
deleted file mode 100644
index 2d04db40869..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream commit to support GL_EXT_texture_storage.
-
-commit 0436cc01329b6be60801dd7bfe641be7d8be5bc7
-Author: José Fonseca <jfonseca@vmware.com>
-Date: Wed Nov 13 13:57:43 2013 +0000
-
- egltrace: Add GL_EXT_texture_storage entrypoints
-
- Prototypes obtained through:
-
- specs/scripts/gltxt.py http://www.khronos.org/registry/gles/extensions/EXT/EXT_texture_storage.txt
-
- Issue #184.
-
-commit 0bacf23eacd15c8f15413b85bdcb6ccc4d288f37
-Author: José Fonseca <jfonseca@vmware.com>
-Date: Wed Nov 13 13:59:51 2013 +0000
-
- glxtrace: Add GLES prototypes too.
-
- Some applications seem to fail to distinguish GLES and GL entrypoints
- apart. To have complete traces in that situation, generate wrappers
- for both GLES and GL prototypes.
-
- Issue #184.
-
---- apitrace/specs/glesapi.py
-+++ apitrace/specs/glesapi.py
-@@ -255,4 +255,16 @@ glesapi.addFunctions([
- #GlFunction(Void, "glProgramUniformMatrix4fvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Array(Const(GLfloat), "count*4*4"), "value")]),
- GlFunction(Void, "glValidateProgramPipelineEXT", [(GLpipeline, "pipeline")]),
- GlFunction(Void, "glGetProgramPipelineInfoLogEXT", [(GLpipeline, "pipeline"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False),
-+
-+ # GL_EXT_multisampled_render_to_texture
-+ #GlFunction(Void, "glRenderbufferStorageMultisampleEXT", [(GLenum, "target"), (GLsizei, "samples"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+ GlFunction(Void, "glFramebufferTexture2DMultisampleEXT", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLsizei, "samples")]),
-+
-+ # GL_EXT_texture_storage
-+ GlFunction(Void, "glTexStorage1DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
-+ GlFunction(Void, "glTexStorage2DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+ GlFunction(Void, "glTexStorage3DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
-+ #GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
-+ #GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+ #GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
- ])
---- apitrace/wrappers/CMakeLists.txt
-+++ apitrace/wrappers/CMakeLists.txt
-@@ -393,6 +393,7 @@ elseif (X11_FOUND)
- gltrace.py
- trace.py
- ${CMAKE_SOURCE_DIR}/specs/glxapi.py
-+ ${CMAKE_SOURCE_DIR}/specs/glesapi.py
- ${CMAKE_SOURCE_DIR}/specs/glapi.py
- ${CMAKE_SOURCE_DIR}/specs/glparams.py
- ${CMAKE_SOURCE_DIR}/specs/gltypes.py
---- apitrace/wrappers/glxtrace.py
-+++ apitrace/wrappers/glxtrace.py
-@@ -32,6 +32,7 @@ from gltrace import GlTracer
- from specs.stdapi import Module, API
- from specs.glapi import glapi
- from specs.glxapi import glxapi
-+from specs.glesapi import glesapi
-
-
- class GlxTracer(GlTracer):
-@@ -104,6 +105,7 @@ if __name__ == '__main__':
- module = Module()
- module.mergeModule(glxapi)
- module.mergeModule(glapi)
-+ module.mergeModule(glesapi)
- api = API()
- api.addModule(module)
- tracer = GlxTracer()
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch b/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
deleted file mode 100644
index 4dd3cdc6be3..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Upstream commit to support glxCopySubBufferMESA. Modified to fix compile error with egl.
-
-commit 4dc3f3bdc3611ca1b3dec402f9242a036db8c8e4
-Author: Carl Worth <cworth@cworth.org>
-Date: Thu Oct 17 14:52:21 2013 -0700
-
- retrace: Implement glxCopySubBufferMESA
-
- This enables replay of a trace captured on ChromeOS.
-
- Note: Replaying on EGL is not supported, (will trigger a warning),
- since, as far as I know, EGL does not provide an equivalent function.
-
---- apitrace/retrace/glretrace_glx.cpp
-+++ apitrace/retrace/glretrace_glx.cpp
-@@ -111,6 +111,16 @@ static void retrace_glXDestroyContext(trace::Call &call) {
- delete context;
- }
-
-+static void retrace_glXCopySubBufferMESA(trace::Call &call) {
-+ glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
-+ int x = call.arg(2).toSInt();
-+ int y = call.arg(3).toSInt();
-+ int width = call.arg(4).toSInt();
-+ int height = call.arg(5).toSInt();
-+
-+ drawable->copySubBuffer(x, y, width, height);
-+}
-+
- static void retrace_glXSwapBuffers(trace::Call &call) {
- glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
-
-@@ -173,7 +183,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
- {"glXChooseVisual", &retrace::ignore},
- //{"glXCopyContext", &retrace_glXCopyContext},
- //{"glXCopyImageSubDataNV", &retrace_glXCopyImageSubDataNV},
-- //{"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
-+ {"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
- {"glXCreateContextAttribsARB", &retrace_glXCreateContextAttribsARB},
- {"glXCreateContext", &retrace_glXCreateContext},
- //{"glXCreateContextWithConfigSGIX", &retrace_glXCreateContextWithConfigSGIX},
---- apitrace/retrace/glws.hpp
-+++ apitrace/retrace/glws.hpp
-@@ -127,6 +127,8 @@ public:
- visible = true;
- }
-
-+ virtual void copySubBuffer(int x, int y, int width, int height) = 0;
-+
- virtual void swapBuffers(void) = 0;
- };
-
---- apitrace/retrace/glws_egl_xlib.cpp
-+++ apitrace/retrace/glws_egl_xlib.cpp
-@@ -244,6 +244,10 @@ public:
- Drawable::show();
- }
-
-+ void copySubBuffer(int x, int y, int width, int height) {
-+ std::cerr << "glws_egl_xlib: Warning: copySubBuffer Not yet implemented\n";
-+ }
-+
- void swapBuffers(void) {
- eglBindAPI(api);
- eglSwapBuffers(eglDisplay, surface);
---- apitrace/retrace/glws_glx.cpp
-+++ apitrace/retrace/glws_glx.cpp
-@@ -213,6 +213,12 @@ public:
- Drawable::show();
- }
-
-+ void copySubBuffer(int x, int y, int width, int height) {
-+ glXCopySubBufferMESA(display, window, x, y, width, height);
-+
-+ processKeys();
-+ }
-+
- void swapBuffers(void) {
- glXSwapBuffers(display, window);
-
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
deleted file mode 100644
index 08ce65e2fc0..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 3.0 version of patch to apply against 4.0.
-
---- apitrace/CMakeLists.txt
-+++ apitrace/CMakeLists.txt
-@@ -30,6 +30,7 @@ set (ENABLE_CLI true CACHE BOOL "Enable command Line interface.")
-
- set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
-
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-
- ##############################################################################
- # Find dependencies
-@@ -248,6 +255,8 @@ endif ()
- # - The packaged versions QJson are very old, and do not support NaN/Infinity.
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no
- # binaries at all.
-+if (NOT BUILD_LIB_ONLY)
-+
- if (QT4_FOUND)
- add_definitions (-DQJSON_EXPORT=)
- add_subdirectory (thirdparty/qjson)
-@@ -257,6 +266,8 @@ if (QT4_FOUND)
- set (QJSON_FOUND TRUE)
- endif ()
-
-+endif (NOT BUILD_LIB_ONLY)
-+
- # We use bundled headers for all Khronos APIs, to guarantee support for both
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
- # are so intertwined that conditional compilation extremely difficult. This
---- apitrace/retrace/CMakeLists.txt
-+++ apitrace/retrace/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories (
-
- add_definitions (-DRETRACE)
-
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
- OUTPUT glretrace_gl.cpp
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -259,3 +261,5 @@ if (WIN32)
-
- install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch b/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
deleted file mode 100644
index 5b49808ada9..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/465504
-http://github.com/apitrace/apitrace/issues/118
-
---- a/image/image_png.cpp
-+++ b/image/image_png.cpp
-@@ -31,6 +31,7 @@
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
-
- #include <fstream>
-
diff --git a/dev-util/apitrace/files/apitrace-4.0-multilib.patch b/dev-util/apitrace/files/apitrace-4.0-multilib.patch
deleted file mode 100644
index 6ad78c7cde0..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-multilib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream commit to find wrappers in lib64 directory.
-
-commit 3f9c2ecf18d8fa37fad5a7062f80952692eaa8e7
-Author: Alexander Monakov <amonakov@ispras.ru>
-Date: Wed Oct 16 20:51:47 2013 +0400
-
- cli: use $LIB to handle multilib automagically on glibc
-
---- apitrace/cli/CMakeLists.txt
-+++ apitrace/cli/CMakeLists.txt
-@@ -31,6 +31,7 @@ target_link_libraries (apitrace
- ${ZLIB_LIBRARIES}
- ${SNAPPY_LIBRARIES}
- ${GETOPT_LIBRARIES}
-+ dl
- )
-
- if (NOT CMAKE_CROSSCOMPILING)
---- apitrace/cli/cli_resources.cpp
-+++ apitrace/cli/cli_resources.cpp
-@@ -32,6 +32,20 @@
-
- #include "cli_resources.hpp"
-
-+#ifdef __GLIBC__
-+
-+#include <dlfcn.h>
-+
-+static bool
-+tryLib(const os::String &path)
-+{
-+ void *handle = dlopen(path.str(), RTLD_LAZY);
-+ bool exists = (handle != NULL);
-+ if (exists)
-+ dlclose(handle);
-+ return exists;
-+}
-+#endif
-
- os::String
- findProgram(const char*programFilename)
-@@ -76,6 +90,17 @@ findWrapper(const char *wrapperFilename)
- return wrapperPath;
- }
-
-+#ifdef __GLIBC__
-+ // We want to take advantage of $LIB dynamic string token expansion in
-+ // glibc dynamic linker to handle multilib layout for us
-+ wrapperPath = processDir;
-+ wrapperPath.join("../$LIB/apitrace/wrappers");
-+ wrapperPath.join(wrapperFilename);
-+ if (tryLib(wrapperPath)) {
-+ return wrapperPath;
-+ }
-+#endif
-+
- // Try relative install directory
- wrapperPath = processDir;
- #if defined(_WIN32)
diff --git a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
deleted file mode 100644
index 68468a30bde..00000000000
--- a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Find external system libraries for ebuild.
-
-Updated from 3.0 version of patch to apply against 4.0.
-
---- apitrace/CMakeLists.txt
-+++ apitrace/CMakeLists.txt
-@@ -224,23 +224,14 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
- # - on unices to prevent symbol collisions when tracing applications that link
- # against other versions of these libraries
-
--set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
--set (ZLIB_LIBRARIES z_bundled)
--add_subdirectory (thirdparty/zlib)
--
--include_directories (${ZLIB_INCLUDE_DIRS})
--
--set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
--set (SNAPPY_LIBRARIES snappy_bundled)
--add_subdirectory (thirdparty/snappy)
-+find_package (ZLIB REQUIRED)
-+include_directories (${ZLIB_INCLUDE_DIRS})
-
-+find_package (SNAPPY REQUIRED)
- include_directories (${SNAPPY_INCLUDE_DIRS})
-
--set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
--set (PNG_DEFINITIONS "")
--set (PNG_LIBRARIES png_bundled)
--
--add_subdirectory (thirdparty/libpng)
-+find_package (PNG REQUIRED)
-+include_directories (${PNG_INCLUDE_DIRS})
-
- if (MSVC)
- add_subdirectory (thirdparty/getopt)
-diff --git a/cmake/FindSNAPPY.cmake b/cmake/FindSNAPPY.cmake
-new file mode 100644
-index 0000000..5cd64c3
---- /dev/null
-+++ apitrace/cmake/FindSNAPPY.cmake
-@@ -0,0 +1,31 @@
-+# Find SNAPPY - A fast compressor/decompressor
-+#
-+# This module defines
-+# SNAPPY_FOUND - whether the qsjon library was found
-+# SNAPPY_LIBRARIES - the snappy library
-+# SNAPPY_INCLUDE_DIR - the include path of the snappy library
-+#
-+
-+if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
-+
-+ # Already in cache
-+ set (SNAPPY_FOUND TRUE)
-+
-+else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
-+
-+ find_library (SNAPPY_LIBRARIES
-+ NAMES
-+ snappy
-+ PATHS
-+ )
-+
-+ find_path (SNAPPY_INCLUDE_DIR
-+ NAMES
-+ snappy.h
-+ PATHS
-+ )
-+
-+ include(FindPackageHandleStandardArgs)
-+ find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
-+
-+endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
diff --git a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
deleted file mode 100644
index aac018e6581..00000000000
--- a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-respect the libdir cmake already set up for us instead of using the multiarch crap
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17f3dce..c3fe52e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,12 +216,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- # Installation directories
-
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- # Debian multiarch support
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-- OUTPUT_VARIABLE ARCH_SUBDIR
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
- CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
- if (READPROC_H_FOUND)
- add_definitions (-DHAVE_READPROC_H)
-@@ -237,11 +231,11 @@ if (WIN32 OR APPLE)
- set (LIB_ARCH_INSTALL_DIR lib)
- else ()
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
- if (ARCH_SUBDIR)
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
- else ()
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
- endif ()
-
diff --git a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
deleted file mode 100644
index 03e6143afff..00000000000
--- a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 4.0 version of patch to apply against 5.0.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17f3dce..3bba2a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,7 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
-
- set (ENABLE_WAFFLE false CACHE BOOL "Enable WAFFLE support.")
-
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-
- ##############################################################################
- # Find dependencies
-@@ -301,6 +302,8 @@ set (MD5_LIBRARIES md5_bundled)
- # - The packaged versions QJson are very old, and do not support NaN/Infinity.
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no
- # binaries at all.
-+if (NOT BUILD_LIB_ONLY)
-+
- if (QT4_FOUND)
- add_definitions (-DQJSON_EXPORT=)
- add_subdirectory (thirdparty/qjson)
-@@ -310,6 +313,8 @@ if (QT4_FOUND)
- set (QJSON_FOUND TRUE)
- endif ()
-
-+endif (NOT BUILD_LIB_ONLY)
-+
- # We use bundled headers for all Khronos APIs, to guarantee support for both
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
- # are so intertwined that conditional compilation extremely difficult. This
-diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
-index 4e37979..2607ddf 100644
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories (
-
- add_definitions (-DRETRACE)
-
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
- OUTPUT glretrace_gl.cpp
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -282,3 +284,5 @@ if (WIN32)
-
- install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
deleted file mode 100644
index bc6ba03060a..00000000000
--- a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
-
---- apitrace-6.0/CMakeLists.txt
-+++ apitrace-6.0/CMakeLists.txt
-@@ -280,15 +280,6 @@
- ##############################################################################
- # Installation directories
-
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- # Debian multiarch support
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-- OUTPUT_VARIABLE ARCH_SUBDIR
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
--endif()
--
- if (WIN32 OR APPLE)
- # On Windows/MacOSX, applications are usually installed on a directory of
- # their own
-@@ -297,12 +288,8 @@
- set (LIB_ARCH_INSTALL_DIR lib)
- else ()
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-- if (ARCH_SUBDIR)
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-- else ()
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-- endif ()
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
-
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
@ 2019-04-29 19:44 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-04-29 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 88dc354ba18d93a07d46164bcb22bade72989186
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 19:21:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 19:44:28 2019 +0000
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 <asturm <AT> 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 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
+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 00000000000..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 /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+
+ rm docs/INSTALL.markdown || die
+ dodoc docs/* README.markdown
+
+ exeinto /usr/$(get_libdir)/${PN}/scripts
+ doexe $(find scripts -type f -executable)
+}
diff --git a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
new file mode 100644
index 00000000000..09ed21c0c54
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
@@ -0,0 +1,159 @@
+From b0f5a220c41af013da3362e5c9751b593b22754a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:08:02 +0200
+Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
+ Igalia S.L.
+
+MIT License, which fits well.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
+ cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100644 cmake/FindBrotliDec.cmake
+ create mode 100644 cmake/FindBrotliEnc.cmake
+
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
+new file mode 100644
+index 00000000..abb06f44
+--- /dev/null
++++ b/cmake/FindBrotliDec.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliDec. Once done, this will define
++#
++# BROTLIDEC_FOUND - system has BrotliDec.
++# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
++# BROTLIDEC_LIBRARIES - link these to use BrotliDec.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIDEC libbrotlidec)
++
++find_path(BROTLIDEC_INCLUDE_DIRS
++ NAMES brotli/decode.h
++ HINTS ${PC_BROTLIDEC_INCLUDEDIR}
++)
++
++find_library(BROTLIDEC_LIBRARIES
++ NAMES brotlidec
++ HINTS ${PC_BROTLIDEC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliDec
++ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
++ FOUND_VAR BROTLIDEC_FOUND
++ VERSION_VAR PC_BROTLIDEC_VERSION)
++
++mark_as_advanced(
++ BROTLIDEC_INCLUDE_DIRS
++ BROTLIDEC_LIBRARIES
++)
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
+new file mode 100644
+index 00000000..4be347db
+--- /dev/null
++++ b/cmake/FindBrotliEnc.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliEnc. Once done, this will define
++#
++# BROTLIENC_FOUND - system has BrotliEnc.
++# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
++# BROTLIENC_LIBRARIES - link these to use BrotliEnc.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIENC libbrotlienc)
++
++find_path(BROTLIENC_INCLUDE_DIRS
++ NAMES brotli/encode.h
++ HINTS ${PC_BROTLIENC_INCLUDEDIR}
++)
++
++find_library(BROTLIENC_LIBRARIES
++ NAMES brotlienc
++ HINTS ${PC_BROTLIENC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliEnc
++ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
++ FOUND_VAR BROTLIENC_FOUND
++ VERSION_VAR PC_BROTLIENC_VERSION)
++
++mark_as_advanced(
++ BROTLIENC_INCLUDE_DIRS
++ BROTLIENC_LIBRARIES
++)
+--
+2.21.0
+
+
+From cd3486343001d6a47e4a468caa425ef835012463 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:11:57 +0200
+Subject: [PATCH 2/2] Find system brotli instead of bundled
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 5 +++--
+ cli/CMakeLists.txt | 2 +-
+ lib/trace/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc988e95..6a62b3b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -483,8 +483,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
+ endif ()
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
+-add_subdirectory (thirdparty/brotli)
++find_package(BrotliDec REQUIRED)
++find_package(BrotliEnc REQUIRED)
++include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
+
+ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
+ # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
+diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
+index a0189202..16428c63 100644
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -39,7 +39,7 @@ add_executable (apitrace
+
+ target_link_libraries (apitrace
+ common
+- brotli_dec brotli_enc brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${SNAPPY_LIBRARIES}
+ ${GETOPT_LIBRARIES}
+diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
+index c68bd00f..ce2e469e 100644
+--- a/lib/trace/CMakeLists.txt
++++ b/lib/trace/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_link_libraries (common
+ guids
+ highlight
+ os
+- brotli_dec brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ )
+
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
+--
+2.21.0
+
diff --git a/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
new file mode 100644
index 00000000000..9ab6ca27f63
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
@@ -0,0 +1,53 @@
+From 849289703b1c8ef1461d0d0f6a5465e20f3c0932 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 29 Apr 2019 20:32:04 +0200
+Subject: [PATCH 1/3] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
+
+Respect the libdir cmake already set up for us instead of using
+debian-specific multiarch paths.
+
+Patch was rebased multiple times from 4.0 to 8.0 now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 17 ++---------------
+ 1 file changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34b55554..36879db6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -429,15 +429,6 @@ endif ()
+ ##############################################################################
+ # Installation directories
+
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+- # Debian multiarch support
+- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+- OUTPUT_VARIABLE ARCH_SUBDIR
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+-endif()
+-
+ if (WIN32 OR APPLE)
+ # On Windows/MacOSX, applications are usually installed on a directory of
+ # their own
+@@ -446,12 +437,8 @@ if (WIN32 OR APPLE)
+ set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+ set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+- if (ARCH_SUBDIR)
+- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+- else ()
+- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+- endif ()
++ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+
+ # Allow customization of the doc installation dir (Slackware uses different
+--
+2.21.0
+
diff --git a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
new file mode 100644
index 00000000000..4c8e215ff70
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
@@ -0,0 +1,54 @@
+From 17864ae1e14362d56bbd7dd75149e094a4716bc6 Mon Sep 17 00:00:00 2001
+From: Michael Weber <xmw@gentoo.org>
+Date: Mon, 29 Apr 2019 20:56:28 +0200
+Subject: [PATCH 3/3] Disable doc files installation by build system
+
+Patch was rebased from 7.1 on top of 8.0.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 14 --------------
+ thirdparty/snappy/CMakeLists.txt | 5 -----
+ 2 files changed, 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6466cd8a..84fd0ae1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -604,20 +604,6 @@ endif ()
+ ##############################################################################
+ # Packaging
+
+-install (
+- FILES
+- README.markdown
+- docs/BUGS.markdown
+- docs/NEWS.markdown
+- docs/USAGE.markdown
+- DESTINATION ${DOC_INSTALL_DIR}
+-)
+-install (
+- FILES LICENSE
+- DESTINATION ${DOC_INSTALL_DIR}
+- RENAME LICENSE.txt
+-)
+-
+ set (CPACK_PACKAGE_VERSION_MAJOR "8")
+ set (CPACK_PACKAGE_VERSION_MINOR "0")
+
+diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt
+index 84ecbac8..f732dbc0 100644
+--- a/thirdparty/snappy/CMakeLists.txt
++++ b/thirdparty/snappy/CMakeLists.txt
+@@ -26,8 +26,3 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL
+ snappy-stubs-public.h
+ )
+
+-install (
+- FILES COPYING
+- DESTINATION ${DOC_INSTALL_DIR}
+- RENAME LICENSE-snappy.txt
+-)
+--
+2.21.0
+
diff --git a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
new file mode 100644
index 00000000000..2655e0abfc0
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
@@ -0,0 +1,49 @@
+From 747fe00d3b4e2648003715f949cf2ac18e32862a Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gentoo.org>
+Date: Mon, 29 Apr 2019 20:45:42 +0200
+Subject: [PATCH 2/3] Allow building of just glxtrace library (without GUI
+ tools)
+
+Patch was rebased multiple times from 1.0 to 8.0 now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 ++
+ retrace/CMakeLists.txt | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36879db6..6466cd8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,6 +47,8 @@ if (ANDROID)
+ message (FATAL_ERROR "Android is no longer supported (https://git.io/vH2gW)")
+ endif ()
+
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
++
+ # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
+ # etc.) in order to ship a single set of binaries across multiple
+ # distributions. Given that apitrace wrapper modules will be loaded into those
+diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
+index 76dc8362..e1bad990 100644
+--- a/retrace/CMakeLists.txt
++++ b/retrace/CMakeLists.txt
+@@ -15,6 +15,8 @@ include_directories (
+
+ add_definitions (-DRETRACE)
+
++if (NOT BUILD_LIB_ONLY)
++
+ add_custom_command (
+ OUTPUT glretrace_gl.cpp
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
+@@ -343,3 +345,5 @@ if (WIN32)
+ install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+ install_pdb (d3dretrace DESTINATION bin)
+ endif ()
++
++endif (NOT BUILD_LIB_ONLY)
+--
+2.21.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
@ 2019-04-29 19:44 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-04-29 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 1c8cdb76debcadda786b60cda76a1c535841ac96
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 19:23:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 19:44:28 2019 +0000
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 <asturm <AT> 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 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
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..00000000000
--- 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 /usr/$(get_libdir)/${PN}/scripts
- doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch
deleted file mode 100644
index 53d470d8705..00000000000
--- a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
-
---- apitrace-7.1/CMakeLists.txt
-+++ apitrace-7.1/CMakeLists.txt
-@@ -359,15 +359,6 @@
- ##############################################################################
- # Installation directories
-
--if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-- # Debian multiarch support
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-- OUTPUT_VARIABLE ARCH_SUBDIR
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
--endif()
--
- if (WIN32 OR APPLE)
- # On Windows/MacOSX, applications are usually installed on a directory of
- # their own
-@@ -376,12 +367,8 @@
- set (LIB_ARCH_INSTALL_DIR lib)
- else ()
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-- if (ARCH_SUBDIR)
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-- else ()
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-- endif ()
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
-
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
diff --git a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch b/dev-util/apitrace/files/apitrace-7.1-docs-install.patch
deleted file mode 100644
index 9fdc04ffe99..00000000000
--- a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- apitrace-7.1/CMakeLists.txt
-+++ apitrace-7.1/CMakeLists.txt
-@@ -553,20 +553,6 @@
- ##############################################################################
- # Packaging
-
--install (
-- FILES
-- README.markdown
-- docs/BUGS.markdown
-- docs/NEWS.markdown
-- docs/USAGE.markdown
-- DESTINATION ${DOC_INSTALL_DIR}
--)
--install (
-- FILES LICENSE
-- DESTINATION ${DOC_INSTALL_DIR}
-- RENAME LICENSE.txt
--)
--
- set (CPACK_PACKAGE_VERSION_MAJOR "7")
- set (CPACK_PACKAGE_VERSION_MINOR "0")
-
diff --git a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch
deleted file mode 100644
index 91867affca2..00000000000
--- a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 5.0 version of patch to apply against 7.1.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,6 +44,8 @@
-
- option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON)
-
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-+
- # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
- # etc.) in order to ship a single set of binaries across multiple
- # distributions. Given that apitrace wrapper modules will be loaded into those
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -12,6 +12,8 @@
-
- add_definitions (-DRETRACE)
-
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
- OUTPUT glretrace_gl.cpp
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -368,3 +370,5 @@
- install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- install_pdb (d3dretrace DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch b/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
deleted file mode 100644
index 2b211dc5ddb..00000000000
--- a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apitrace-7.1/thirdparty/snappy/CMakeLists.txt
-+++ apitrace-7.1/thirdparty/snappy/CMakeLists.txt
-@@ -16,8 +16,3 @@
- snappy-c.cc
- )
-
--install (
-- FILES COPYING
-- DESTINATION ${DOC_INSTALL_DIR}
-- RENAME LICENSE-snappy.txt
--)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
@ 2020-02-07 21:47 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-02-07 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 50a8d17875e524c22f2c7d8be63e6f5c3d81b73b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 18:13:29 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 21:47:25 2020 +0000
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 <mattst88 <AT> 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 00000000000..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 b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
new file mode 100644
index 00000000000..5715edaec3f
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
@@ -0,0 +1,158 @@
+From 3a07d551949ff488d1d669600a07d9c73ff4cc55 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:08:02 +0200
+Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
+ Igalia S.L.
+
+MIT License, which fits well.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
+ cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100644 cmake/FindBrotliDec.cmake
+ create mode 100644 cmake/FindBrotliEnc.cmake
+
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
+new file mode 100644
+index 00000000..abb06f44
+--- /dev/null
++++ b/cmake/FindBrotliDec.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliDec. Once done, this will define
++#
++# BROTLIDEC_FOUND - system has BrotliDec.
++# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
++# BROTLIDEC_LIBRARIES - link these to use BrotliDec.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIDEC libbrotlidec)
++
++find_path(BROTLIDEC_INCLUDE_DIRS
++ NAMES brotli/decode.h
++ HINTS ${PC_BROTLIDEC_INCLUDEDIR}
++)
++
++find_library(BROTLIDEC_LIBRARIES
++ NAMES brotlidec
++ HINTS ${PC_BROTLIDEC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliDec
++ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
++ FOUND_VAR BROTLIDEC_FOUND
++ VERSION_VAR PC_BROTLIDEC_VERSION)
++
++mark_as_advanced(
++ BROTLIDEC_INCLUDE_DIRS
++ BROTLIDEC_LIBRARIES
++)
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
+new file mode 100644
+index 00000000..4be347db
+--- /dev/null
++++ b/cmake/FindBrotliEnc.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliEnc. Once done, this will define
++#
++# BROTLIENC_FOUND - system has BrotliEnc.
++# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
++# BROTLIENC_LIBRARIES - link these to use BrotliEnc.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIENC libbrotlienc)
++
++find_path(BROTLIENC_INCLUDE_DIRS
++ NAMES brotli/encode.h
++ HINTS ${PC_BROTLIENC_INCLUDEDIR}
++)
++
++find_library(BROTLIENC_LIBRARIES
++ NAMES brotlienc
++ HINTS ${PC_BROTLIENC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliEnc
++ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
++ FOUND_VAR BROTLIENC_FOUND
++ VERSION_VAR PC_BROTLIENC_VERSION)
++
++mark_as_advanced(
++ BROTLIENC_INCLUDE_DIRS
++ BROTLIENC_LIBRARIES
++)
+--
+2.24.1
+
+From 08a410f238aaf6488759e023b66d16cbbd7f6d66 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:11:57 +0200
+Subject: [PATCH 2/2] Find system brotli instead of bundled
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 5 +++--
+ cli/CMakeLists.txt | 2 +-
+ lib/trace/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c71d24e6..88e6b156 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -491,8 +491,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
+ endif ()
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
+-add_subdirectory (thirdparty/brotli)
++find_package(BrotliDec REQUIRED)
++find_package(BrotliEnc REQUIRED)
++include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
+
+ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
+ # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
+diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
+index 3a3c127e..0b33ddb5 100644
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -39,7 +39,7 @@ add_executable (apitrace
+
+ target_link_libraries (apitrace
+ common
+- brotli_dec brotli_enc brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${SNAPPY_LIBRARIES}
+ ${GETOPT_LIBRARIES}
+diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
+index c68bd00f..ce2e469e 100644
+--- a/lib/trace/CMakeLists.txt
++++ b/lib/trace/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_link_libraries (common
+ guids
+ highlight
+ os
+- brotli_dec brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ )
+
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
+--
+2.24.1
+
diff --git a/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch
new file mode 100644
index 00000000000..37085b1ae29
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch
@@ -0,0 +1,53 @@
+From 556397e399994b005524b88171c9c103b8cc1b25 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 29 Apr 2019 20:32:04 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
+
+Respect the libdir cmake already set up for us instead of using
+debian-specific multiarch paths.
+
+Patch was rebased multiple times from 4.0 to 9.0 now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 17 ++---------------
+ 1 file changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19316e60..6c3c4b85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -438,15 +438,6 @@ endif ()
+ ##############################################################################
+ # Installation directories
+
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+- # Debian multiarch support
+- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+- OUTPUT_VARIABLE ARCH_SUBDIR
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+-endif()
+-
+ if (WIN32 OR APPLE)
+ # On Windows/MacOSX, applications are usually installed on a directory of
+ # their own
+@@ -455,12 +446,8 @@ if (WIN32 OR APPLE)
+ set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+ set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+- if (ARCH_SUBDIR)
+- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+- else ()
+- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+- endif ()
++ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+
+ # Allow customization of the doc installation dir (Slackware uses different
+--
+2.24.1
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
@ 2020-02-21 22:34 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-02-21 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 6f55d4c1f7db9395524b94d62cfec7c71f6419fd
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 22:32:08 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 22:33:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f55d4c1
dev-util/apitrace: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> 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..00000000000
--- 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 /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 /usr/$(get_libdir)/${PN}/scripts
- doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
deleted file mode 100644
index 09ed21c0c54..00000000000
--- a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From b0f5a220c41af013da3362e5c9751b593b22754a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 29 Apr 2019 21:08:02 +0200
-Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
- Igalia S.L.
-
-MIT License, which fits well.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
- cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 70 insertions(+)
- create mode 100644 cmake/FindBrotliDec.cmake
- create mode 100644 cmake/FindBrotliEnc.cmake
-
-diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
-new file mode 100644
-index 00000000..abb06f44
---- /dev/null
-+++ b/cmake/FindBrotliDec.cmake
-@@ -0,0 +1,35 @@
-+# Copyright 2017 Igalia S.L. All Rights Reserved.
-+#
-+# Distributed under MIT license.
-+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-+
-+# Try to find BrotliDec. Once done, this will define
-+#
-+# BROTLIDEC_FOUND - system has BrotliDec.
-+# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
-+# BROTLIDEC_LIBRARIES - link these to use BrotliDec.
-+
-+find_package(PkgConfig)
-+
-+pkg_check_modules(PC_BROTLIDEC libbrotlidec)
-+
-+find_path(BROTLIDEC_INCLUDE_DIRS
-+ NAMES brotli/decode.h
-+ HINTS ${PC_BROTLIDEC_INCLUDEDIR}
-+)
-+
-+find_library(BROTLIDEC_LIBRARIES
-+ NAMES brotlidec
-+ HINTS ${PC_BROTLIDEC_LIBDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(BrotliDec
-+ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
-+ FOUND_VAR BROTLIDEC_FOUND
-+ VERSION_VAR PC_BROTLIDEC_VERSION)
-+
-+mark_as_advanced(
-+ BROTLIDEC_INCLUDE_DIRS
-+ BROTLIDEC_LIBRARIES
-+)
-diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
-new file mode 100644
-index 00000000..4be347db
---- /dev/null
-+++ b/cmake/FindBrotliEnc.cmake
-@@ -0,0 +1,35 @@
-+# Copyright 2017 Igalia S.L. All Rights Reserved.
-+#
-+# Distributed under MIT license.
-+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-+
-+# Try to find BrotliEnc. Once done, this will define
-+#
-+# BROTLIENC_FOUND - system has BrotliEnc.
-+# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
-+# BROTLIENC_LIBRARIES - link these to use BrotliEnc.
-+
-+find_package(PkgConfig)
-+
-+pkg_check_modules(PC_BROTLIENC libbrotlienc)
-+
-+find_path(BROTLIENC_INCLUDE_DIRS
-+ NAMES brotli/encode.h
-+ HINTS ${PC_BROTLIENC_INCLUDEDIR}
-+)
-+
-+find_library(BROTLIENC_LIBRARIES
-+ NAMES brotlienc
-+ HINTS ${PC_BROTLIENC_LIBDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(BrotliEnc
-+ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
-+ FOUND_VAR BROTLIENC_FOUND
-+ VERSION_VAR PC_BROTLIENC_VERSION)
-+
-+mark_as_advanced(
-+ BROTLIENC_INCLUDE_DIRS
-+ BROTLIENC_LIBRARIES
-+)
---
-2.21.0
-
-
-From cd3486343001d6a47e4a468caa425ef835012463 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 29 Apr 2019 21:11:57 +0200
-Subject: [PATCH 2/2] Find system brotli instead of bundled
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 5 +++--
- cli/CMakeLists.txt | 2 +-
- lib/trace/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc988e95..6a62b3b7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -483,8 +483,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
- endif ()
- include_directories (${SNAPPY_INCLUDE_DIRS})
-
--include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
--add_subdirectory (thirdparty/brotli)
-+find_package(BrotliDec REQUIRED)
-+find_package(BrotliEnc REQUIRED)
-+include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
-
- if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
- # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
-diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
-index a0189202..16428c63 100644
---- a/cli/CMakeLists.txt
-+++ b/cli/CMakeLists.txt
-@@ -39,7 +39,7 @@ add_executable (apitrace
-
- target_link_libraries (apitrace
- common
-- brotli_dec brotli_enc brotli_common
-+ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${SNAPPY_LIBRARIES}
- ${GETOPT_LIBRARIES}
-diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
-index c68bd00f..ce2e469e 100644
---- a/lib/trace/CMakeLists.txt
-+++ b/lib/trace/CMakeLists.txt
-@@ -31,7 +31,7 @@ target_link_libraries (common
- guids
- highlight
- os
-- brotli_dec brotli_common
-+ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
- )
-
- add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
---
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
deleted file mode 100644
index 9ab6ca27f63..00000000000
--- a/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 849289703b1c8ef1461d0d0f6a5465e20f3c0932 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 29 Apr 2019 20:32:04 +0200
-Subject: [PATCH 1/3] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
-
-Respect the libdir cmake already set up for us instead of using
-debian-specific multiarch paths.
-
-Patch was rebased multiple times from 4.0 to 8.0 now.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 34b55554..36879db6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -429,15 +429,6 @@ endif ()
- ##############################################################################
- # Installation directories
-
--if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-- # Debian multiarch support
-- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-- OUTPUT_VARIABLE ARCH_SUBDIR
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
--endif()
--
- if (WIN32 OR APPLE)
- # On Windows/MacOSX, applications are usually installed on a directory of
- # their own
-@@ -446,12 +437,8 @@ if (WIN32 OR APPLE)
- set (LIB_ARCH_INSTALL_DIR lib)
- else ()
- set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
-- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-- if (ARCH_SUBDIR)
-- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-- else ()
-- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-- endif ()
-+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
-
- # Allow customization of the doc installation dir (Slackware uses different
---
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
deleted file mode 100644
index 4c8e215ff70..00000000000
--- a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 17864ae1e14362d56bbd7dd75149e094a4716bc6 Mon Sep 17 00:00:00 2001
-From: Michael Weber <xmw@gentoo.org>
-Date: Mon, 29 Apr 2019 20:56:28 +0200
-Subject: [PATCH 3/3] Disable doc files installation by build system
-
-Patch was rebased from 7.1 on top of 8.0.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 14 --------------
- thirdparty/snappy/CMakeLists.txt | 5 -----
- 2 files changed, 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6466cd8a..84fd0ae1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -604,20 +604,6 @@ endif ()
- ##############################################################################
- # Packaging
-
--install (
-- FILES
-- README.markdown
-- docs/BUGS.markdown
-- docs/NEWS.markdown
-- docs/USAGE.markdown
-- DESTINATION ${DOC_INSTALL_DIR}
--)
--install (
-- FILES LICENSE
-- DESTINATION ${DOC_INSTALL_DIR}
-- RENAME LICENSE.txt
--)
--
- set (CPACK_PACKAGE_VERSION_MAJOR "8")
- set (CPACK_PACKAGE_VERSION_MINOR "0")
-
-diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt
-index 84ecbac8..f732dbc0 100644
---- a/thirdparty/snappy/CMakeLists.txt
-+++ b/thirdparty/snappy/CMakeLists.txt
-@@ -26,8 +26,3 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL
- snappy-stubs-public.h
- )
-
--install (
-- FILES COPYING
-- DESTINATION ${DOC_INSTALL_DIR}
-- RENAME LICENSE-snappy.txt
--)
---
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
deleted file mode 100644
index 2655e0abfc0..00000000000
--- a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 747fe00d3b4e2648003715f949cf2ac18e32862a Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gentoo.org>
-Date: Mon, 29 Apr 2019 20:45:42 +0200
-Subject: [PATCH 2/3] Allow building of just glxtrace library (without GUI
- tools)
-
-Patch was rebased multiple times from 1.0 to 8.0 now.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 ++
- retrace/CMakeLists.txt | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 36879db6..6466cd8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,6 +47,8 @@ if (ANDROID)
- message (FATAL_ERROR "Android is no longer supported (https://git.io/vH2gW)")
- endif ()
-
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-+
- # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
- # etc.) in order to ship a single set of binaries across multiple
- # distributions. Given that apitrace wrapper modules will be loaded into those
-diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
-index 76dc8362..e1bad990 100644
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -15,6 +15,8 @@ include_directories (
-
- add_definitions (-DRETRACE)
-
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
- OUTPUT glretrace_gl.cpp
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -343,3 +345,5 @@ if (WIN32)
- install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- install_pdb (d3dretrace DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
---
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch b/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch
deleted file mode 100644
index a774ec322dc..00000000000
--- a/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1294f69ed84e3c35f108fb55533b6687cdfcd419 Mon Sep 17 00:00:00 2001
-From: "i.Dark_Templar" <darktemplar@dark-templar-archives.net>
-Date: Tue, 30 Apr 2019 22:19:08 +0300
-Subject: [PATCH] cmake: Fix out-of-source build without bundled snappy.
-
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2cf5ab2f5..3751f078e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -532,6 +532,7 @@ add_subdirectory (thirdparty/crc32c)
- if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
- add_subdirectory (thirdparty/libbacktrace)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libbacktrace)
-+ include_directories (${CMAKE_CURRENT_BINARY_DIR}/thirdparty/libbacktrace)
- set (LIBBACKTRACE_LIBRARIES ${CMAKE_DL_LIBS} backtrace)
- add_definitions (-DHAVE_BACKTRACE=1)
- endif ()
diff --git a/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch b/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch
deleted file mode 100644
index 981a10b4e75..00000000000
--- a/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5777f1a8aaef7a39754db9708062b7630c5644a2 Mon Sep 17 00:00:00 2001
-From: Jose Fonseca <jfonseca@vmware.com>
-Date: Wed, 1 May 2019 10:40:43 +0100
-Subject: [PATCH] snappy: Place config.h on a subdirectory.
-
-And ensure it's only included internally.
-
-This addresses the issue described in
-https://github.com/apitrace/apitrace/pull/611#issuecomment-488087078
----
- thirdparty/snappy/CMakeLists.txt | 6 +++++-
- thirdparty/snappy/{ => config}/config.h | 0
- 2 files changed, 5 insertions(+), 1 deletion(-)
- rename thirdparty/snappy/{ => config}/config.h (100%)
-
-diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt
-index 84ecbac8a..581de38fa 100644
---- a/thirdparty/snappy/CMakeLists.txt
-+++ b/thirdparty/snappy/CMakeLists.txt
-@@ -18,12 +18,16 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL
- snappy-sinksource.cc
- snappy-stubs-internal.cc
- snappy.cc
-- config.h
-
- snappy-c.h
- snappy-sinksource.h
- snappy.h
- snappy-stubs-public.h
-+ config/config.h
-+)
-+
-+target_include_directories (snappy_bundled PRIVATE
-+ ${CMAKE_CURRENT_SOURCE_DIR}/config
- )
-
- install (
-diff --git a/thirdparty/snappy/config.h b/thirdparty/snappy/config/config.h
-similarity index 100%
-rename from thirdparty/snappy/config.h
-rename to thirdparty/snappy/config/config.h
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 6ff16988eb4..0a166ed586a 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -2,11 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <use>
- <flag name="cli">Enable command line interface</flag>
- <flag name="egl">Enable EGL support</flag>
- <flag name="system-snappy">Link dynamic against app-arch/snappy</flag>
- </use>
<upstream>
<remote-id type="github">apitrace/apitrace</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/
@ 2022-01-13 6:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-01-13 6:02 UTC (permalink / raw
To: gentoo-commits
commit: 5de9423fbf17e94be54f48d9b5c613c2b8a7fb20
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 05:48:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 05:49:04 2022 +0000
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 <AT> ionic.de>
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 <jfonseca@vmware.com>
+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 <dlfcn.h>
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-13 6:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-29 19:44 [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-01-13 6:02 Sam James
2020-02-21 22:34 Matt Turner
2020-02-07 21:47 Matt Turner
2019-04-29 19:44 Andreas Sturmlechner
2017-10-14 20:46 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox