6 files changed, 278 insertions, 11 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index 3af008826236..f6f7a3fbc4c3 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/apitrace
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.6 2011/12/15 07:28:36 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.7 2012/03/16 22:32:50 radhermit Exp $
+
+*apitrace-3.0 (16 Mar 2012)
+
+  16 Mar 2012; Tim Harder <radhermit@gentoo.org> +apitrace-3.0.ebuild,
+  +files/apitrace-3.0-glxtrace-only.patch,
+  +files/apitrace-3.0-system-libs.patch, metadata.xml:
+  Version bump. Add egl use flag.
 
 *apitrace-2.0-r1 (15 Dec 2011)
 
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 5b49f78866b6..4b4dd1fe7622 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -6,20 +6,24 @@ AUX apitrace-1.0-glxtrace-only.patch 660 RMD160 5d9cd457ed13d8c72ac24eb779691c56
 AUX apitrace-1.0-libpng15.patch 592 RMD160 bf8190344f9aa8864615a4fa069d166246a42ab2 SHA1 ed148176b9357d9dd289b41821702cc35f7b136a SHA256 9567682a6e558301e5e1f6f35b3ab54bdcd32be7d182eef881954d47b41200ba
 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-3.0-glxtrace-only.patch 2419 RMD160 08fe99c52728e4cb7b7cb1dd267878fc825b832f SHA1 3214ec0bdf8fca17ed8af731ec5264843188d3e5 SHA256 f465b2d853b3e90300194fff73f7a2bf2a294756900ad3a6b7c4920ddaa36600
+AUX apitrace-3.0-system-libs.patch 2116 RMD160 05a89bd357d14e7cf2875b82deaa5c7bc908c41e SHA1 e46561813c236b94a509b87e3b1445dad97ee49e SHA256 064a4a1f484d77542b93caba7e6a22b0bba7adf61d9ba43d905e67b7ba31e0e8
 DIST apitrace-1.0.tar.gz 770989 RMD160 202d9e215779204fd5d7b69b231293cc16864e57 SHA1 289b7b66e9daf7d25aebd9b7ed1d28a0e6f8a79a SHA256 5747e9b9cc39854d32e6100212c55f228ab41577b18f61e70f21b7a410c8e0fc
 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-1.0-r1.ebuild 2046 RMD160 eb80d351f80bdc44c46bbcf867867d08b3ccf0eb SHA1 b9fa737c187f34d78884203e3a134f5d3e35f975 SHA256 835af7520123aff049e5c2809fad0646c3ce756e6528514809eb2611e116e9c1
 EBUILD apitrace-2.0-r1.ebuild 2089 RMD160 48e509cedffc9ca242a128f3f63963dda20f7f50 SHA1 8a94a09cfb93ea25e104c3e10fec2cdd9aff46e3 SHA256 4375bac6d2e87cf3b32539aa5b72a0fd225a70ae28caa1ecbd76738c01960e5a
-MISC ChangeLog 1315 RMD160 16e47e522a5797c14b1614aa57fdb96ee7f0050b SHA1 03fa70b208e0c2efad06710661472817ca829a58 SHA256 8d1314788f16ededa47c0fd0e6083674fa9751ae6a5338c58235e3d5e51261b5
-MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
+EBUILD apitrace-3.0.ebuild 2513 RMD160 8565fe1fb5df18d1a5679109a79e68181986f898 SHA1 43b66b0ad3de2ea3ebd13a409febe76df95229e8 SHA256 a47604c909c72cf7b4436e30417b8bf2c8e4b89b08e5a1600a7538da99aa988e
+MISC ChangeLog 1548 RMD160 f19e6e8bc1588d7aaa7cf62b7d2db55b8fef87a6 SHA1 868eaef5dfd8f0dd81036f6d09fcf75f1dfce26d SHA256 7d9db7ae55a6205d43f153c55e8074d0c399979cb8a051ce3d2e30d9bd33e878
+MISC metadata.xml 292 RMD160 3be96a8d901993687d732e97857af05503eee229 SHA1 2a01be0e8c6ac0e07253639797ffd49cfe47ba94 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6aGyAAoJEEqz6FtPBkyjkbQH/1cwmx7p1WB2YoA/qyeKz3R0
-bgGjbibw2CLADmjVbDUpl7sE9eeiiyUubU1bi9OCOdxq8yxBciIQbJ4+ykDB034x
-SsvxDUZncfRU12hzIHcbTjwA4nVV52y5IOV8JZMz89YmNSPkfJ+4hHLzRs53yUqy
-11MPmajmC56vDNRFRbhNo3lJSkQHBZRY/J+4BP8dFrLdaDPNxbi57dtkTQRl3BHB
-1Hr9suDwJeT2DqybvOS5mFK9IPm5yYzEINpewn6LgEx4uKmuqBHNYyVUHiy+lcnv
-ZqSMyo0Gq9mY2jcvxB5SUDHD2/6ZWTIDnIBKu88dyd+0OKU/Aq3WE/HxOdERLJI=
-=6E4V
+iQEcBAEBCgAGBQJPY7+YAAoJEEqz6FtPBkyjERgH/0xswi045AjRuAKhPpJYt0JD
+hEKV5Z7O8xJhfYGbY1eAb8zTDUUm4Fuslxty30h3cvHYXAoFiEh/aW5bQd+cIFBK
+JOsLbae9UcIE3MN7pyWiihe5y5ioi5+TpX6XjOcaYUWJgv0pK+ips6doI3LaxEhq
+6IQznnEt9F9P26AGlt/EFL1Tl8HleZKXRopxiq5msqharn7uBWoKvhECgH7rQTIx
+yU5PFdXdUPSou+rGYjBMmTBjP4ECLN6wfRLxP56ngIuzrobA8H8paCA9VoFAzBAj
+1KXc7TRWR5F348sER22giAxn6lbtduEUobaXpKxUvOt4TRZvgyzpcu8V+mUtUIk=
+=Ip7j
 -----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-3.0.ebuild b/dev-util/apitrace/apitrace-3.0.ebuild
