[gentoo-commits] gentoo-x86 commit in dev-util/apitrace/files: apitrace-2.0-system-libs.patch apitrace-2.0-glxtrace-only.patch

[Tim Harder (radhermit)]

radhermit    11/10/01 23:44:02

  Added:                apitrace-2.0-system-libs.patch
                        apitrace-2.0-glxtrace-only.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/apitrace/files/apitrace-2.0-system-libs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-2.0-system-libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-2.0-system-libs.patch?rev=1.1&content-type=text/plain

Index: apitrace-2.0-system-libs.patch
===================================================================
--- 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



1.1                  dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch?rev=1.1&content-type=text/plain

Index: apitrace-2.0-glxtrace-only.patch
===================================================================
--- 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