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 --)
