Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/kernelshark
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/kernelshark')
-rw-r--r--dev-util/kernelshark/Manifest4
-rw-r--r--dev-util/kernelshark/files/kernelshark-1.2-build.patch39
-rw-r--r--dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch9
-rw-r--r--dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch11
-rw-r--r--dev-util/kernelshark/kernelshark-2.2.0.ebuild (renamed from dev-util/kernelshark/kernelshark-2.1.0.ebuild)9
-rw-r--r--dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild (renamed from dev-util/kernelshark/kernelshark-1.2.ebuild)28
-rw-r--r--dev-util/kernelshark/metadata.xml4
7 files changed, 26 insertions, 78 deletions
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 86ed6e3b7693..f3b6bab4411a 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,2 +1,2 @@
-DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
-DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381 SHA512 4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e
+DIST kernelshark-2.2.0.tar.gz 4100601 BLAKE2B e68275b91a5a629a868e95c9b5f807c46e445e9d6e131093eb38b5a350af47dec5da9d4ec24a4b60a90ac6b3c70438236f6cd7d80fabccf420bae1603fc13338 SHA512 a2d2d2c9494189322ddb45eabe3aded8db9c72eca3d5afefc8d97b4b5011e9f93a3324aeabe19bc1917c3dbf67c75dcefbda831a2e82722bde5599f01e88c047
+DIST kernelshark-2.2.1.tar.gz 4100400 BLAKE2B a11e61660cbf98bbbb7c5060014b4de8e05f6957f2eb5519c3a109d91e5297a4532af3c958471ab181ddc8cbb061d1a493b3f40b71efb3abe3d47640a4ab87cc SHA512 1e0b17de02b82a20f6f78ebbfe61c63550947c3275e1262ae6edfd4675f7d1f976955ed37b14f2a214675a83e43135e605c244b4a5f920ebcdeaabcda7510d10
diff --git a/dev-util/kernelshark/files/kernelshark-1.2-build.patch b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
deleted file mode 100644
index c7fcd0d8d33f..000000000000
--- a/dev-util/kernelshark/files/kernelshark-1.2-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,11 +67,11 @@ set(KS_LOGO_LABEL KS_logo_horizontal.svg)
-
- set(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/")
-
--if (CMAKE_BUILD_TYPE MATCHES Package)
-+if (NOT CMAKE_BUILD_TYPE MATCHES Package)
-
- set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-
--else (CMAKE_BUILD_TYPE MATCHES Package)
-+else (CMAKE_BUILD_TYPE MATCHES Gentoo)
-
- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
---- a/build/FindTraceCmd.cmake
-+++ b/build/FindTraceCmd.cmake
-@@ -38,17 +38,17 @@ find_path(TRACEFS_INCLUDE_DIR NAMES tracefs/tracefs.h
- ${CMAKE_SOURCE_DIR}/../include/
- NO_DEFAULT_PATH)
-
--find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.a
-+find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so
- PATHS $ENV{TRACE_CMD}/lib/
- ${CMAKE_SOURCE_DIR}/../lib/
- NO_DEFAULT_PATH)
-
--find_library(TRACEFS_LIBRARY NAMES tracefs/libtracefs.a
-+find_library(TRACEFS_LIBRARY NAMES tracefs/libtracefs.so
- PATHS $ENV{TRACE_CMD}/lib/
- ${CMAKE_SOURCE_DIR}/../lib/
- NO_DEFAULT_PATH)
-
--find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.a
-+find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.so
- PATHS $ENV{TRACE_CMD}/lib/
- ${CMAKE_SOURCE_DIR}/../lib/
- NO_DEFAULT_PATH)
diff --git a/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
deleted file mode 100644
index 5f469b199547..000000000000
--- a/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/build/ks.desktop.cmake
-+++ b/build/ks.desktop.cmake
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=@KS_VERSION_STRING@
-+Version=1.2
- Type=Application
- Name=Kernel Shark
- GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
deleted file mode 100644
index a6a93be0ea0d..000000000000
--- a/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/build/ks.desktop.cmake b/build/ks.desktop.cmake
-index 2b02c0d..9765e61 100644
---- a/build/ks.desktop.cmake
-+++ b/build/ks.desktop.cmake
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=@KS_VERSION_STRING@
-+Version=1.0
- Type=Application
- Name=Kernel Shark
- GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/kernelshark-2.1.0.ebuild b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
index ddf6b441a088..b90ab79d56d5 100644
--- a/dev-util/kernelshark/kernelshark-2.1.0.ebuild
+++ b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic cmake
@@ -41,12 +41,11 @@ RDEPEND="${DEPEND}"
BDEPEND="
doc? (
media-gfx/graphviz
- app-doc/doxygen
+ app-text/doxygen
)"
PATCHES=(
- "${FILESDIR}"/${P}-no-ldconfig.patch
- "${FILESDIR}"/${P}-fix-desktop-version.patch
+ "${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
)
src_configure() {
diff --git a/dev-util/kernelshark/kernelshark-1.2.ebuild b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
index f3406107a78a..130c9a4d430f 100644
--- a/dev-util/kernelshark/kernelshark-1.2.ebuild
+++ b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic cmake
@@ -9,15 +9,15 @@ DESCRIPTION="Graphical reader for trace-cmd output"
HOMEPAGE="https://kernelshark.org/"
if [[ ${PV} =~ [9]{4,} ]]; then
- EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
inherit git-r3
S="${WORKDIR}/${P}/kernel-shark"
else
- MY_P="${PN}-v${PV}"
- SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
+ MY_P="kernel-shark-${PN}-v${PV}"
+ SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
+ S="${WORKDIR}/${MY_P}"
fi
LICENSE="GPL-2 LGPL-2.1"
@@ -25,30 +25,34 @@ SLOT="0"
IUSE="custom-optimization doc"
DEPEND="
- >=dev-util/trace-cmd-2.8.3:=
+ || ( >=dev-libs/libtracecmd-1.1.2 <dev-util/trace-cmd-3.2 )
dev-libs/json-c:=
dev-qt/qtcore:5=
dev-qt/qtnetwork:5=
dev-qt/qtwidgets:5=
+ dev-util/trace-cmd
>=media-libs/freeglut-3.0.0:=
x11-libs/libXmu:=
- x11-libs/libXi:="
+ x11-libs/libXi:=
+ >=dev-libs/libtracefs-1.3
+ >=dev-libs/libtraceevent-1.5
+ media-fonts/freefont
+"
RDEPEND="${DEPEND}"
BDEPEND="
doc? (
media-gfx/graphviz
- app-doc/doxygen
+ app-text/doxygen
)"
PATCHES=(
- "${FILESDIR}"/${P}-build.patch
- "${FILESDIR}"/${P}-desktop-version.patch
+ "${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
)
src_configure() {
local mycmakeargs=(
-D_INSTALL_PREFIX="${EPREFIX}/usr"
- -DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
+ -D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-D_DOXYGEN_DOC=$(usex doc)
)
use custom-optimization || replace-flags -O? -O3
diff --git a/dev-util/kernelshark/metadata.xml b/dev-util/kernelshark/metadata.xml
index f80ada075e51..ccfdd585f7b6 100644
--- a/dev-util/kernelshark/metadata.xml
+++ b/dev-util/kernelshark/metadata.xml
@@ -5,6 +5,10 @@
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
<use>
<flag name="custom-optimization">Build with user-specified compiler optimizations
(-Os, -O0, -O1, -O2, -O3) from CFLAGS</flag>