Version bump.

(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

4 files changed, 240 insertions, 1 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index c3fec2466e1f..e465e56f68dc 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.4 2011/09/13 13:15:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.5 2011/10/01 23:44:02 radhermit Exp $
+
+*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:
diff --git a/dev-util/apitrace/apitrace-2.0.ebuild b/dev-util/apitrace/apitrace-2.0.ebuild
new file mode 100644
index 000000000000..c1c384204a5e
--- /dev/null
+++ b/dev-util/apitrace/apitrace-2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-2.0.ebuild,v 1.1 2011/10/01 23:44:02 radhermit Exp $
+
+EAPI="3"
+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="multilib qt4"
+
+RDEPEND="app-arch/snappy
+	media-libs/libpng
+	sys-libs/zlib
+	virtual/opengl
+	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"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-system-libs.patch \
+		"${FILESDIR}"/${P}-glxtrace-only.patch
+}
+
+src_configure() {
+	for ABI in $(get_install_abis) ; do
+		mycmakeargs=( $(cmake-utils_use_enable qt4 GUI) )
+
+		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,tracedump} || die
+	use qt4 && { dobin "${CMAKE_BUILD_DIR}"/qapitrace || die ; }
+
+	for ABI in $(get_install_abis) ; do
+		CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
+		dolib.so "${CMAKE_BUILD_DIR}"/glxtrace.so || die
+	done
+
+	dodoc {BUGS,NEWS,README,TODO}.markdown || die
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/* || die
+}
diff --git a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
new file mode 100644
index 000000000000..d9499cf5fba1
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
@@ -0,0 +1,78 @@
+--- apitrace-apitrace-e2c4320/CMakeLists.txt.orig
++++ apitrace-apitrace-e2c4320/CMakeLists.txt
+@@ -17,6 +17,7 @@
+ # prescribed in http://www.gentoo.org/proj/en/qa/automagic.xml
+ set (ENABLE_GUI "AUTO" CACHE STRING "Enable Qt GUI.")
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
+ 
+ ##############################################################################
+ # Find dependencies
+@@ -137,6 +138,8 @@
+ # - on unices to prevent symbol collisions when tracing applications that link
+ # against other versions of these libraries
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ find_package (ZLIB REQUIRED)
+ include_directories (${ZLIB_INCLUDE_DIRS})
+ link_libraries (${ZLIB_LIBRARIES})
+@@ -166,6 +169,8 @@
+     set (QJSON_FOUND TRUE)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ # For glext headers
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
+ 
+@@ -184,6 +189,8 @@
+     DEPENDS glproc.py dispatch.py specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py
+ )
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ if (WIN32)
+     set (os os_win32.cpp)
+     set (glws glws_wgl.cpp)
+@@ -218,6 +225,7 @@
+ add_executable (tracedump tracedump.cpp)
+ install (TARGETS tracedump RUNTIME DESTINATION bin) 
+ 
++endif (NOT BUILD_LIB_ONLY)
+ 
+ ##############################################################################
+ # API tracers
+@@ -374,6 +382,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
+@@ -386,11 +396,15 @@
+     DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py
+ )
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ include_directories (
+     ${CMAKE_CURRENT_BINARY_DIR}
+     ${OPENGL_INCLUDE_PATH}
+ )
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ add_executable (glretrace
+     glretrace_gl.cpp
+     glretrace_cgl.cpp
+@@ -438,6 +452,7 @@
+     add_subdirectory(gui)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
+ 
+ ##############################################################################
+ # Packaging
diff --git a/dev-util/apitrace/files/apitrace-2.0-system-libs.patch b/dev-util/apitrace/files/apitrace-2.0-system-libs.patch
new file mode 100644
index 000000000000..9984e3c9e468
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-2.0-system-libs.patch
@@ -0,0 +1,67 @@
+--- apitrace-apitrace-e2c4320.orig/cmake/FindSNAPPY.cmake
++++ apitrace-apitrace-e2c4320/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-e2c4320.orig/CMakeLists.txt
++++ apitrace-apitrace-e2c4320/CMakeLists.txt
+@@ -137,27 +137,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)
+-
++find_package (ZLIB REQUIRED)
+ include_directories (${ZLIB_INCLUDE_DIRS})
+ 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_DIR})
+-add_definitions (${PNG_DEFINITIONS})
+ link_libraries (${PNG_LIBRARIES})
+ 
+ # The Qt website provides binaries for Windows and MacOSX, and they are