vapier 14/04/05 15:19:42 Modified: apitrace-4.0-glxtrace-only.patch Log: Do not re-add snappy subdir for lib-only builds #506714 by Matt Turner. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch?r1=1.1&r2=1.2 Index: apitrace-4.0-glxtrace-only.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apitrace-4.0-glxtrace-only.patch 3 Apr 2014 18:23:13 -0000 1.1 +++ apitrace-4.0-glxtrace-only.patch 5 Apr 2014 15:19:42 -0000 1.2 @@ -12,21 +12,6 @@ ############################################################################## # 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 @@ # 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)
