mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
glfw: bump version
This commit is contained in:
@@ -4,12 +4,12 @@ OpenGL ES and Vulkan development on the desktop. It provides a simple API \
|
|||||||
for creating windows, contexts and surfaces, receiving input and events."
|
for creating windows, contexts and surfaces, receiving input and events."
|
||||||
HOMEPAGE="https://www.glfw.org/"
|
HOMEPAGE="https://www.glfw.org/"
|
||||||
COPYRIGHT="2002-2006 Marcus Geelnard
|
COPYRIGHT="2002-2006 Marcus Geelnard
|
||||||
2006-2021 Camilla Löwy
|
2006-2023 Camilla Löwy
|
||||||
"
|
"
|
||||||
LICENSE="Zlib"
|
LICENSE="Zlib"
|
||||||
REVISION="3"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/glfw/glfw/archive/$portVersion.tar.gz"
|
SOURCE_URI="https://github.com/glfw/glfw/archive/$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02"
|
CHECKSUM_SHA256="fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04"
|
||||||
PATCHES="glfw-$portVersion.patchset"
|
PATCHES="glfw-$portVersion.patchset"
|
||||||
ADDITIONAL_FILES="glfw.rdef.in"
|
ADDITIONAL_FILES="glfw.rdef.in"
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
From 6372d5127b28e5eea2b0234f86c710987adadb25 Mon Sep 17 00:00:00 2001
|
From adcf2aceaecff77702ba86bfe9a2eb135ba3d5b8 Mon Sep 17 00:00:00 2001
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
Date: Sun, 6 Feb 2022 20:26:48 +1000
|
Date: Sun, 6 Feb 2022 20:26:48 +1000
|
||||||
Subject: Add Haiku support
|
Subject: Add Haiku support
|
||||||
@@ -11,8 +11,8 @@ index b4bbded..68aac62 100644
|
|||||||
@@ -1,6 +1,6 @@
|
@@ -1,6 +1,6 @@
|
||||||
cmake_minimum_required(VERSION 3.0...3.20 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.0...3.20 FATAL_ERROR)
|
||||||
|
|
||||||
-project(GLFW VERSION 3.3.6 LANGUAGES C)
|
-project(GLFW VERSION 3.3.7 LANGUAGES C)
|
||||||
+project(GLFW VERSION 3.3.6 LANGUAGES C CXX)
|
+project(GLFW VERSION 3.3.7 LANGUAGES C CXX)
|
||||||
|
|
||||||
set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
|
set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
|
||||||
|
|
||||||
@@ -2343,7 +2343,7 @@ index 0000000..966b1f7
|
|||||||
+ return VK_ERROR_INITIALIZATION_FAILED;
|
+ return VK_ERROR_INITIALIZATION_FAILED;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
ddiff --git a/src/internal.h b/src/internal.h
|
diff --git a/src/internal.h b/src/internal.h
|
||||||
index ad619b4..6a6c704 100644
|
index ad619b4..6a6c704 100644
|
||||||
--- a/src/internal.h
|
--- a/src/internal.h
|
||||||
+++ b/src/internal.h
|
+++ b/src/internal.h
|
||||||
@@ -2396,10 +2396,10 @@ index 26b544b..ca2c227 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
--
|
--
|
||||||
2.30.2
|
2.37.3
|
||||||
|
|
||||||
|
|
||||||
From e820d0945c82eca4de05b30d3edf679a42cf7388 Mon Sep 17 00:00:00 2001
|
From 18bd63873a23c0f7a1c0be6a8694376a652760be Mon Sep 17 00:00:00 2001
|
||||||
From: X512 <danger_mail@list.ru>
|
From: X512 <danger_mail@list.ru>
|
||||||
Date: Sat, 5 Feb 2022 13:57:28 +0900
|
Date: Sat, 5 Feb 2022 13:57:28 +0900
|
||||||
Subject: haiku: Vulkan window output
|
Subject: haiku: Vulkan window output
|
||||||
@@ -2707,10 +2707,10 @@ index 22c54e4..e267e25 100644
|
|||||||
else if (strcmp(ep[i].extensionName, "VK_KHR_win32_surface") == 0)
|
else if (strcmp(ep[i].extensionName, "VK_KHR_win32_surface") == 0)
|
||||||
_glfw.vk.KHR_win32_surface = GLFW_TRUE;
|
_glfw.vk.KHR_win32_surface = GLFW_TRUE;
|
||||||
--
|
--
|
||||||
2.30.2
|
2.37.3
|
||||||
|
|
||||||
|
|
||||||
From f64b80c363499fce85e4d590a72cd0e4e0b00518 Mon Sep 17 00:00:00 2001
|
From a1f910dcb7cf9dad43b76df8b618a9532bce5dfc Mon Sep 17 00:00:00 2001
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
Date: Mon, 7 Feb 2022 19:53:09 +1000
|
Date: Mon, 7 Feb 2022 19:53:09 +1000
|
||||||
Subject: Update framebuffer size on window resize
|
Subject: Update framebuffer size on window resize
|
||||||
@@ -2731,10 +2731,10 @@ index 6cf5e74..f7d2752 100644
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
--
|
--
|
||||||
2.30.2
|
2.37.3
|
||||||
|
|
||||||
|
|
||||||
From 284b95d1d6ac5e0f8b47c08f76132c4c14f27ebe Mon Sep 17 00:00:00 2001
|
From eaebc25bdb5a363a763c9fc85df5bbee400e9fc8 Mon Sep 17 00:00:00 2001
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
Date: Sat, 12 Feb 2022 22:44:09 +1000
|
Date: Sat, 12 Feb 2022 22:44:09 +1000
|
||||||
Subject: Missing initial NULL value for renderBitmap
|
Subject: Missing initial NULL value for renderBitmap
|
||||||
@@ -2753,10 +2753,10 @@ index 6670abb..2c7e127 100644
|
|||||||
mouseMode(MOUSE_MODE_NORMAL)
|
mouseMode(MOUSE_MODE_NORMAL)
|
||||||
{
|
{
|
||||||
--
|
--
|
||||||
2.30.2
|
2.37.3
|
||||||
|
|
||||||
|
|
||||||
From b3ee435c9f7132dff1bcfc10d4313a37fa9a5728 Mon Sep 17 00:00:00 2001
|
From cf4fe92e08d73bc6a40bbd0e5dcf3e27043ccfb9 Mon Sep 17 00:00:00 2001
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
Date: Sat, 12 Feb 2022 22:51:37 +1000
|
Date: Sat, 12 Feb 2022 22:51:37 +1000
|
||||||
Subject: Add cursors, clipboard and files drop support
|
Subject: Add cursors, clipboard and files drop support
|
||||||
@@ -3048,5 +3048,59 @@ index f7d2752..2e03cef 100644
|
|||||||
|
|
||||||
const char* _glfwPlatformGetScancodeName(int scancode)
|
const char* _glfwPlatformGetScancodeName(int scancode)
|
||||||
--
|
--
|
||||||
2.30.2
|
2.37.3
|
||||||
|
|
||||||
|
|
||||||
|
From a9461755c66d21dc33bc4052499d43225425fa40 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
|
Date: Wed, 29 Mar 2023 11:52:21 +1000
|
||||||
|
Subject: Remove check for forward-compatible context
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/haiku_context.cpp b/src/haiku_context.cpp
|
||||||
|
index f1038ed..dc04e51 100644
|
||||||
|
--- a/src/haiku_context.cpp
|
||||||
|
+++ b/src/haiku_context.cpp
|
||||||
|
@@ -232,13 +232,6 @@ GLFWbool _glfwCreateContextOSMesa(_GLFWwindow* window,
|
||||||
|
setAttrib(OSMESA_CONTEXT_MINOR_VERSION, ctxconfig->minor);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (ctxconfig->forward)
|
||||||
|
- {
|
||||||
|
- _glfwInputError(GLFW_VERSION_UNAVAILABLE,
|
||||||
|
- "OSMesa: Forward-compatible contexts not supported");
|
||||||
|
- return GLFW_FALSE;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
setAttrib(0, 0);
|
||||||
|
|
||||||
|
window->context.osmesa.handle =
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
||||||
|
|
||||||
|
From f95af385ce174956f17e7b59067a2c1865068939 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
|
Date: Wed, 29 Mar 2023 11:53:18 +1000
|
||||||
|
Subject: Fix deadlock for SetTitle
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/haiku_window.cpp b/src/haiku_window.cpp
|
||||||
|
index 2e03cef..fe46b1d 100644
|
||||||
|
--- a/src/haiku_window.cpp
|
||||||
|
+++ b/src/haiku_window.cpp
|
||||||
|
@@ -210,7 +210,10 @@ void _glfwPlatformDestroyWindow(_GLFWwindow* window)
|
||||||
|
|
||||||
|
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
|
||||||
|
{
|
||||||
|
- PLATFORM_WINDOW(window)->SetTitle(title);
|
||||||
|
+ if (PLATFORM_WINDOW(window)->LockLooperWithTimeout(10000) == B_OK) {
|
||||||
|
+ PLATFORM_WINDOW(window)->SetTitle(title);
|
||||||
|
+ PLATFORM_WINDOW(window)->UnlockLooper();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void _glfwPlatformSetWindowIcon(_GLFWwindow* window, int count,
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
||||||
Reference in New Issue
Block a user