mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
b5f0e02f11
* fs_uae_launcher: Better Haiku-friendly binary search When updating fs-uae to 3.1.66, fs-uae-launcher was unable to find the fs-uae binary when the launcher was launched from the Deskbar. This changes the binary search code for Haiku to always look in the same direcctory where fs-uae-launcher is to be installed. * fs_uae: Update to 3.1.66 In order to get --with-glew to work, I had to manually add all of the C flags and linker options via env variables. glew.pc eventually tries to include gl.pc which doesn't exist. However, it seems that I only need to provide -Lgl and the program should work correctly (and it does). * Indent recpies using tabs
90 lines
2.5 KiB
Plaintext
90 lines
2.5 KiB
Plaintext
From 04e5052445068b4684cd3a2cbc1836c590f4bc4b Mon Sep 17 00:00:00 2001
|
|
From: John Bintz <haiku@johnbintz.com>
|
|
Date: Fri, 17 May 2024 23:36:14 +0000
|
|
Subject: try this approach
|
|
|
|
|
|
diff --git a/fsgs/plugins/pluginexecutablefinder.py b/fsgs/plugins/pluginexecutablefinder.py
|
|
index 7c8fa9e..478fbfb 100644
|
|
--- a/fsgs/plugins/pluginexecutablefinder.py
|
|
+++ b/fsgs/plugins/pluginexecutablefinder.py
|
|
@@ -48,6 +48,10 @@ def find_executable(name: str):
|
|
exe_file = find_executable_in_side_by_side_app_bundle(name)
|
|
if exe_file:
|
|
return exe_file
|
|
+ if System.haiku:
|
|
+ exe_file = find_executable_in_dir_or_app(name, "/bin")
|
|
+ if exe_file:
|
|
+ return exe_file
|
|
exe_file = find_executable_side_by_side(name)
|
|
if exe_file:
|
|
return exe_file
|
|
--
|
|
2.43.2
|
|
|
|
|
|
From ba11feac815d74cddfebbe4c932b90c11226e087 Mon Sep 17 00:00:00 2001
|
|
From: John Bintz <haiku@johnbintz.com>
|
|
Date: Fri, 17 May 2024 23:43:22 +0000
|
|
Subject: detect haiku
|
|
|
|
|
|
diff --git a/fsbc/system.py b/fsbc/system.py
|
|
index 35c2bc8..5aab5c4 100644
|
|
--- a/fsbc/system.py
|
|
+++ b/fsbc/system.py
|
|
@@ -4,6 +4,7 @@ import platform as _platform
|
|
windows = sys.platform == "win32"
|
|
linux = sys.platform.startswith("linux")
|
|
macosx = sys.platform == "darwin"
|
|
+haiku = sys.platform.startswith("haiku")
|
|
|
|
if windows:
|
|
platform = "windows"
|
|
@@ -11,6 +12,8 @@ elif linux:
|
|
platform = "linux"
|
|
elif macosx:
|
|
platform = "macos"
|
|
+elif haiku:
|
|
+ platform = "haiku"
|
|
else:
|
|
platform = "unknown"
|
|
|
|
@@ -19,6 +22,7 @@ class System:
|
|
windows = windows
|
|
linux = linux
|
|
macos = macosx
|
|
+ haiku = haiku
|
|
platform = platform
|
|
|
|
x86_64 = False
|
|
--
|
|
2.43.2
|
|
|
|
|
|
From 22c33c4898e2dc5ab81a28aa3de2506c5e8b11e9 Mon Sep 17 00:00:00 2001
|
|
From: John Bintz <haiku@johnbintz.com>
|
|
Date: Fri, 17 May 2024 23:48:18 +0000
|
|
Subject: try again
|
|
|
|
|
|
diff --git a/fsgs/plugins/pluginexecutablefinder.py b/fsgs/plugins/pluginexecutablefinder.py
|
|
index 478fbfb..ecbf1fa 100644
|
|
--- a/fsgs/plugins/pluginexecutablefinder.py
|
|
+++ b/fsgs/plugins/pluginexecutablefinder.py
|
|
@@ -49,7 +49,10 @@ def find_executable(name: str):
|
|
if exe_file:
|
|
return exe_file
|
|
if System.haiku:
|
|
- exe_file = find_executable_in_dir_or_app(name, "/bin")
|
|
+ plugin_name = known_executables.get(name)
|
|
+ if plugin_name is None:
|
|
+ return None
|
|
+ exe_file = find_executable_in_dir_or_app(name, "/bin", plugin_name)
|
|
if exe_file:
|
|
return exe_file
|
|
exe_file = find_executable_side_by_side(name)
|
|
--
|
|
2.43.2
|
|
|