From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-util/apitrace/Manifest | 7 -- dev-util/apitrace/apitrace-7.1.ebuild | 97 ---------------------- .../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 --- dev-util/apitrace/metadata.xml | 24 ------ 7 files changed, 229 deletions(-) delete mode 100644 dev-util/apitrace/Manifest delete mode 100644 dev-util/apitrace/apitrace-7.1.ebuild delete mode 100644 dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch delete mode 100644 dev-util/apitrace/files/apitrace-7.1-docs-install.patch delete mode 100644 dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch delete mode 100644 dev-util/apitrace/files/apitrace-7.1-snappy-license.patch delete mode 100644 dev-util/apitrace/metadata.xml (limited to 'dev-util/apitrace') diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest deleted file mode 100644 index 84809624988e..000000000000 --- a/dev-util/apitrace/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX apitrace-7.1-disable-multiarch.patch 1250 BLAKE2B eaa7b29dc07abd6a86962ed8986772db070c0f3f01882a227193d853b3d296a9973b7ab3b04a77bae10b58c3bc3570a7db963aa80fdfcfe8a528a6bae91d84b2 SHA512 f9ec915c3221697ae81f9d49fcd56d846a5cc8d2f5e44d3da5df0ee3674c790370dbb4d58350d631d735f725a63fc323b1386f5399b89ae311ec783e29b0d396 -AUX apitrace-7.1-docs-install.patch 526 BLAKE2B 0b0412e17de8e5ad10fbca93afcb94031b87261ad1616d1a5a5f6c32ec1cc693887351e00a864358a9c38c42d8e202ca5eb5b9180aec6cdc0b87edda342b6b19 SHA512 530d232c41a447ce0e95f5b9d25bd0f48cfcad2867c7efd69e69b7179d85fd35d60a27adce1295e9499a6449f968ef3989c9e5f874224fb11086b92a714e5831 -AUX apitrace-7.1-glxtrace-only.patch 1022 BLAKE2B 1265fd4dc70702f6cba1d50437a55177ca19867e1a1c0b9ee0ab1f52b85864aa3a109fc7852aa60225de328cb67c6b987af37bf797aa03eac61b5b81af6980d2 SHA512 3cbb1b25dcfbb57785feba8ef83450e270f062fc771e5fd1ae99c8ac893cad6e33162a12fccc962da08778a77377db652690efe3c54d60b2a56a6d1971cefdf1 -AUX apitrace-7.1-snappy-license.patch 240 BLAKE2B ef144dba8882466d0fce8da74ffaa008840ca1d9fc411f37e56ec7bfa3ab1637c001b87fb80186b1844abe7694419719a0c1ad011bba5002752d4c1fcc448e96 SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c -DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 -EBUILD apitrace-7.1.ebuild 2514 BLAKE2B e715ce5917aff9a84e2a26b38176e53d16fe8c6e11f5d1347b6a216ec95f90cf04064cb14a09e7adc763f56c04125c384802972faf0db69e53d6ad419a40c3dd SHA512 c65aeb52b0ec152d4413d569172b2235434bdf2b17326e84cd85205880b028f0f390f2262a7a2d4aa1ca11dad48f208ab16daf0d0511a856eefd5fb583492595 -MISC metadata.xml 721 BLAKE2B ac714ac582205e96e3728c64d84f9d69b11625bd29cbea77a00009ff92634eb61caa809c0926e00f75f7bd07a6559738c6d0bac7c23cfe7495f9bde95502d8d7 SHA512 961e99dd94af7d8fefdecdd4ea91fed6ff934ca0c047721a079f43aa8e3b566523fe57a136063155dda0cc3f058133e14fe58401a5a39c35ab8149a7259b76a1 diff --git a/dev-util/apitrace/apitrace-7.1.ebuild b/dev-util/apitrace/apitrace-7.1.ebuild deleted file mode 100644 index 7eeab3135213..000000000000 --- a/dev-util/apitrace/apitrace-7.1.ebuild +++ /dev/null @@ -1,97 +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" -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} - >=sys-devel/gcc-4.7:* - system-snappy? ( >=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}] - media-libs/libpng:0= - 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 - dev-qt/qtnetwork:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - )" -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() { - mycmakeargs=( - -DARCH_SUBDIR= - $(cmake-utils_use_enable egl EGL) - $(cmake-utils_use_enable !system-snappy STATIC_SNAPPY) - ) - if multilib_is_native_abi ; then - mycmakeargs+=( - $(cmake-utils_use_enable cli CLI) - $(cmake-utils_use_enable qt5 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 - - rm docs/INSTALL.markdown - 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 53d470d8705d..000000000000 --- 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 9fdc04ffe996..000000000000 --- 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 91867affca26..000000000000 --- 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 2b211dc5ddb7..000000000000 --- 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 --) diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml deleted file mode 100644 index 6dbcc5997c0a..000000000000 --- a/dev-util/apitrace/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - EoD@xmw.de - EoD - - - xmw@gentoo.org - Michael Weber - - - proxy-maint@gentoo.org - Proxy Maintainers - - - Enable command line interface - Enable EGL support - Link dynamic against app-arch/snappy - - - apitrace/apitrace - - -- cgit v1.2.3