Version bump for apitrace to 4.0. Doesn't currently build.

6 files changed, 275 insertions, 0 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
new file mode 100644
index 0000000..e7b42f7
--- /dev/null
+++ b/dev-util/apitrace/ChangeLog
@@ -0,0 +1,89 @@
+# ChangeLog for dev-util/apitrace
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.17 2013/11/21 19:35:34 radhermit Exp $
+
+  21 Nov 2013; Peter Asplund <peterasplund@gentoo.se> apitrace-4.0.ebuild:
+  Version bump
+
+  17 Jul 2013; Tim Harder <radhermit@gentoo.org> apitrace-3.0-r1.ebuild:
+  Use cmake-utils_src_prepare instead of base_src_prepare (bug #477228) and
+  replace CMAKE_BUILD_DIR with BUILD_DIR.
+
+  11 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> apitrace-3.0-r1.ebuild,
+  +files/apitrace-3.0-memcpy.patch:
+  Include string.h for memcpy() function in common/image_png.cpp wrt #465504 by
+  Michael Palimaka
+
+  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> apitrace-3.0-r1.ebuild:
+  Move Qt dependencies to the new category
+
+  13 Dec 2012; Tim Harder <radhermit@gentoo.org> -apitrace-2.0-r1.ebuild,
+  -files/apitrace-2.0-glxtrace-only.patch,
+  -files/apitrace-2.0-system-libs.patch, -files/apitrace-2.0-zlib-1.2.6.patch:
+  Remove old.
+
+  04 Sep 2012; Tim Harder <radhermit@gentoo.org> apitrace-3.0-r1.ebuild:
+  Use vcs-snapshot eclass.
+
+  07 Aug 2012; Tim Harder <radhermit@gentoo.org> apitrace-3.0-r1.ebuild,
+  +files/apitrace-3.0-gcc47.patch:
+  Fix build with gcc-4.7 (bug #424731).
+
+  18 Mar 2012; Tim Harder <radhermit@gentoo.org> -apitrace-3.0.ebuild:
+  Remove old.
+
+*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:
+  Fix build with zlib-1.2.6.
+
+  16 Mar 2012; Tim Harder <radhermit@gentoo.org> -apitrace-1.0-r1.ebuild,
+  -files/apitrace-1.0-automagic-qt.patch,
+  -files/apitrace-1.0-glxtrace-only.patch, -files/apitrace-1.0-libpng15.patch:
+  Remove old.
+
+*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)
+
+  15 Dec 2011; Tim Harder <radhermit@gentoo.org> -apitrace-2.0.ebuild,
+  +apitrace-2.0-r1.ebuild, files/apitrace-2.0-glxtrace-only.patch:
+  Revbump and remove old. Update to EAPI 4 and fix multilib missing symbols
+  issue.
+
+*apitrace-2.0 (01 Oct 2011)
+
+  01 Oct 2011; Tim Harder <radhermit@gentoo.org> +apitrace-2.0.ebuild,
+  +files/apitrace-2.0-glxtrace-only.patch,
+  +files/apitrace-2.0-system-libs.patch:
+  Version bump.
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> apitrace-1.0-r1.ebuild,
+  +files/apitrace-1.0-libpng15.patch:
+  Fix building with libpng15 wrt #378533 by Diego Elio Pettenò
+
+  10 Sep 2011; Tim Harder <radhermit@gentoo.org> -apitrace-1.0.ebuild:
+  Remove old.
+
+*apitrace-1.0-r1 (10 Jun 2011)
+
+  10 Jun 2011; Tim Harder <radhermit@gentoo.org> +apitrace-1.0-r1.ebuild,
+  +files/apitrace-1.0-glxtrace-only.patch:
+  Revision bump to add multilib support (bug #370795).
+
+*apitrace-1.0 (09 Jun 2011)
+
+  09 Jun 2011; Tim Harder <radhermit@gentoo.org> +apitrace-1.0.ebuild,
+  +files/apitrace-1.0-automagic-qt.patch, +metadata.xml:
+  Initial import.
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
new file mode 100644
index 0000000..49d483d
--- /dev/null
+++ b/dev-util/apitrace/Manifest
@@ -0,0 +1,7 @@
+AUX apitrace-3.0-system-libs.patch 2116 SHA256 064a4a1f484d77542b93caba7e6a22b0bba7adf61d9ba43d905e67b7ba31e0e8 SHA512 3b52a4bb4bcb0c5fc8edbcf1d01379bd651287c1cafc217d3e2144963aa5a302249815cf5fea71528df40b5cc1e1616e709e8cbd11b5fe503673fe10bfe74771 WHIRLPOOL 15ed3b49add5c825c3d2f07a954a271543260c40de2d7e25b2ae1438fadf5b4fbfd796951b6a96d5dbeeba8edd0c39382b0f149eedf0cd29235efdaca5091f4a
+AUX apitrace-4.0-cmake-snappy.patch 797 SHA256 c635eb66829a8ade36dbb5f3242f23a1ca51bc520fe3015516842062dcd013ab SHA512 8a4b135780ed8ec0bac1e04e964c8e16bff2dcc69bf7485e442b043cf230e8d9078efa4396ef1dc3f622e723307e279b32d23b3872471a63e795d19230b71cf8 WHIRLPOOL 6e34217521fae81416006c6e9c6bd260dc452238d972d4f8c5e408a7d81d0b214243f17d52104834d09c5c312f51bd42473868281aad8fbd873486a832105184
+AUX apitrace-4.0-system-libs.patch 1092 SHA256 cde7190f61b5276e86943e593bc1ffa58a58a6bde10d6d4a567cb1edf3dfccbf SHA512 bb3bb92baf28768c97c12ff628776276f1d515576818251e2005d4b637fc75ccac9f606da811f0e1024b0d02a52b6cef70f780893bb2873fde5c2c5511abf5f0 WHIRLPOOL 98b228689fc8e06017077859b626b11800b2d14e003a8048637af2cf59ea1398392627f8a27559c056098c1de4909192f87ca859f6aa245749fee7175dbe6a6e
+DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
+EBUILD apitrace-4.0.ebuild 2494 SHA256 ed5e2aefd38152f7491ed13d400adb783654986c5def838ab3caceb9ec82b970 SHA512 06a5e7ccdd3b66d148b05729ed0c3bc0ae8e52a2f3ece8e17dd12bba1e7da5e2b103fd70754847cd861c82fa3b4414782631d615918ac40c5a502084240058c7 WHIRLPOOL a81f7f3003a0c3c8caa28d7b6cc5edf20da6a7a2d3b2dc7c9dc891f836ca01c03280e9303774096c55c42b9100b9a23a6b3a6e50a08b5cc31d55aa6ed9af4e70
+MISC ChangeLog 3245 SHA256 58fdd6a8645eef2cb4b328a383e6c0d19cae4530d0292b9b63394a2e72c6230d SHA512 9d8b09b8a5660e8a2a2920a2ce4c4d8e286dddfdfffebc102a6f5d946a4451585987c1f733a9bdabab3731cddd994071d2f76081eeffbe8665d8307a2e8a5f78 WHIRLPOOL 63b026c4052174df73340a700ff6df57cb3b78f34a4142c720c9bac03e6c6b883c01f6ce8da0c9e1302ae91d95f9cf1d57c1d1310bdc4fe34bb766046a4f8735
+MISC metadata.xml 292 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44 SHA512 82c9c7d2f8caab7c4e6d6b49bf9ae8fcaae5d0e48cabc5af10524fa1b2de2aaf95a09d810eca99bc10629070e1d65b8c6127e489e92deca9b6f35ad98572059d WHIRLPOOL 7b16569e2da612f6e711f008d8c7084ae7c2cb6c7378d812f7b6b059d2a20e68b86b8287ee06f100b8b5696837b787dcd574e12fa22249f157ecbd1a5ae90f09
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild
new file mode 100644
index 0000000..47850a8
--- /dev/null
+++ b/dev-util/apitrace/apitrace-4.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 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.6 2013/07/17 21:55:34 radhermit Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils eutils python multilib vcs-snapshot
+
+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:0=
+	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? (
+		>=dev-qt/qtcore-4.7:4
+		>=dev-qt/qtgui-4.7:4
+		>=dev-qt/qtwebkit-4.7:4
+		>=dev-libs/qjson-0.5
+	)"
+DEPEND="${RDEPEND}"
+
+EMULTILIB_PKG="true"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libs.patch
+	"${FILESDIR}"/${P}-cmake-snappy.patch
+)
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	cmake-utils_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
+
+		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}
+		BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
+		cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/{glretrace,apitrace}
+	use qt4 && dobin "${BUILD_DIR}"/qapitrace
+
+	for ABI in $(get_install_abis) ; do
+		BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
+		exeinto /usr/$(get_libdir)/${PN}/wrappers
+		doexe "${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-4.0-cmake-snappy.patch b/dev-util/apitrace/files/apitrace-4.0-cmake-snappy.patch
new file mode 100644
index 0000000..172ae0a
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-cmake-snappy.patch
@@ -0,0 +1,34 @@
+--- cmake/FindSNAPPY.cmake
++++ 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)
diff --git a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
new file mode 100644
index 0000000..c9a472e
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
@@ -0,0 +1,31 @@
+--- CMakeLists_old.txt	2013-11-21 18:04:33.000000000 +0100
++++ CMakeLists.txt	2013-11-21 18:15:30.000000000 +0100
+@@ -224,23 +224,14 @@
+ # - 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)
+-
+-include_directories (${ZLIB_INCLUDE_DIRS})
+-
+-set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
+-set (SNAPPY_LIBRARIES snappy_bundled)
+-add_subdirectory (thirdparty/snappy)
++find_package (ZLIB REQUIRED)
++include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+ 
++find_package(SNAPPY REQUIRED)
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ 
+-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
+-set (PNG_DEFINITIONS "")
+-set (PNG_LIBRARIES png_bundled)
+-
+-add_subdirectory (thirdparty/libpng)
++find_package (PNG REQUIRED)
++include_directories (${PNG_INCLUDE_DIRS})
+ 
+ if (MSVC)
+     add_subdirectory (thirdparty/getopt)
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
new file mode 100644
index 0000000..8ef89d7
--- /dev/null
+++ b/dev-util/apitrace/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="egl">Enable EGL support</flag>
+	</use>
+</pkgmetadata>