haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

tenacity, build fix for finding gkt headers (#9910)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-12-21 15:59:15 +01:00
committed by GitHub
parent 1359941078
commit a214b26545
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
media-sound/tenacity/patches/tenacity-1.3.3.patchset
View File

@@ -1,11 +1,11 @@
From 1970ffb3f2d6bbc0d1db7fae9721215bc33dc317 Mon Sep 17 00:00:00 2001
From 603952650ec17f813d6ca9a19b6f38b42e8aeb16 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Fix GTK include paths and libs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e04a36..0864d15 100644
index 52c1f4c..3819ebc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -741,6 +741,11 @@ if(NOT TARGET wxWidgets::wxWidgets)
@@ -21,10 +21,10 @@ index 9e04a36..0864d15 100644
add_subdirectory(lib-src/libnyquist)
--
2.37.3
2.42.1
From 33e615e157ff52ef377ba40b1d8859bdf89b58a9 Mon Sep 17 00:00:00 2001
From aefb4c0284f7e63b4fef7bbd25e2126e0a8d40f1 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Haiku: initialize XDG vars
@@ -90,10 +90,10 @@ index 1115e69..2091e3c 100644
}
--
2.37.3
2.42.1
From 24843896a4d91f86ca3e060638c16d91bf6be4ff Mon Sep 17 00:00:00 2001
From f74fdad814cda884730ebf30983877587ade2050 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Release sLocale smart pointer before exit. Fixes crash on exit.
@@ -145,10 +145,10 @@ index 2091e3c..79eddc5 100644
#else
--
2.37.3
2.42.1
From c85a1a2e9b144b1caf18649d32f11d4b28586b71 Mon Sep 17 00:00:00 2001
From 80797a9fc3ed1f0b153dbc72c0f8efe11f7b3aaf Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 31 Jul 2023 18:15:17 +0200
Subject: Haiku: use CLOCK_MONOTONIC
@@ -171,10 +171,10 @@ index a37d6aa..d8db382 100644
return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime;
}
--
2.37.3
2.42.1
From 26c5759b80ca38797a5b2c1f23b6ffc0951a1d5f Mon Sep 17 00:00:00 2001
From d9ca725e630f1c726256c7e64e499a7a1524cecf Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 31 Jul 2023 18:29:04 +0200
Subject: Use POSIX shared memory
@@ -270,10 +270,10 @@ index 79eddc5..4cdf189 100644
// to terminate.
return false;
--
2.37.3
2.42.1
From 30dfb0305a25e1c72c5af2b6b4717964452f3982 Mon Sep 17 00:00:00 2001
From 8c387344d2cf7420f0bc259ac24e782b156a3371 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 31 Jul 2023 18:55:31 +0200
Subject: Haiku: replace references to topdir
@@ -297,5 +297,28 @@ index 603664e..4c66bc0 100644
else()
install( TARGETS ${TARGET} RUNTIME )
--
2.37.3
2.42.1
From 6d96e7644e0b43366198b0473bafbcbbadc89b5d Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 13 Dec 2023 11:36:46 +0100
Subject: Build fix (check for gtk headers)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c66bc0..4f60203 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1087,7 +1087,7 @@ list( APPEND LIBRARIES
$<$<BOOL:${USE_SOUNDTOUCH}>:SoundTouch::SoundTouch>
$<$<BOOL:${USE_VAMP}>:VampHostSDK::VampHostSDK>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:${GLIB_LIBRARIES}>
- $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:GTK::GTK>
+ $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN,Haiku>:GTK::GTK>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:pthread>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:rt>
)
--
2.42.1