diff options
author | Tim Harder <radhermit@gentoo.org> | 2011-12-15 07:28:37 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2011-12-15 07:28:37 +0000 |
commit | 73e50372783d5b35cd99f945efaf4319f0c5ff8d (patch) | |
tree | 4f19fb9115183cc915ea8fcec961462b16f39026 /dev-util/apitrace | |
parent | Don't (ab)use elisp-install for installing subdirs.el in the parent dir. (diff) | |
download | historical-73e50372783d5b35cd99f945efaf4319f0c5ff8d.tar.gz historical-73e50372783d5b35cd99f945efaf4319f0c5ff8d.tar.bz2 historical-73e50372783d5b35cd99f945efaf4319f0c5ff8d.zip |
Revbump and remove old. Update to EAPI 4 and fix multilib missing symbols issue.
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
Diffstat (limited to 'dev-util/apitrace')
-rw-r--r-- | dev-util/apitrace/ChangeLog | 9 | ||||
-rw-r--r-- | dev-util/apitrace/Manifest | 20 | ||||
-rw-r--r-- | dev-util/apitrace/apitrace-2.0-r1.ebuild (renamed from dev-util/apitrace/apitrace-2.0.ebuild) | 28 | ||||
-rw-r--r-- | dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch | 45 |
4 files changed, 63 insertions, 39 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index e465e56f68dc..3af008826236 100644 --- a/dev-util/apitrace/ChangeLog +++ b/dev-util/apitrace/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/apitrace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.5 2011/10/01 23:44:02 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.6 2011/12/15 07:28:36 radhermit Exp $ + +*apitrace-2.0-r1 (15 Dec 2011) + + 15 Dec 2011; Tim Harder <radhermit@gentoo.org> -apitrace-2.0.ebuild, + +apitrace-2.0-r1.ebuild, files/apitrace-2.0-glxtrace-only.patch: + Revbump and remove old. Update to EAPI 4 and fix multilib missing symbols + issue. *apitrace-2.0 (01 Oct 2011) diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest index 4cb126dfd7a3..5b49f78866b6 100644 --- a/dev-util/apitrace/Manifest +++ b/dev-util/apitrace/Manifest @@ -4,22 +4,22 @@ Hash: SHA512 AUX apitrace-1.0-automagic-qt.patch 768 RMD160 a966656451f3cea08ecc87c431467cf645ca1ea8 SHA1 7f2ff25ff01edc0acb6477d05f2e8c01bee99359 SHA256 6e93134ba411fee185c27bf7bb84b3f15d403f3fd119d4d86b2ae86306c991f4 AUX apitrace-1.0-glxtrace-only.patch 660 RMD160 5d9cd457ed13d8c72ac24eb779691c5637045cf5 SHA1 821b39e3689f6ef319f5230da67fa453f2032ef4 SHA256 a78a7a641f911f1b51a611c6ff15b77216dce7d0252ace77b59ab5df90ac5cd8 AUX apitrace-1.0-libpng15.patch 592 RMD160 bf8190344f9aa8864615a4fa069d166246a42ab2 SHA1 ed148176b9357d9dd289b41821702cc35f7b136a SHA256 9567682a6e558301e5e1f6f35b3ab54bdcd32be7d182eef881954d47b41200ba -AUX apitrace-2.0-glxtrace-only.patch 2174 RMD160 8e5c50a363adeced2cf78355cf09e69a9241ab0f SHA1 f645467cb739510a505b31d8dd2773adf73555b6 SHA256 f66b9fcd53230af0196007435691deef93d0cb0016bf8163b6936419ca729f2b +AUX apitrace-2.0-glxtrace-only.patch 2605 RMD160 43b4c3a99a971bc01f79f133ed075c88dbf5aadd SHA1 97c2b6acdb497dbe2e32e1f390ac977d3c92932c SHA256 1ffb7f76a5f681bc83996ff967caaab1369d59d8ee6b6d7212c3889eaef824d4 AUX apitrace-2.0-system-libs.patch 2057 RMD160 0da92249f954b95f5ea9b50796e4f312c7a430fb SHA1 8e122badac08154ea2a77378330fd644008faee6 SHA256 e37b5adddbfb6aac39f6f808ae548760e1cfaedc0ce6a877ce1a29a4159f9615 DIST apitrace-1.0.tar.gz 770989 RMD160 202d9e215779204fd5d7b69b231293cc16864e57 SHA1 289b7b66e9daf7d25aebd9b7ed1d28a0e6f8a79a SHA256 5747e9b9cc39854d32e6100212c55f228ab41577b18f61e70f21b7a410c8e0fc DIST apitrace-2.0.tar.gz 943001 RMD160 ca378b2a45cb8873d19bbfe549879f256e4acc48 SHA1 9233520a2a8d91ccae826fccc0c1f3038518a5ec SHA256 a037d24a4bb01c67a7ac517b22b0d3a1b303ccfff0f1249f143e529aaa98f705 EBUILD apitrace-1.0-r1.ebuild 2046 RMD160 eb80d351f80bdc44c46bbcf867867d08b3ccf0eb SHA1 b9fa737c187f34d78884203e3a134f5d3e35f975 SHA256 835af7520123aff049e5c2809fad0646c3ce756e6528514809eb2611e116e9c1 -EBUILD apitrace-2.0.ebuild 2018 RMD160 e99650e47d80db394d8ff8ae6cdcff478fd031b4 SHA1 9c7c8d5eec0e6553b32d36a621b969af31f10d20 SHA256 95d151def3affd42579809ccca9d3cb9698af8ba65730cf3cbf1d537a5524dc3 -MISC ChangeLog 1059 RMD160 4b175e42ff600a37895dc224ad17bff7f521c360 SHA1 9e6b98444ccec93f5db3acdef15d46ab0a1bc535 SHA256 07e3dd5925f5b2ab146b732f97f2f4ad0be7af5176538c1052182bfd8230a9c3 +EBUILD apitrace-2.0-r1.ebuild 2089 RMD160 48e509cedffc9ca242a128f3f63963dda20f7f50 SHA1 8a94a09cfb93ea25e104c3e10fec2cdd9aff46e3 SHA256 4375bac6d2e87cf3b32539aa5b72a0fd225a70ae28caa1ecbd76738c01960e5a +MISC ChangeLog 1315 RMD160 16e47e522a5797c14b1614aa57fdb96ee7f0050b SHA1 03fa70b208e0c2efad06710661472817ca829a58 SHA256 8d1314788f16ededa47c0fd0e6083674fa9751ae6a5338c58235e3d5e51261b5 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOh6XOAAoJEEqz6FtPBkyjlwsH/imXiNVMw6yRgpL0FEFeG9se -4AzL1Bz6W18l9ezZWTz26ave+15D+b46fYELYwhCFHa9eeNjyG7QazoLd+xkBBDE -Hecu6qTL9AtD64MmJ8S/XHUEkLEyaUEndL2ajSeGLjHOGdNP+6yIGxEGR7Pobmbb -5C+q1RxGL1YejwjQDBjZ++NbKC34C5kJ+dG+jmsgQmEizzXATd5X+pZWe6V+OGcT -tvcZZhtz8G5HRfQFLJX2gfeShkAP9ZuNI+kLcZOekwq76LP2Syyz4vmDdgHTGQ1k -tthlRUMbSe+Up1C+wHKfPlxpbOPqeXiH0SyvwlXmrGyZzMslMJV8+GDFTGTXey4= -=SMz7 +iQEcBAEBCgAGBQJO6aGyAAoJEEqz6FtPBkyjkbQH/1cwmx7p1WB2YoA/qyeKz3R0 +bgGjbibw2CLADmjVbDUpl7sE9eeiiyUubU1bi9OCOdxq8yxBciIQbJ4+ykDB034x +SsvxDUZncfRU12hzIHcbTjwA4nVV52y5IOV8JZMz89YmNSPkfJ+4hHLzRs53yUqy +11MPmajmC56vDNRFRbhNo3lJSkQHBZRY/J+4BP8dFrLdaDPNxbi57dtkTQRl3BHB +1Hr9suDwJeT2DqybvOS5mFK9IPm5yYzEINpewn6LgEx4uKmuqBHNYyVUHiy+lcnv +ZqSMyo0Gq9mY2jcvxB5SUDHD2/6ZWTIDnIBKu88dyd+0OKU/Aq3WE/HxOdERLJI= +=6E4V -----END PGP SIGNATURE----- diff --git a/dev-util/apitrace/apitrace-2.0.ebuild b/dev-util/apitrace/apitrace-2.0-r1.ebuild index c1c384204a5e..48973cf8957a 100644 --- a/dev-util/apitrace/apitrace-2.0.ebuild +++ b/dev-util/apitrace/apitrace-2.0-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-2.0.ebuild,v 1.1 2011/10/01 23:44:02 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-2.0-r1.ebuild,v 1.1 2011/12/15 07:28:36 radhermit Exp $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="2:2.6" -inherit cmake-utils eutils python multilib +inherit cmake-utils python multilib DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" HOMEPAGE="https://github.com/apitrace/apitrace" @@ -32,6 +32,11 @@ DEPEND="${RDEPEND}" EMULTILIB_PKG="true" +PATCHES=( + "${FILESDIR}"/${P}-system-libs.patch + "${FILESDIR}"/${P}-glxtrace-only.patch +) + pkg_setup() { python_set_active_version 2 } @@ -42,9 +47,10 @@ src_unpack() { } src_prepare() { - epatch \ - "${FILESDIR}"/${P}-system-libs.patch \ - "${FILESDIR}"/${P}-glxtrace-only.patch + base_src_prepare + + # Workaround NULL DT_RPATH issues + sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die } src_configure() { @@ -72,16 +78,16 @@ src_compile() { } src_install() { - dobin "${CMAKE_BUILD_DIR}"/{glretrace,tracedump} || die - use qt4 && { dobin "${CMAKE_BUILD_DIR}"/qapitrace || die ; } + 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 || die + dolib.so "${CMAKE_BUILD_DIR}"/glxtrace.so done - dodoc {BUGS,NEWS,README,TODO}.markdown || die + dodoc {BUGS,NEWS,README,TODO}.markdown exeinto /usr/share/${PN}/scripts - doexe scripts/* || die + 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 index d9499cf5fba1..b8d83b5120ca 100644 --- a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch +++ b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch @@ -8,16 +8,31 @@ ############################################################################## # Find dependencies -@@ -137,6 +138,8 @@ - # - on unices to prevent symbol collisions when tracing applications that link - # against other versions of these libraries +@@ -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) + - find_package (ZLIB REQUIRED) - include_directories (${ZLIB_INCLUDE_DIRS}) - link_libraries (${ZLIB_LIBRARIES}) -@@ -166,6 +169,8 @@ + 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 () @@ -26,16 +41,12 @@ # 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 - ) +@@ -215,9 +226,12 @@ + + link_libraries (common) +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) @@ -43,7 +54,7 @@ ############################################################################## # API tracers -@@ -374,6 +382,8 @@ +@@ -374,6 +388,8 @@ ############################################################################## # API retracers @@ -52,7 +63,7 @@ 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 @@ +@@ -386,11 +402,15 @@ DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) @@ -68,7 +79,7 @@ add_executable (glretrace glretrace_gl.cpp glretrace_cgl.cpp -@@ -438,6 +452,7 @@ +@@ -438,6 +458,7 @@ add_subdirectory(gui) endif () |