From b2766a945989ed78afb10a388af1b64807549983 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sun, 18 Mar 2012 21:35:32 +0000 Subject: Revbump to fixing missing symbol issue with multilib target and conditionally build egl support for multilib target. (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- dev-util/apitrace/ChangeLog | 9 +- dev-util/apitrace/apitrace-3.0-r1.ebuild | 108 +++++++++++++++++++++ .../files/apitrace-3.0-glxtrace-only.patch | 18 ---- 3 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 dev-util/apitrace/apitrace-3.0-r1.ebuild (limited to 'dev-util/apitrace') diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index 94a40ae48754..ac415d2f6313 100644 --- a/dev-util/apitrace/ChangeLog +++ b/dev-util/apitrace/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/apitrace # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.9 2012/03/18 21:32:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.10 2012/03/18 21:35:32 radhermit Exp $ + +*apitrace-3.0-r1 (18 Mar 2012) + + 18 Mar 2012; Tim Harder +apitrace-3.0-r1.ebuild, + files/apitrace-3.0-glxtrace-only.patch: + Revbump to fixing missing symbol issue with multilib target and conditionally + build egl support for multilib target. 18 Mar 2012; Tim Harder apitrace-2.0-r1.ebuild, +files/apitrace-2.0-zlib-1.2.6.patch: diff --git a/dev-util/apitrace/apitrace-3.0-r1.ebuild b/dev-util/apitrace/apitrace-3.0-r1.ebuild new file mode 100644 index 000000000000..1a59227884bc --- /dev/null +++ b/dev-util/apitrace/apitrace-3.0-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.1 2012/03/18 21:35:32 radhermit Exp $ + +EAPI="4" +PYTHON_DEPEND="2:2.6" + +inherit cmake-utils eutils python multilib + +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 ~x86" +IUSE="egl multilib qt4" + +RDEPEND="app-arch/snappy + media-libs/libpng + sys-libs/zlib + media-libs/mesa[egl?] + egl? ( || ( + >=media-libs/mesa-8.0[gles1,gles2] + =x11-libs/qt-core-4.7:4 + >=x11-libs/qt-gui-4.7:4 + >=x11-libs/qt-webkit-4.7:4 + >=dev-libs/qjson-0.5 + )" +DEPEND="${RDEPEND}" + +EMULTILIB_PKG="true" + +PATCHES=( + "${FILESDIR}"/${P}-system-libs.patch + "${FILESDIR}"/${P}-glxtrace-only.patch +) + +pkg_setup() { + python_set_active_version 2 +} + +src_unpack() { + unpack ${A} + mv *-${PN}-* "${S}" +} + +src_prepare() { + base_src_prepare + + # Workaround NULL DT_RPATH issues + sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die +} + +src_configure() { + for ABI in $(get_install_abis) ; do + mycmakeargs=( + $(cmake-utils_use_enable qt4 GUI) + $(cmake-utils_use_enable egl EGL) + ) + + if use multilib ; then + if [[ "${ABI}" != "${DEFAULT_ABI}" ]] ; then + mycmakeargs=( + -DBUILD_LIB_ONLY=ON + -DENABLE_GUI=OFF + $(cmake-utils_use_enable egl EGL) + ) + fi + multilib_toolchain_setup ${ABI} + fi + + CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + cmake-utils_src_configure + done +} + +src_compile() { + for ABI in $(get_install_abis) ; do + use multilib && multilib_toolchain_setup ${ABI} + CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + cmake-utils_src_compile + done +} + +src_install() { + dobin "${CMAKE_BUILD_DIR}"/{glretrace,apitrace} + use qt4 && dobin "${CMAKE_BUILD_DIR}"/qapitrace + + for ABI in $(get_install_abis) ; do + CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + exeinto /usr/$(get_libdir)/${PN}/wrappers + doexe "${CMAKE_BUILD_DIR}"/wrappers/*.so + 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 + done + + 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/files/apitrace-3.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch index 02a8a6005668..0f4388b7a357 100644 --- a/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch +++ b/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch @@ -42,24 +42,6 @@ # For glext headers. Needs to be before system includes as often system's GL # headers bundle and include glext.h and glxext.h include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glext) -@@ -257,6 +269,8 @@ - endif () - endif () - -+if (NOT BUILD_LIB_ONLY) -+ - add_library (common STATIC - common/trace_callset.cpp - common/trace_dump.cpp -@@ -289,6 +303,8 @@ - - link_libraries (common) - -+endif (NOT BUILD_LIB_ONLY) -+ - - ############################################################################## - # API tracers @@ -497,6 +513,8 @@ ############################################################################## # API retracers -- cgit v1.2.3-65-gdbad