diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-util/apitrace | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
Diffstat (limited to 'dev-util/apitrace')
-rw-r--r-- | dev-util/apitrace/Manifest | 12 | ||||
-rw-r--r-- | dev-util/apitrace/apitrace-8.0.ebuild (renamed from dev-util/apitrace/apitrace-7.1-r1.ebuild) | 31 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-7.1-docs-install.patch | 23 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch | 32 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-7.1-snappy-license.patch | 11 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch | 159 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch (renamed from dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch) | 32 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-8.0-docs-install.patch | 54 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch | 49 |
9 files changed, 309 insertions, 94 deletions
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest index 76678e6ed159..bdf7a98ae5da 100644 --- a/dev-util/apitrace/Manifest +++ b/dev-util/apitrace/Manifest @@ -1,7 +1,7 @@ -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-r1.ebuild 2439 BLAKE2B 37393fe352c333c50f870dea34cbcff7e53878bc84194d64c5bfe7eb0812e6dcad9477a6634444d37498b359d456a739a24b5fa6fe4a56152deb3360d56ca1f6 SHA512 c916ea1fd2a816d59979e9490a4d7cb8d0fadde7f47c5e32b53711d53cc59ebb078f57548bfad5b2dc206d89182b8c34fe12b18fcb4a22dd297a703c74312763 +AUX apitrace-8.0-brotli-unbundle.patch 4729 BLAKE2B 62d035f6924b4c1af7d8cffe8b57845c4e1b4f10423c6c54438ef069f37c3ed39cad62a5066189a604601f5df1a2949c584481948a662f0d00a27305fd6b6416 SHA512 209d41f221c439a0abe4a021c8335cc51eaa6d4769c41c7526501be127e2089b99ccad5e417b10339ff65af37e37c51975be25a68e23a33cae71c61ab9e968ce +AUX apitrace-8.0-disable-multiarch.patch 1800 BLAKE2B e7eb8a642392ecbdf5a29c17520df137e6c581073571114e4e1e60b00a027780f41057368dc5ac7d20d6be42371ff4171de342ac88745d00ff1ee4822f814f69 SHA512 73213188d4e2506bf61142c9366a2163cf713ba7f06676e241a05b20bc6601858f707bd21dcf675630315aebfc667b943290e1e7343bff9f89b625527d0b3f5c +AUX apitrace-8.0-docs-install.patch 1452 BLAKE2B e8fe92e29614dcf416221c61cab5989cea2308771e8b87cd914194c26a79a27abdc5594938e7d7578d6d2a2980136446d1091d4a73d84cdb21125f46e97556e8 SHA512 ce405289a0c526b8e83e1624f9cd98e8eec9843509dc52f905ab884ad1091c61bdf06497f70233e703001ac638906875747d07167aca3e881e9dee1e543fe7b0 +AUX apitrace-8.0-glxtrace-only.patch 1591 BLAKE2B 45dae3a9bfdea147fd865124db7865bd389e15f7feec491f1ae520077e06134b9305351295975449dceea13aa65fee11db1a245eec73666b63c8874e72043cd3 SHA512 eea930563f125df25ff0912bcddb925fd3724fa17c1d3f1a9a5648b1f44351d3f79cf44d5e7f59ca8282a0dffb62afba583059721f9e5545707294ea62fa90c4 +DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c +EBUILD apitrace-8.0.ebuild 2471 BLAKE2B eba6b605d9fcdb8397159323d7dd2769db436150e8f75334a0055e0dd32586299dbb6c6439004ad134d93cb9a1e1a14b2cb361b0d0503d584a4dd90bedc25110 SHA512 e4bb4a6e85b2d6af3604ae2b71ef73759de22bf6e7e739d4d05eeb8149e575438438f7e69d0ef4cfabbbedc1626345021cd2eef11ddfd0f655035bebdffd2e82 MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5 diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild index c39555ef4931..96e336ad5adc 100644 --- a/dev-util/apitrace/apitrace-7.1-r1.ebuild +++ b/dev-util/apitrace/apitrace-8.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit cmake-multilib python-single-r1 @@ -10,18 +10,19 @@ 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 +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}" -RDEPEND="${PYTHON_DEPS} +DEPEND="${PYTHON_DEPS} + app-arch/brotli:= media-libs/libpng:0= media-libs/mesa[egl?,${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - sys-process/procps + sys-libs/zlib[${MULTILIB_USEDEP}] + sys-process/procps:= x11-libs/libX11 egl? ( >=media-libs/mesa-8.0[gles1,gles2] @@ -31,18 +32,17 @@ RDEPEND="${PYTHON_DEPS} 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}" +RDEPEND="${DEPEND}" 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 + "${FILESDIR}"/${P}-disable-multiarch.patch + "${FILESDIR}"/${P}-glxtrace-only.patch + "${FILESDIR}"/${P}-docs-install.patch + "${FILESDIR}"/${P}-brotli-unbundle.patch ) src_prepare() { @@ -51,15 +51,16 @@ 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 + rm -rf thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die if use system-snappy ; then - rm -rf "${S}"/thirdparty/snappy || die + 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) ) 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/files/apitrace-8.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch new file mode 100644 index 000000000000..09ed21c0c54e --- /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-7.1-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch index 53d470d8705d..9ab6ca27f635 100644 --- a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch +++ b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch @@ -1,8 +1,23 @@ -respect the libdir cmake already set up for us instead of using debian-specific multiarch paths +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 ---- apitrace-7.1/CMakeLists.txt -+++ apitrace-7.1/CMakeLists.txt -@@ -359,15 +359,6 @@ +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 @@ -18,10 +33,10 @@ respect the libdir cmake already set up for us instead of using debian-specific if (WIN32 OR APPLE) # On Windows/MacOSX, applications are usually installed on a directory of # their own -@@ -376,12 +367,8 @@ +@@ -446,12 +437,8 @@ if (WIN32 OR APPLE) set (LIB_ARCH_INSTALL_DIR lib) else () - set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) + 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}) @@ -32,4 +47,7 @@ respect the libdir cmake already set up for us instead of using debian-specific + set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) endif () - set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) + # 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 000000000000..4c8e215ff70c --- /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 000000000000..2655e0abfc09 --- /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 + |