diff options
| -rw-r--r-- | dev-util/apitrace/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch | 24 |
2 files changed, 8 insertions, 22 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index 17c7a2d8421a..fad63b49e3c1 100644 --- a/dev-util/apitrace/ChangeLog +++ b/dev-util/apitrace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/apitrace # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.19 2014/04/03 18:23:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.20 2014/04/05 15:19:42 vapier Exp $ + + 05 Apr 2014; Mike Frysinger <vapier@gentoo.org> + files/apitrace-4.0-glxtrace-only.patch: + Do not re-add snappy subdir for lib-only builds #506714 by Matt Turner. *apitrace-4.0 (03 Apr 2014) diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch index 5f3fdde49fae..08ce65e2fc0a 100644 --- a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch +++ b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch @@ -12,21 +12,6 @@ Updated from 3.0 version of patch to apply against 4.0. ############################################################################## # Find dependencies -@@ -227,7 +228,13 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers) - find_package (ZLIB REQUIRED) - include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) - --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}) - - find_package (PNG REQUIRED) @@ -248,6 +255,8 @@ endif () # - The packaged versions QJson are very old, and do not support NaN/Infinity. # - To make it easier to build the GUI on Windows and MacOSX, as there are no @@ -45,23 +30,20 @@ Updated from 3.0 version of patch to apply against 4.0. # We use bundled headers for all Khronos APIs, to guarantee support for both # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs # are so intertwined that conditional compilation extremely difficult. This -diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt -index 913c23e..08b2905 100644 --- apitrace/retrace/CMakeLists.txt +++ apitrace/retrace/CMakeLists.txt @@ -11,6 +11,8 @@ include_directories ( add_definitions (-DRETRACE) -+if (NOT BUILD_LIB_ONLY) ++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 -@@ -259,3 +261,6 @@ if (WIN32) +@@ -259,3 +261,5 @@ if (WIN32) install (TARGETS d3dretrace RUNTIME DESTINATION bin) endif () + -+endif (NOT BUILD_LIB_ONLY) -+ ++endif (NOT BUILD_LIB_ONLY) |