Add glxtrace-only patch so multilib builds

3 files changed, 78 insertions, 1 deletions

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index a0d1f7f..4e1d041 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,6 +1,7 @@
 AUX apitrace-4.0-cmake-snappy.patch 797 SHA256 c635eb66829a8ade36dbb5f3242f23a1ca51bc520fe3015516842062dcd013ab SHA512 8a4b135780ed8ec0bac1e04e964c8e16bff2dcc69bf7485e442b043cf230e8d9078efa4396ef1dc3f622e723307e279b32d23b3872471a63e795d19230b71cf8 WHIRLPOOL 6e34217521fae81416006c6e9c6bd260dc452238d972d4f8c5e408a7d81d0b214243f17d52104834d09c5c312f51bd42473868281aad8fbd873486a832105184
+AUX apitrace-4.0-glxtrace-only.patch 2366 SHA256 1ccfd47e646a253171c3f9d129e31d5c58d2d084970350ab4b7d07d9c6410931 SHA512 cfb2bc35b4f2118a6b87a2beb482ec55cc417bcd28cd8094cdad841bf3d518ea22eb1bb3d742a4698abf8fcc37d030a7c7c383760251b3bed69683cf10803826 WHIRLPOOL 27047b4bcd96c7eaf63f93f5fb2480ef1c3eb473b2276b363fa00d45884daf6fb388c708aaff61297976c8d127696dafad8fdfc84cea4e2266ded8ba6268196e
 AUX apitrace-4.0-system-libs.patch 1092 SHA256 cde7190f61b5276e86943e593bc1ffa58a58a6bde10d6d4a567cb1edf3dfccbf SHA512 bb3bb92baf28768c97c12ff628776276f1d515576818251e2005d4b637fc75ccac9f606da811f0e1024b0d02a52b6cef70f780893bb2873fde5c2c5511abf5f0 WHIRLPOOL 98b228689fc8e06017077859b626b11800b2d14e003a8048637af2cf59ea1398392627f8a27559c056098c1de4909192f87ca859f6aa245749fee7175dbe6a6e
 DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
-EBUILD apitrace-4.0.ebuild 2494 SHA256 ed5e2aefd38152f7491ed13d400adb783654986c5def838ab3caceb9ec82b970 SHA512 06a5e7ccdd3b66d148b05729ed0c3bc0ae8e52a2f3ece8e17dd12bba1e7da5e2b103fd70754847cd861c82fa3b4414782631d615918ac40c5a502084240058c7 WHIRLPOOL a81f7f3003a0c3c8caa28d7b6cc5edf20da6a7a2d3b2dc7c9dc891f836ca01c03280e9303774096c55c42b9100b9a23a6b3a6e50a08b5cc31d55aa6ed9af4e70
+EBUILD apitrace-4.0.ebuild 2534 SHA256 c633108e7baef59a79204a0bbf83cac945ae79f9c6a083be40ec6d5a72309ef5 SHA512 40c1c4600df781e249b4ad29a21d53d639d06b86ddb89fe47774e1ebccecd96acddbc0074630fd500f61099a828d2e85586588c301be0ca0bf4fac8268bdc6cf WHIRLPOOL 90f3465c44316980c7723919cd6bb03d316fccbe06735a7bb5582dc3d0081b5e64909affe514bdea8df2ed3aebb2d8d793f6793aa7b28404174b46d4723555ec
 MISC ChangeLog 3336 SHA256 5441b111dbc11115317c5e9a9de6484e48437d59f125ea7711a5c72da272e1af SHA512 e7116988dd826596ac47defa99e78ae1393825d296df1a83fd63da595ae6ea139aa2b116d531c8b5a40fa2d68049dd466166d3dc3dec4861971d45d7aadd4962 WHIRLPOOL dfdb577b3a367e5d0df21be7ae10d56944fe74cef063987dacba239e3f256e67c7e8505b1e190482892f3c637ab12811e1eaffa6fd6a8ea2aa8e204fde18e949
 MISC metadata.xml 292 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44 SHA512 82c9c7d2f8caab7c4e6d6b49bf9ae8fcaae5d0e48cabc5af10524fa1b2de2aaf95a09d810eca99bc10629070e1d65b8c6127e489e92deca9b6f35ad98572059d WHIRLPOOL 7b16569e2da612f6e711f008d8c7084ae7c2cb6c7378d812f7b6b059d2a20e68b86b8287ee06f100b8b5696837b787dcd574e12fa22249f157ecbd1a5ae90f09
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild
index 47850a8..2d41946 100644
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ b/dev-util/apitrace/apitrace-4.0.ebuild
@@ -38,6 +38,7 @@ EMULTILIB_PKG="true"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-system-libs.patch
+	"${FILESDIR}"/${P}-glxtrace-only.patch
 	"${FILESDIR}"/${P}-cmake-snappy.patch
 )
 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
new file mode 100644
index 0000000..6b42de2
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
@@ -0,0 +1,75 @@
+--- CMakeLists.txt	2013-11-21 19:53:57.000000000 +0100
++++ CMakeLists.txt	2013-11-21 20:01:30.000000000 +0100
+@@ -30,6 +30,7 @@
+ 
+ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
+ 
+ ##############################################################################
+ # Find dependencies
+@@ -227,7 +228,14 @@
+ 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 +256,8 @@
+ # - 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
+ # binaries at all.
++if (NOT BUILD_LIB_ONLY)
++
+ if (QT4_FOUND)
+     add_definitions (-DQJSON_EXPORT=)
+     add_subdirectory (thirdparty/qjson)
+@@ -257,6 +267,8 @@
+     set (QJSON_FOUND TRUE)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ # 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
+@@ -362,10 +374,13 @@
+ ##############################################################################
+ # GUI
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ if (ENABLE_GUI AND QT4_FOUND AND QJSON_FOUND)
+     add_subdirectory(gui)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
+ 
+ ##############################################################################
+ # Packaging
+--- retrace/CMakeLists.txt	2013-05-02 09:05:06.000000000 +0200
++++ retrace/CMakeLists.txt	2013-11-21 19:59:27.000000000 +0100
+@@ -11,6 +11,7 @@
+ 
+ add_definitions (-DRETRACE)
+ 
++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 +260,6 @@
+ 
+     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+ endif ()
++
++endif (NOT BUILD_LIB_ONLY)
++