Revbump to fixing missing symbol issue with multilib target and conditionally build egl support for multilib target.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 126 insertions, 28 deletions

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 <radhermit@gentoo.org> +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 <radhermit@gentoo.org> apitrace-2.0-r1.ebuild,
   +files/apitrace-2.0-zlib-1.2.6.patch:
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index bd197df55067..3eb9d9e39bbd 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -4,22 +4,23 @@ Hash: SHA512
 AUX apitrace-2.0-glxtrace-only.patch 2605 RMD160 43b4c3a99a971bc01f79f133ed075c88dbf5aadd SHA1 97c2b6acdb497dbe2e32e1f390ac977d3c92932c SHA256 1ffb7f76a5f681bc83996ff967caaab1369d59d8ee6b6d7212c3889eaef824d4
 AUX apitrace-2.0-system-libs.patch 2057 RMD160 0da92249f954b95f5ea9b50796e4f312c7a430fb SHA1 8e122badac08154ea2a77378330fd644008faee6 SHA256 e37b5adddbfb6aac39f6f808ae548760e1cfaedc0ce6a877ce1a29a4159f9615
 AUX apitrace-2.0-zlib-1.2.6.patch 1040 RMD160 38cc5242783ca7e897ab807797910a36bd26980f SHA1 57b321bdc6dac8a25a9f1c007065a5b6d3d4320a SHA256 b723578120b3e898915b48c1bcf34eacefdcbd43e0925638c7b5730710c76c01
-AUX apitrace-3.0-glxtrace-only.patch 2419 RMD160 08fe99c52728e4cb7b7cb1dd267878fc825b832f SHA1 3214ec0bdf8fca17ed8af731ec5264843188d3e5 SHA256 f465b2d853b3e90300194fff73f7a2bf2a294756900ad3a6b7c4920ddaa36600
+AUX apitrace-3.0-glxtrace-only.patch 2085 RMD160 aa68f6068ebbdaa7928618636377988cb5f1dfc5 SHA1 d44b7ad6d473720b8e7dae73144ec43005c4a54f SHA256 7828fc4db5ba76bac78e58214f732aa93703feb31a229be740135bc0fc8d9db1
 AUX apitrace-3.0-system-libs.patch 2116 RMD160 05a89bd357d14e7cf2875b82deaa5c7bc908c41e SHA1 e46561813c236b94a509b87e3b1445dad97ee49e SHA256 064a4a1f484d77542b93caba7e6a22b0bba7adf61d9ba43d905e67b7ba31e0e8
 DIST apitrace-2.0.tar.gz 943001 RMD160 ca378b2a45cb8873d19bbfe549879f256e4acc48 SHA1 9233520a2a8d91ccae826fccc0c1f3038518a5ec SHA256 a037d24a4bb01c67a7ac517b22b0d3a1b303ccfff0f1249f143e529aaa98f705
 DIST apitrace-3.0.tar.gz 1046543 RMD160 be7fb0bc925b4936b18c09038e4336d151a2ae80 SHA1 31d85fc1e3ba218b9529cbb9c978e012caa6d487 SHA256 96660d582c272534002a4909fe124a7dd81e31bb2145eef4beb352826922de3a
 EBUILD apitrace-2.0-r1.ebuild 2126 RMD160 3bc1384fb6e41ca4b7dc9d5a635b6ec783efae9e SHA1 d00848a6f9213315546765d9fadc29cc323f8a5d SHA256 19d3a72ebe39b6be4cb24782bb38bf2a64ae671eec876974efea8f5a361ee6b6
+EBUILD apitrace-3.0-r1.ebuild 2569 RMD160 03819fb4b84064976886494ad14bc727f9d3e084 SHA1 b06f0eb414b94527f24651bcf721e9d2cd96ccf9 SHA256 b7076a40441c6ec41d4d6cdfe5035dfc0006943f524d983424f78e55bd5f2bf3
 EBUILD apitrace-3.0.ebuild 2513 RMD160 8565fe1fb5df18d1a5679109a79e68181986f898 SHA1 43b66b0ad3de2ea3ebd13a409febe76df95229e8 SHA256 a47604c909c72cf7b4436e30417b8bf2c8e4b89b08e5a1600a7538da99aa988e
-MISC ChangeLog 1901 RMD160 0106fb1721fa03de876c572e5156756b658234c3 SHA1 59461de0e6b33655ca9365c322e06805ae1ec23a SHA256 66aeb6ea21050fb841ac93398ea0bdee3ef2b53f21a5d3c1a514180236159071
+MISC ChangeLog 2172 RMD160 1849de2f57a1d82823c6ab35db6f1aeb5467f472 SHA1 669c17d555e265c79c6d7c9077c5807aa4341cc8 SHA256 ab14c06a7c0db5ac84b9b424f40118140ff8a0433a351d4d67cfbc48c1a89771
 MISC metadata.xml 292 RMD160 3be96a8d901993687d732e97857af05503eee229 SHA1 2a01be0e8c6ac0e07253639797ffd49cfe47ba94 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPZlRhAAoJEEqz6FtPBkyjwAgH/R6Uj0HTFHCMQWrR66hbSoC7
-dTPhuainyau2OX1clJ2ZlSQJdQJ3reqGFcreVaX3wfJHdIcSfo/NSzMM1mJfSRcV
-YB27Y0BGhgl1Q4r6yVS/tvH0Hacs0o4mAECgLydTr3tCER7ii2WN3mm/6qQBo2qW
-flprcDDNtvxMu7VLwLRI0jfhfxPwn41szzUIwQEUiR6ovzIod+X5aQYuBDtUyQJk
-aLcQE2QQSS2h8Cty5gTrePNybxBFHNxx2lB5gk4mmqO3JEAnWGL8CcruADLzP0/a
-zm8KfSfeYXj3LyE52bKcInMQBHnjQl5tgtTianYaOZcYlUGowVfC9EpSvd9uJ0M=
-=v+4L
+iQEcBAEBCgAGBQJPZlUqAAoJEEqz6FtPBkyj250IALAeGgkWLNfdif1+MP6EjT+a
++OZ1dRSTHJJBnGiUook14jb4PdAsl17Us+k0XvGvTx5Y8croOqFyYNNgQuiklSdz
+SnDOxQzS1Rb4SzVRzhq+6c71FKUC6gTi13m5OvauSdXg7USCdvDaMtujqpSkjBGl
+rHPN73nHUNBQ0tnr1t4qTyYvJry6hA7v1kFhgDTW5d5dD1yj/QJwAeHTMU3zzGwb
+eiU4LJg1F0GG/fyJDU2pn8+NgddWg75nE5qBfdcxwY2Lmdl1oqbhE6lncWS8Q2hq
+UEpmTNZOF99xCX6fp8jjJ/bnB0r8xJ9iPXquGXAmG+IWyB7kUtkifZrdJ1lDiVA=
+=itzb
 -----END PGP SIGNATURE-----
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]
+		<media-libs/mesa-8.0[gles]
+	) )
+	x11-libs/libX11
+	multilib? ( app-emulation/emul-linux-x86-baselibs )
+	qt4? (
+		>=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