diff options
| -rw-r--r-- | dev-util/apitrace/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/apitrace/apitrace-2.0-r1.ebuild | 94 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch | 89 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-2.0-system-libs.patch | 67 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch | 44 |
5 files changed, 6 insertions, 295 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index cca289601e6e..cabb9dfcdccb 100644 --- a/dev-util/apitrace/ChangeLog +++ b/dev-util/apitrace/ChangeLog @@ -1,6 +1,11 @@ # 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.13 2012/09/04 07:44:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.14 2012/12/13 21:05:24 radhermit Exp $ + + 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. diff --git a/dev-util/apitrace/apitrace-2.0-r1.ebuild b/dev-util/apitrace/apitrace-2.0-r1.ebuild deleted file mode 100644 index ac75993046b3..000000000000 --- a/dev-util/apitrace/apitrace-2.0-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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-2.0-r1.ebuild,v 1.2 2012/03/18 21:32:06 radhermit Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.6" - -inherit cmake-utils 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" - -PATCHES=( - "${FILESDIR}"/${P}-system-libs.patch - "${FILESDIR}"/${P}-glxtrace-only.patch - "${FILESDIR}"/${P}-zlib-1.2.6.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) ) - - 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} - use qt4 && dobin "${CMAKE_BUILD_DIR}"/qapitrace - - for ABI in $(get_install_abis) ; do - CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" - dolib.so "${CMAKE_BUILD_DIR}"/glxtrace.so - done - - dodoc {BUGS,NEWS,README,TODO}.markdown - - exeinto /usr/share/${PN}/scripts - doexe scripts/* -} diff --git a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch deleted file mode 100644 index b8d83b5120ca..000000000000 --- a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- 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 -@@ -141,7 +142,13 @@ - include_directories (${ZLIB_INCLUDE_DIRS}) - 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}) - -@@ -158,6 +165,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/qjson) -@@ -166,6 +175,8 @@ - set (QJSON_FOUND TRUE) - endif () - -+endif (NOT BUILD_LIB_ONLY) -+ - # For glext headers - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) - -@@ -215,9 +226,12 @@ - - link_libraries (common) - -+if (NOT BUILD_LIB_ONLY) -+ - add_executable (tracedump tracedump.cpp) - install (TARGETS tracedump RUNTIME DESTINATION bin) - -+endif (NOT BUILD_LIB_ONLY) - - ############################################################################## - # API tracers -@@ -374,6 +388,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 +402,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 +458,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 deleted file mode 100644 index 9984e3c9e468..000000000000 --- a/dev-util/apitrace/files/apitrace-2.0-system-libs.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- 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 diff --git a/dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch b/dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch deleted file mode 100644 index 5f761d4fb01d..000000000000 --- a/dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- apitrace-apitrace-e2c4320/common/trace_file.cpp -+++ apitrace-apitrace-e2c4320/common/trace_file.cpp -@@ -132,35 +132,35 @@ - - bool ZLibFile::rawWrite(const void *buffer, size_t length) - { -- return gzwrite(m_gzFile, buffer, length) != -1; -+ return gzwrite((gzFile)m_gzFile, buffer, length) != -1; - } - - bool ZLibFile::rawRead(void *buffer, size_t length) - { -- return gzread(m_gzFile, buffer, length) != -1; -+ return gzread((gzFile)m_gzFile, buffer, length) != -1; - } - - int ZLibFile::rawGetc() - { -- return gzgetc(m_gzFile); -+ return gzgetc((gzFile)m_gzFile); - } - - void ZLibFile::rawClose() - { - if (m_gzFile) { -- gzclose(m_gzFile); -+ gzclose((gzFile)m_gzFile); - m_gzFile = NULL; - } - } - - void ZLibFile::rawFlush() - { -- gzflush(m_gzFile, Z_SYNC_FLUSH); -+ gzflush((gzFile)m_gzFile, Z_SYNC_FLUSH); - } - - File::Offset ZLibFile::currentOffset() - { -- return File::Offset(gztell(m_gzFile)); -+ return File::Offset(gztell((gzFile)m_gzFile)); - } - - bool ZLibFile::supportsOffsets() const |