From a205852ef3de9fc74032308a731cdb1bc6e57acb Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Fri, 5 Jul 2024 23:45:27 -0500 Subject: [PATCH 01/30] add-tracy --- anda/misc/tracy/anda.hcl | 5 +++ anda/misc/tracy/tracy.spec | 68 +++++++++++++++++++++++++++++++++++++ anda/misc/tracy/update.rhai | 0 3 files changed, 73 insertions(+) create mode 100644 anda/misc/tracy/anda.hcl create mode 100644 anda/misc/tracy/tracy.spec create mode 100644 anda/misc/tracy/update.rhai diff --git a/anda/misc/tracy/anda.hcl b/anda/misc/tracy/anda.hcl new file mode 100644 index 0000000000..e5feed24c8 --- /dev/null +++ b/anda/misc/tracy/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "tracy.spec" + } +} \ No newline at end of file diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec new file mode 100644 index 0000000000..2b4bbb7999 --- /dev/null +++ b/anda/misc/tracy/tracy.spec @@ -0,0 +1,68 @@ +Name: tracy +Version: 0.10 +Release: 1%?dist +Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. +License: BSD-3-Clause +URL: https://github.com/wolfpld/tracy +Source0: https://github.com/wolfpld/tracy/refs/tags/%version.tar.gz +BuildRequires: cmake meson gcc libxkbcommon libglvnd pkgconfig(glfw) pkgconfig(freetype) pkgconfig(capstone) pkgconfig(dbus) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch + +%description +%A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. + +%prep +%autosetup -n tracy + +%build +%make_build -C capture/build/unix release +%make_build -C csvexport/build/unix release +%make_build -C import-chrome/build/unix release +%make_build -C library/unix release +%make_build -C profiler/build/unix release +%make_build -C update/build/unix release + +%install +mkdir -p %{buildroot}/usr/bin/ +install -m 755 Tracy-release %{buildroot}/usr/bin/Tracy-release + +%files +%config/tracy/. +%config/tracy/.. +%config/tracy/capture +%config/tracy/.clang-tidy +%config/tracy/cmake +%config/tracy/CMakeLists.txt +%config/tracy/Config.cmake.in +%config/tracy/csvexport +%config/tracy/doc +%config/tracy/dtl +%config/tracy/examples +%config/tracy/extra +%config/tracy/getopt +%config/tracy/.git +%config/tracy/.github +%config/tracy/.gitignore +%config/tracy/icon +%config/tracy/imgui +%config/tracy/import-chrome +%config/tracy/import-fuchsia +%config/tracy/library +%config/tracy/LICENSE +%config/tracy/manual +%config/tracy/meson.build +%config/tracy/meson.options +%config/tracy/NEWS +%config/tracy/nfd +%config/tracy/profiler +%config/tracy/public +%config/tracy/python +%config/tracy/README.md +%config/tracy/server +%config/tracy/test +%config/tracy/update +%config/tracy/.vscode +%config/tracy/zstd + +%changelog +%autochangelog diff --git a/anda/misc/tracy/update.rhai b/anda/misc/tracy/update.rhai new file mode 100644 index 0000000000..e69de29bb2 From 3dea2d11f47322a38c01685b983f1074c81c2b61 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:25:12 -0500 Subject: [PATCH 02/30] Update tracy.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 2b4bbb7999..2730b7da9c 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -4,7 +4,7 @@ Release: 1%?dist Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. License: BSD-3-Clause URL: https://github.com/wolfpld/tracy -Source0: https://github.com/wolfpld/tracy/refs/tags/%version.tar.gz +Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz BuildRequires: cmake meson gcc libxkbcommon libglvnd pkgconfig(glfw) pkgconfig(freetype) pkgconfig(capstone) pkgconfig(dbus) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch From 019e46fa6a7a1e9d7631af4f16dce797ab9e6b65 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:57:32 -0500 Subject: [PATCH 03/30] Update tracy.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 2730b7da9c..10884b37bf 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -12,7 +12,7 @@ Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d70 %A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. %prep -%autosetup -n tracy +%autosetup -n tracy-0.10 %build %make_build -C capture/build/unix release From 6268f489bd300d9c61d799c21f638613d56268c3 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Wed, 10 Jul 2024 23:48:20 -0500 Subject: [PATCH 04/30] update-add-tracy --- anda/misc/tracy/tracy.spec | 69 ++++++++++++++++++------------------- anda/misc/tracy/update.rhai | 1 + 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 10884b37bf..08b2831cae 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -27,42 +27,39 @@ mkdir -p %{buildroot}/usr/bin/ install -m 755 Tracy-release %{buildroot}/usr/bin/Tracy-release %files -%config/tracy/. -%config/tracy/.. -%config/tracy/capture -%config/tracy/.clang-tidy -%config/tracy/cmake -%config/tracy/CMakeLists.txt -%config/tracy/Config.cmake.in -%config/tracy/csvexport -%config/tracy/doc -%config/tracy/dtl -%config/tracy/examples -%config/tracy/extra -%config/tracy/getopt -%config/tracy/.git -%config/tracy/.github -%config/tracy/.gitignore -%config/tracy/icon -%config/tracy/imgui -%config/tracy/import-chrome -%config/tracy/import-fuchsia -%config/tracy/library -%config/tracy/LICENSE -%config/tracy/manual -%config/tracy/meson.build -%config/tracy/meson.options -%config/tracy/NEWS -%config/tracy/nfd -%config/tracy/profiler -%config/tracy/public -%config/tracy/python -%config/tracy/README.md -%config/tracy/server -%config/tracy/test -%config/tracy/update -%config/tracy/.vscode -%config/tracy/zstd + +%license LICENSE +%doc README.* +%{_datadir}/tracy/capture +%{_datadir}/tracy/cmake +%{_datadir}/tracy/CMakeLists.txt +%{_datadir}/tracy/Config.cmake.in +%{_datadir}/tracy/csvexport +%{_datadir}/tracy/doc +%{_datadir}/tracy/dtl +%{_datadir}/tracy/examples +%{_datadir}/tracy/extra +%{_datadir}/tracy/getopt +%{_datadir}/tracy/icon +%{_datadir}/tracy/imgui +%{_datadir}/tracy/import-chrome +%{_datadir}/tracy/import-fuchsia +%{_datadir}/tracy/library +%{_datadir}/tracy/manual +%{_datadir}/tracy/meson.build +%{_datadir}/tracy/meson.options +%{_datadir}/tracy/NEWS +%{_datadir}/tracy/nfd +%{_datadir}/tracy/profiler +%{_datadir}/tracy/public +%{_datadir}/tracy/python +%{_datadir}/tracy/server +%{_datadir}/tracy/test +%{_datadir}/tracy/update +%{_datadir}/tracy/zstd %changelog +* Thu Jul 10 2024 Owen Zimmerman +- Initial package. + %autochangelog diff --git a/anda/misc/tracy/update.rhai b/anda/misc/tracy/update.rhai index e69de29bb2..335ed1a232 100644 --- a/anda/misc/tracy/update.rhai +++ b/anda/misc/tracy/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("wolfpld/tracy")); \ No newline at end of file From ef2528995f399be77bb43462697cd86aff69eb2a Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Thu, 11 Jul 2024 00:34:24 -0500 Subject: [PATCH 05/30] build-test-fix --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 08b2831cae..9acc4d75cc 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -5,7 +5,7 @@ Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: cmake meson gcc libxkbcommon libglvnd pkgconfig(glfw) pkgconfig(freetype) pkgconfig(capstone) pkgconfig(dbus) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: cmake meson gcc libxkbcommon dbus-devel libglvnd pkgconfig(glfw) pkgconfig(freetype) pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description From 9fae33ed8718b39d4a5c72137e5d6d293731d847 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Thu, 11 Jul 2024 00:39:32 -0500 Subject: [PATCH 06/30] Build-fail-fix --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 9acc4d75cc..c52cc6e427 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -5,7 +5,7 @@ Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: cmake meson gcc libxkbcommon dbus-devel libglvnd pkgconfig(glfw) pkgconfig(freetype) pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: cmake meson gcc libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description From 63219d56ccefc7b38572303e7573d849b058fff3 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 11 Jul 2024 17:59:00 -0500 Subject: [PATCH 07/30] Update anda/misc/tracy/tracy.spec Co-authored-by: lea Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index c52cc6e427..b080b7d6fa 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -12,7 +12,7 @@ Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d70 %A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. %prep -%autosetup -n tracy-0.10 +%autosetup -n tracy-0.10 -p1 %build %make_build -C capture/build/unix release From 7dc8451c7f12f8042350980c32a780db08f70009 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Thu, 11 Jul 2024 18:18:11 -0500 Subject: [PATCH 08/30] test-fix-again --- anda/misc/tracy/tracy.spec | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index b080b7d6fa..74c684a4db 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -9,10 +9,10 @@ BuildRequires: cmake meson gcc libxkbcommon dbus-devel libglvnd glfw-devel free Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description -%A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. +A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. %prep -%autosetup -n tracy-0.10 -p1 +%autosetup %build %make_build -C capture/build/unix release @@ -30,36 +30,10 @@ install -m 755 Tracy-release %{buildroot}/usr/bin/Tracy-release %license LICENSE %doc README.* -%{_datadir}/tracy/capture -%{_datadir}/tracy/cmake -%{_datadir}/tracy/CMakeLists.txt -%{_datadir}/tracy/Config.cmake.in -%{_datadir}/tracy/csvexport -%{_datadir}/tracy/doc -%{_datadir}/tracy/dtl -%{_datadir}/tracy/examples -%{_datadir}/tracy/extra -%{_datadir}/tracy/getopt -%{_datadir}/tracy/icon -%{_datadir}/tracy/imgui -%{_datadir}/tracy/import-chrome -%{_datadir}/tracy/import-fuchsia -%{_datadir}/tracy/library -%{_datadir}/tracy/manual -%{_datadir}/tracy/meson.build -%{_datadir}/tracy/meson.options -%{_datadir}/tracy/NEWS -%{_datadir}/tracy/nfd -%{_datadir}/tracy/profiler -%{_datadir}/tracy/public -%{_datadir}/tracy/python -%{_datadir}/tracy/server -%{_datadir}/tracy/test -%{_datadir}/tracy/update -%{_datadir}/tracy/zstd +%{_datadir}/tracy %changelog * Thu Jul 10 2024 Owen Zimmerman - Initial package. -%autochangelog +%autosetup -n tracy-0.10 -p1 \ No newline at end of file From 0e36ad381e45fd06e0b7b8c113706a6d2670c6a6 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 00:24:40 +0800 Subject: [PATCH 09/30] tidy up stuff and use meson Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 74c684a4db..916b4bdac2 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -12,28 +12,16 @@ Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d70 A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. %prep -%autosetup +%autosetup -p1 %build -%make_build -C capture/build/unix release -%make_build -C csvexport/build/unix release -%make_build -C import-chrome/build/unix release -%make_build -C library/unix release -%make_build -C profiler/build/unix release -%make_build -C update/build/unix release +%meson +%meson_build %install -mkdir -p %{buildroot}/usr/bin/ -install -m 755 Tracy-release %{buildroot}/usr/bin/Tracy-release +%meson_install %files - %license LICENSE %doc README.* %{_datadir}/tracy - -%changelog -* Thu Jul 10 2024 Owen Zimmerman -- Initial package. - -%autosetup -n tracy-0.10 -p1 \ No newline at end of file From af45d8b2affc587f565d04f1286d2528fc15e339 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 14:53:16 +0800 Subject: [PATCH 10/30] add g++ Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 916b4bdac2..ee602385df 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -5,7 +5,7 @@ Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: cmake meson gcc libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: cmake meson gcc gcc-c++ libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description From 2fcaae2bdfa89107454fd484e8f472a96b2d1bef Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 14:55:58 +0800 Subject: [PATCH 11/30] dnl files Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index ee602385df..d3598a65fd 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -24,4 +24,4 @@ A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling %files %license LICENSE %doc README.* -%{_datadir}/tracy +%dnl %{_datadir}/tracy From 5ab2363d0a0e2254197b17b8244d5c846f036366 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 15:53:52 +0800 Subject: [PATCH 12/30] debug_package Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index d3598a65fd..0421cc1d24 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -1,3 +1,5 @@ +%define debug_package %nil + Name: tracy Version: 0.10 Release: 1%?dist @@ -24,4 +26,3 @@ A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling %files %license LICENSE %doc README.* -%dnl %{_datadir}/tracy From 6ed1edf7075f17dab397796708c916a47ab705cf Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 16:06:10 +0800 Subject: [PATCH 13/30] Update tracy.spec Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 53 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 0421cc1d24..e2111d3b4d 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -1,4 +1,4 @@ -%define debug_package %nil +%global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. Name: tracy Version: 0.10 @@ -11,18 +11,67 @@ BuildRequires: cmake meson gcc gcc-c++ libxkbcommon dbus-devel libglvnd glfw-de Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description -A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. +%_desc + + +%package devel +Summary: Development files for the tracy package + +%description devel +%_desc +This package contains the development files for the tracy package. + %prep %autosetup -p1 + %build %meson %meson_build +%make_build -C capture/build/unix release +%make_build -C csvexport/build/unix release +%make_build -C import-chrome/build/unix release +%make_build -C library/unix release +%make_build -C profiler/build/unix release +%make_build -C update/build/unix release + %install %meson_install +install -Dm755 capture/build/unix/capture-release %buildroot%_bindir/tracy-capture +install -Dm755 csvexport/build/unix/csvexport-release %buildroot%_bindir/tracy-csvexport +install -Dm755 import-chrome/build/unix/import-chrome-release %buildroot%_bindir/tracy-import-chrome +install -Dm755 library/unix/libtracy-release.so %buildroot%_libdir/libtracy.so +install -Dm755 profiler/build/unix/Tracy-release %buildroot%_bindir/tracy +install -Dm755 update/build/unix/update-release %buildroot%_bindir/tracy-update + +install -Dm644 extra/desktop/tracy.desktop %buildroot%_datadir/applications/tracy.desktop +install -Dm644 icon/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/tracy.svg +install -Dm644 extra/desktop/application-tracy.xml %buildroot%_datadir/mime/packages/application-tracy.xml +install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/apps/application-tracy.svg + + %files %license LICENSE %doc README.* +%_bindir/tracy +%_bindir/tracy-capture +%_bindir/tracy-csvexport +%_bindir/tracy-import-chrome +%_bindir/tracy-update +%_libdir/libtracy.so +%_datadir/applications/tracy.desktop +%_datadir/mime/packages/application-tracy.xml +%_iconsdir/hicolor/scalable/apps/tracy.svg +%_iconsdir/hicolor/scalable/apps/application-tracy.svg + + +%files devel +%_includedir/Tracy* +%_includedir/client/Tracy* +%_includedir/client/tracy* +%_includedir/common/Tracy* +%_includedir/common/tracy* +%_libdir/libtracy.a From 9eb59653e125a3ab8e309dac1677f00b6c04af7a Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 16:12:00 +0800 Subject: [PATCH 14/30] -fPIE Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index e2111d3b4d..58131848eb 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -27,6 +27,7 @@ This package contains the development files for the tracy package. %build +export CFLAGS="$CFLAGS -fPIE" %meson %meson_build %make_build -C capture/build/unix release From 6cf098ae97e1fdaceff7e615844a3dc8bdbab71f Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 16:18:40 +0800 Subject: [PATCH 15/30] CXXFLAGS Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 58131848eb..36b7befc33 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -28,6 +28,7 @@ This package contains the development files for the tracy package. %build export CFLAGS="$CFLAGS -fPIE" +export CXXFLAGS="$CFLAGS -fPIE" %meson %meson_build %make_build -C capture/build/unix release From bf8d6bdfb22ecc0ea93b519bd6a25403204fa1fe Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 17:17:45 +0800 Subject: [PATCH 16/30] CXX? Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 36b7befc33..a9735ec449 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -27,8 +27,7 @@ This package contains the development files for the tracy package. %build -export CFLAGS="$CFLAGS -fPIE" -export CXXFLAGS="$CFLAGS -fPIE" +export CXX='g++ -fPIE' %meson %meson_build %make_build -C capture/build/unix release From 379f3b0526c22b0783efa424e359e7492184fdbf Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 20:56:38 +0800 Subject: [PATCH 17/30] /usr/include/freetype2/ Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index a9735ec449..6450210c7e 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -27,7 +27,7 @@ This package contains the development files for the tracy package. %build -export CXX='g++ -fPIE' +export CXX='g++ -fPIE -I/usr/include/freetype2/' %meson %meson_build %make_build -C capture/build/unix release From 14115ebe1a848f22b9b1c66eca3c18bc7bca3be9 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 22:20:18 +0800 Subject: [PATCH 18/30] Update tracy.spec Signed-off-by: madomado --- anda/misc/tracy/tracy.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index 6450210c7e..e12be9e9fa 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -8,6 +8,7 @@ License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz BuildRequires: cmake meson gcc gcc-c++ libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: wayland-devel Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description From eb957c8c89fc04696f5a85fc328bd8f18a2e1705 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 20 Jul 2024 23:20:07 +0800 Subject: [PATCH 19/30] move stuff around and funny funky fix --- anda/{misc => devs}/tracy/anda.hcl | 0 anda/{misc => devs}/tracy/tracy.spec | 8 ++++++-- anda/{misc => devs}/tracy/update.rhai | 0 3 files changed, 6 insertions(+), 2 deletions(-) rename anda/{misc => devs}/tracy/anda.hcl (100%) rename anda/{misc => devs}/tracy/tracy.spec (88%) rename anda/{misc => devs}/tracy/update.rhai (100%) diff --git a/anda/misc/tracy/anda.hcl b/anda/devs/tracy/anda.hcl similarity index 100% rename from anda/misc/tracy/anda.hcl rename to anda/devs/tracy/anda.hcl diff --git a/anda/misc/tracy/tracy.spec b/anda/devs/tracy/tracy.spec similarity index 88% rename from anda/misc/tracy/tracy.spec rename to anda/devs/tracy/tracy.spec index e12be9e9fa..30218ce717 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -1,4 +1,5 @@ %global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. +%define debug_package %nil Name: tracy Version: 0.10 @@ -7,8 +8,10 @@ Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: cmake meson gcc gcc-c++ libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) BuildRequires: wayland-devel +BuildRequires: capstone-devel +BuildRequires: cmake meson gcc gcc-c++ mold Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description @@ -28,7 +31,8 @@ This package contains the development files for the tracy package. %build -export CXX='g++ -fPIE -I/usr/include/freetype2/' +export CXX="g++ -fPIE -I/usr/include/freetype2/ $CXXFLAGS" +export LD="mold $LDFLAGS" %meson %meson_build %make_build -C capture/build/unix release diff --git a/anda/misc/tracy/update.rhai b/anda/devs/tracy/update.rhai similarity index 100% rename from anda/misc/tracy/update.rhai rename to anda/devs/tracy/update.rhai From 10ab0fd51af9619f1132e2490532b84b66958479 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 20 Jul 2024 23:21:56 +0800 Subject: [PATCH 20/30] casually add changelog --- anda/devs/tracy/tracy.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 30218ce717..2e8c2e7071 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -81,3 +81,7 @@ install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/ %_includedir/common/Tracy* %_includedir/common/tracy* %_libdir/libtracy.a + +%changelog +* Wed Jul 10 2024 Owen Zimmerman - 0.10-1 +- Initial package. From e6cf0065b0088fb45267426593388cb1b990a901 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 21 Jul 2024 16:58:18 +0800 Subject: [PATCH 21/30] ??] Signed-off-by: madomado --- anda/devs/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 2e8c2e7071..945bbc1c57 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -31,7 +31,7 @@ This package contains the development files for the tracy package. %build -export CXX="g++ -fPIE -I/usr/include/freetype2/ $CXXFLAGS" +export CXX="g++ -fPIE -I/usr/include/freetype2/ -I/usr/include/capstone/ $CXXFLAGS" export LD="mold $LDFLAGS" %meson %meson_build From 87b1b284aec8b48fb9c239196282d63d8f48058f Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 23 Jul 2024 23:08:19 +0800 Subject: [PATCH 22/30] fix pkg-config cflags maybe? Signed-off-by: madomado --- anda/devs/tracy/tracy.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 945bbc1c57..960bf61a7a 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -31,8 +31,12 @@ This package contains the development files for the tracy package. %build -export CXX="g++ -fPIE -I/usr/include/freetype2/ -I/usr/include/capstone/ $CXXFLAGS" -export LD="mold $LDFLAGS" +for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --cflags-only-I $lib >> cflags;done +for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --libs $lib >> lflags;done +cflags=$(cat cflags | tr -s '\n' | tr '\n' ' ') +lflags=$(cat lflags | tr -s '\n' | tr '\n' ' ') +export CXX="g++ -fuse-ld=mold -fPIE $CXXFLAGS $cflags" +export LD="mold $LDFLAGS $lflags" %meson %meson_build %make_build -C capture/build/unix release From c1986b75d2eb882a0995e4467b600040a334c760 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 23 Jul 2024 23:27:01 +0800 Subject: [PATCH 23/30] Update tracy.spec Signed-off-by: madomado --- anda/devs/tracy/tracy.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 960bf61a7a..f09ca3442b 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -8,9 +8,10 @@ Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: libxkbcommon dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) BuildRequires: wayland-devel BuildRequires: capstone-devel +BuildRequires: libxkbcommon-devel BuildRequires: cmake meson gcc gcc-c++ mold Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch @@ -35,17 +36,20 @@ for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --cflags-o for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --libs $lib >> lflags;done cflags=$(cat cflags | tr -s '\n' | tr '\n' ' ') lflags=$(cat lflags | tr -s '\n' | tr '\n' ' ') +export CC="gcc -fuse-ld=mold" export CXX="g++ -fuse-ld=mold -fPIE $CXXFLAGS $cflags" export LD="mold $LDFLAGS $lflags" +export CFLAGS="$CFLAGS -fuse-ld=mold" +export CXXFLAGS="$CXXFLAGS -fuse-ld=mold" %meson %meson_build -%make_build -C capture/build/unix release -%make_build -C csvexport/build/unix release -%make_build -C import-chrome/build/unix release -%make_build -C library/unix release -%make_build -C profiler/build/unix release -%make_build -C update/build/unix release - +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C capture/build/unix release & +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C csvexport/build/unix release & +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C import-chrome/build/unix release & +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C library/unix release & +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C profiler/build/unix release & +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C update/build/unix release & +wait %install %meson_install From 9ac2876fc7e9b94771945c5fe5f70c9506b81e35 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 23 Jul 2024 23:33:56 +0800 Subject: [PATCH 24/30] fix PIE/PIC? Signed-off-by: madomado --- anda/devs/tracy/tracy.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index f09ca3442b..6ab9726704 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -37,18 +37,18 @@ for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --libs $li cflags=$(cat cflags | tr -s '\n' | tr '\n' ' ') lflags=$(cat lflags | tr -s '\n' | tr '\n' ' ') export CC="gcc -fuse-ld=mold" -export CXX="g++ -fuse-ld=mold -fPIE $CXXFLAGS $cflags" +export CXX="g++ -fuse-ld=mold $CXXFLAGS $cflags" export LD="mold $LDFLAGS $lflags" export CFLAGS="$CFLAGS -fuse-ld=mold" export CXXFLAGS="$CXXFLAGS -fuse-ld=mold" %meson %meson_build -%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C capture/build/unix release & -%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C csvexport/build/unix release & -%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C import-chrome/build/unix release & -%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C library/unix release & -%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C profiler/build/unix release & -%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -C update/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C capture/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C csvexport/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C import-chrome/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" -C library/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C profiler/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C update/build/unix release & wait %install From 4336430e85bf1e81ce55c739f55c99197a0062bd Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Wed, 24 Jul 2024 18:47:48 -0500 Subject: [PATCH 25/30] Update version --- anda/misc/tracy/tracy.spec | 95 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 anda/misc/tracy/tracy.spec diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec new file mode 100644 index 0000000000..badc30b9cf --- /dev/null +++ b/anda/misc/tracy/tracy.spec @@ -0,0 +1,95 @@ +%global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. +%define debug_package %nil + +Name: tracy +Version: 0.11 +Release: 1%?dist +Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. +License: BSD-3-Clause +URL: https://github.com/wolfpld/tracy +Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz +BuildRequires: dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) +BuildRequires: wayland-devel +BuildRequires: capstone-devel +BuildRequires: libxkbcommon-devel +BuildRequires: cmake meson gcc gcc-c++ mold +Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch + +%description +%_desc + + +%package devel +Summary: Development files for the tracy package + +%description devel +%_desc +This package contains the development files for the tracy package. + + +%prep +%autosetup -p1 + + +%build +for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --cflags-only-I $lib >> cflags;done +for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --libs $lib >> lflags;done +cflags=$(cat cflags | tr -s '\n' | tr '\n' ' ') +lflags=$(cat lflags | tr -s '\n' | tr '\n' ' ') +export CC="gcc -fuse-ld=mold" +export CXX="g++ -fuse-ld=mold $CXXFLAGS $cflags" +export LD="mold $LDFLAGS $lflags" +export CFLAGS="$CFLAGS -fuse-ld=mold" +export CXXFLAGS="$CXXFLAGS -fuse-ld=mold" +%meson +%meson_build +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C capture/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C csvexport/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C import-chrome/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" -C library/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C profiler/build/unix release & +%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C update/build/unix release & +wait + +%install +%meson_install + +install -Dm755 capture/build/unix/capture-release %buildroot%_bindir/tracy-capture +install -Dm755 csvexport/build/unix/csvexport-release %buildroot%_bindir/tracy-csvexport +install -Dm755 import-chrome/build/unix/import-chrome-release %buildroot%_bindir/tracy-import-chrome +install -Dm755 library/unix/libtracy-release.so %buildroot%_libdir/libtracy.so +install -Dm755 profiler/build/unix/Tracy-release %buildroot%_bindir/tracy +install -Dm755 update/build/unix/update-release %buildroot%_bindir/tracy-update + +install -Dm644 extra/desktop/tracy.desktop %buildroot%_datadir/applications/tracy.desktop +install -Dm644 icon/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/tracy.svg +install -Dm644 extra/desktop/application-tracy.xml %buildroot%_datadir/mime/packages/application-tracy.xml +install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/apps/application-tracy.svg + + +%files +%license LICENSE +%doc README.* +%_bindir/tracy +%_bindir/tracy-capture +%_bindir/tracy-csvexport +%_bindir/tracy-import-chrome +%_bindir/tracy-update +%_libdir/libtracy.so +%_datadir/applications/tracy.desktop +%_datadir/mime/packages/application-tracy.xml +%_iconsdir/hicolor/scalable/apps/tracy.svg +%_iconsdir/hicolor/scalable/apps/application-tracy.svg + + +%files devel +%_includedir/Tracy* +%_includedir/client/Tracy* +%_includedir/client/tracy* +%_includedir/common/Tracy* +%_includedir/common/tracy* +%_libdir/libtracy.a + +%changelog +* Wed Jul 24 2024 Owen Zimmerman - 0.10-1 +- Initial package. \ No newline at end of file From 45b351dfefacc04b16bbd2b3d2180cecbdb8806c Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:49:58 -0500 Subject: [PATCH 26/30] Update tracy version Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/devs/tracy/tracy.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 6ab9726704..4aa7e9f666 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -2,7 +2,7 @@ %define debug_package %nil Name: tracy -Version: 0.10 +Version: 0.11 Release: 1%?dist Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. License: BSD-3-Clause @@ -91,5 +91,5 @@ install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/ %_libdir/libtracy.a %changelog -* Wed Jul 10 2024 Owen Zimmerman - 0.10-1 +* Wed Jul 24 2024 Owen Zimmerman - 0.11-1 - Initial package. From c7f5cdfb4ee0cbad5cf216642fc8c94bcad40c47 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Wed, 24 Jul 2024 19:22:17 -0500 Subject: [PATCH 27/30] Update tracy.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/devs/tracy/tracy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 4aa7e9f666..6857d22b4c 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -2,7 +2,7 @@ %define debug_package %nil Name: tracy -Version: 0.11 +Version: 0.11.0 Release: 1%?dist Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. License: BSD-3-Clause From a060284553a8e8ed506b66f8fef37f9dbcf074fb Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 24 Jul 2024 17:43:08 -0700 Subject: [PATCH 28/30] remove patch --- anda/misc/tracy/tracy.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec index badc30b9cf..f643b3f593 100644 --- a/anda/misc/tracy/tracy.spec +++ b/anda/misc/tracy/tracy.spec @@ -13,7 +13,6 @@ BuildRequires: wayland-devel BuildRequires: capstone-devel BuildRequires: libxkbcommon-devel BuildRequires: cmake meson gcc gcc-c++ mold -Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch %description %_desc From fa45fa6b5c4fe525288c25a63bcea130985df24e Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Thu, 25 Jul 2024 18:36:02 -0700 Subject: [PATCH 29/30] fix it --- anda/devs/tracy/tracy.spec | 62 ++++++++++++++------------------------ 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 6857d22b4c..85d6005b0a 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -1,5 +1,4 @@ %global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. -%define debug_package %nil Name: tracy Version: 0.11.0 @@ -8,17 +7,12 @@ Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and License: BSD-3-Clause URL: https://github.com/wolfpld/tracy Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) -BuildRequires: wayland-devel -BuildRequires: capstone-devel -BuildRequires: libxkbcommon-devel -BuildRequires: cmake meson gcc gcc-c++ mold -Patch: https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a.patch +BuildRequires: pkgconfig(egl) pkgconfig(glfw3) pkgconfig(freetype2) pkgconfig(dbus-1) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) pkgconfig(wayland-client) pkgconfig(wayland-protocols) pkgconfig(xkbcommon) pkgconfig(capstone) +BuildRequires: cmake gcc gcc-c++ meson %description %_desc - %package devel Summary: Development files for the tracy package @@ -26,47 +20,37 @@ Summary: Development files for the tracy package %_desc This package contains the development files for the tracy package. - %prep %autosetup -p1 - %build -for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --cflags-only-I $lib >> cflags;done -for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --libs $lib >> lflags;done -cflags=$(cat cflags | tr -s '\n' | tr '\n' ' ') -lflags=$(cat lflags | tr -s '\n' | tr '\n' ' ') -export CC="gcc -fuse-ld=mold" -export CXX="g++ -fuse-ld=mold $CXXFLAGS $cflags" -export LD="mold $LDFLAGS $lflags" -export CFLAGS="$CFLAGS -fuse-ld=mold" -export CXXFLAGS="$CXXFLAGS -fuse-ld=mold" %meson %meson_build -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C capture/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C csvexport/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C import-chrome/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" -C library/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C profiler/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C update/build/unix release & -wait + +for project in capture csvexport import-chrome import-fuchsia update profiler +do + pushd $project + %cmake -DDOWNLOAD_CAPSTONE=0 + %cmake_build + popd +done %install %meson_install -install -Dm755 capture/build/unix/capture-release %buildroot%_bindir/tracy-capture -install -Dm755 csvexport/build/unix/csvexport-release %buildroot%_bindir/tracy-csvexport -install -Dm755 import-chrome/build/unix/import-chrome-release %buildroot%_bindir/tracy-import-chrome -install -Dm755 library/unix/libtracy-release.so %buildroot%_libdir/libtracy.so -install -Dm755 profiler/build/unix/Tracy-release %buildroot%_bindir/tracy -install -Dm755 update/build/unix/update-release %buildroot%_bindir/tracy-update +# NOTE: the subprojects don't have install targets so we do it manually +install -Dm755 capture/%__cmake_builddir/tracy-capture %buildroot%_bindir/tracy-capture +install -Dm755 csvexport/%__cmake_builddir/tracy-csvexport %buildroot%_bindir/tracy-csvexport +install -Dm755 import-chrome/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome +install -Dm755 import-fuchsia/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia +install -Dm755 update/%__cmake_builddir/tracy-update %buildroot%_bindir/tracy-update +install -Dm755 profiler/%__cmake_builddir/tracy-profiler %buildroot%_bindir/tracy install -Dm644 extra/desktop/tracy.desktop %buildroot%_datadir/applications/tracy.desktop install -Dm644 icon/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/tracy.svg install -Dm644 extra/desktop/application-tracy.xml %buildroot%_datadir/mime/packages/application-tracy.xml install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/apps/application-tracy.svg - %files %license LICENSE %doc README.* @@ -74,6 +58,7 @@ install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/ %_bindir/tracy-capture %_bindir/tracy-csvexport %_bindir/tracy-import-chrome +%_bindir/tracy-import-fuchsia %_bindir/tracy-update %_libdir/libtracy.so %_datadir/applications/tracy.desktop @@ -81,14 +66,11 @@ install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/ %_iconsdir/hicolor/scalable/apps/tracy.svg %_iconsdir/hicolor/scalable/apps/application-tracy.svg - %files devel -%_includedir/Tracy* -%_includedir/client/Tracy* -%_includedir/client/tracy* -%_includedir/common/Tracy* -%_includedir/common/tracy* -%_libdir/libtracy.a +%_libdir/pkgconfig/tracy.pc +%_includedir/common +%_includedir/tracy +%_includedir/client %changelog * Wed Jul 24 2024 Owen Zimmerman - 0.11-1 From d736521c017a81c1a74861c57274254a5407c0cf Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Thu, 25 Jul 2024 18:49:10 -0700 Subject: [PATCH 30/30] a? --- anda/misc/tracy/tracy.spec | 94 -------------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 anda/misc/tracy/tracy.spec diff --git a/anda/misc/tracy/tracy.spec b/anda/misc/tracy/tracy.spec deleted file mode 100644 index f643b3f593..0000000000 --- a/anda/misc/tracy/tracy.spec +++ /dev/null @@ -1,94 +0,0 @@ -%global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. -%define debug_package %nil - -Name: tracy -Version: 0.11 -Release: 1%?dist -Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. -License: BSD-3-Clause -URL: https://github.com/wolfpld/tracy -Source0: https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz -BuildRequires: dbus-devel libglvnd glfw-devel freetype-devel pkgconfig(capstone) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) -BuildRequires: wayland-devel -BuildRequires: capstone-devel -BuildRequires: libxkbcommon-devel -BuildRequires: cmake meson gcc gcc-c++ mold - -%description -%_desc - - -%package devel -Summary: Development files for the tracy package - -%description devel -%_desc -This package contains the development files for the tracy package. - - -%prep -%autosetup -p1 - - -%build -for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --cflags-only-I $lib >> cflags;done -for lib in `pkg-config --list-all | sed -E 's/ .+$//'`; do pkg-config --libs $lib >> lflags;done -cflags=$(cat cflags | tr -s '\n' | tr '\n' ' ') -lflags=$(cat lflags | tr -s '\n' | tr '\n' ' ') -export CC="gcc -fuse-ld=mold" -export CXX="g++ -fuse-ld=mold $CXXFLAGS $cflags" -export LD="mold $LDFLAGS $lflags" -export CFLAGS="$CFLAGS -fuse-ld=mold" -export CXXFLAGS="$CXXFLAGS -fuse-ld=mold" -%meson -%meson_build -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C capture/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C csvexport/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C import-chrome/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" -C library/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C profiler/build/unix release & -%make_build CFLAGS="$CFLAGS -fPIE" CXXFLAGS="$CXXFLAGS -fPIE" -C update/build/unix release & -wait - -%install -%meson_install - -install -Dm755 capture/build/unix/capture-release %buildroot%_bindir/tracy-capture -install -Dm755 csvexport/build/unix/csvexport-release %buildroot%_bindir/tracy-csvexport -install -Dm755 import-chrome/build/unix/import-chrome-release %buildroot%_bindir/tracy-import-chrome -install -Dm755 library/unix/libtracy-release.so %buildroot%_libdir/libtracy.so -install -Dm755 profiler/build/unix/Tracy-release %buildroot%_bindir/tracy -install -Dm755 update/build/unix/update-release %buildroot%_bindir/tracy-update - -install -Dm644 extra/desktop/tracy.desktop %buildroot%_datadir/applications/tracy.desktop -install -Dm644 icon/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/tracy.svg -install -Dm644 extra/desktop/application-tracy.xml %buildroot%_datadir/mime/packages/application-tracy.xml -install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/apps/application-tracy.svg - - -%files -%license LICENSE -%doc README.* -%_bindir/tracy -%_bindir/tracy-capture -%_bindir/tracy-csvexport -%_bindir/tracy-import-chrome -%_bindir/tracy-update -%_libdir/libtracy.so -%_datadir/applications/tracy.desktop -%_datadir/mime/packages/application-tracy.xml -%_iconsdir/hicolor/scalable/apps/tracy.svg -%_iconsdir/hicolor/scalable/apps/application-tracy.svg - - -%files devel -%_includedir/Tracy* -%_includedir/client/Tracy* -%_includedir/client/tracy* -%_includedir/common/Tracy* -%_includedir/common/tracy* -%_libdir/libtracy.a - -%changelog -* Wed Jul 24 2024 Owen Zimmerman - 0.10-1 -- Initial package. \ No newline at end of file