new file mode 100644
index 000000000000..7d9247924aca
--- /dev/null
+++ b/dev-util/apitrace/apitrace-3.0.ebuild
@@ -0,0 +1,104 @@
+# 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.ebuild,v 1.1 2012/03/16 22:32:51 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 )
+			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
new file mode 100644
index 000000000000..02a8a6005668
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch
@@ -0,0 +1,80 @@
+--- apitrace-apitrace-de9f3e5/CMakeLists.txt
++++ apitrace-apitrace-de9f3e5/CMakeLists.txt
+@@ -19,6 +19,8 @@
+ 
+ set (ENABLE_EGL "AUTO" CACHE STRING "Enable EGL support.")
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
++
+ 
+ ##############################################################################
+ # Find dependencies
+@@ -159,7 +161,13 @@
+ include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+ link_libraries (${ZLIB_LIBRARIES})
+ 
+-find_package (SNAPPY REQUIRED)
++if (BUILD_LIB_ONLY)
++	set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
++	set (SNAPPY_LIBRARIES snappy_bundled)
++	add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL)
++else (BUILD_LIB_ONLY)
++	find_package (SNAPPY REQUIRED)
++endif (BUILD_LIB_ONLY)
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ link_libraries (${SNAPPY_LIBRARIES})
+ 
+@@ -182,6 +190,8 @@
+ # By bundling the QJSON source, we make it much more easier to build the GUI on
+ # Windows and MacOSX.  But we only use the bundled sources when ENABLE_GUI is
+ # AUTO.
++if (NOT BUILD_LIB_ONLY)
++
+ if (QT4_FOUND AND NOT QJSON_FOUND AND (ENABLE_GUI STREQUAL "AUTO"))
+     add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL)
+     set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
+@@ -190,6 +200,8 @@
+     set (QJSON_FOUND TRUE)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ # 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
+ 
++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
+@@ -624,6 +642,8 @@
+     add_subdirectory(gui)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ 
+ ##############################################################################
+ # Packaging
diff --git a/dev-util/apitrace/files/apitrace-3.0-system-libs.patch b/dev-util/apitrace/files/apitrace-3.0-system-libs.patch
new file mode 100644
index 000000000000..39513540925a
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-3.0-system-libs.patch
@@ -0,0 +1,69 @@
+--- apitrace-apitrace-de9f3e5/cmake/FindSNAPPY.cmake
++++ apitrace-apitrace-de9f3e5/cmake/FindSNAPPY.cmake
+@@ -0,0 +1,31 @@
++# Find SNAPPY - A fast compressor/decompressor
++#
++# This module defines
++#  SNAPPY_FOUND - whether the qsjon library was found
++#  SNAPPY_LIBRARIES - the snappy library
++#  SNAPPY_INCLUDE_DIR - the include path of the snappy library
++#
++
++if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
++
++  # Already in cache
++  set (SNAPPY_FOUND TRUE)
++
++else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
++
++  find_library (SNAPPY_LIBRARIES
++    NAMES
++    snappy
++    PATHS
++  )
++
++  find_path (SNAPPY_INCLUDE_DIR
++    NAMES
++    snappy.h
++    PATHS
++  )
++
++  include(FindPackageHandleStandardArgs)
++  find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
++
++endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
+--- apitrace-apitrace-de9f3e5/CMakeLists.txt
++++ apitrace-apitrace-de9f3e5/CMakeLists.txt
+@@ -155,27 +155,16 @@
+ # - on unices to prevent symbol collisions when tracing applications that link
+ # against other versions of these libraries
+ 
+-set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+-set (ZLIB_LIBRARIES z_bundled)
+-add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL)
+-
+-include_directories (${ZLIB_INCLUDE_DIRS})
++find_package (ZLIB REQUIRED)
++include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+ link_libraries (${ZLIB_LIBRARIES})
+ 
+-set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
+-set (SNAPPY_LIBRARIES snappy_bundled)
+-add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL)
+-
++find_package (SNAPPY REQUIRED)
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ link_libraries (${SNAPPY_LIBRARIES})
+ 
+-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
+-set (PNG_DEFINITIONS "")
+-set (PNG_LIBRARIES png_bundled)
+-
+-add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL)
++find_package (PNG REQUIRED)
++include_directories (${PNG_INCLUDE_DIRS})
+-include_directories (${PNG_INCLUDE_DIR})
+-add_definitions (${PNG_DEFINITIONS})
+ link_libraries (${PNG_LIBRARIES})
+ 
+ if (MSVC)
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 157326a7e891..8ef89d7c3d4f 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -5,4 +5,7 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<use>
+		<flag name="egl">Enable EGL support</flag>
+	</use>
 </pkgmetadata>