openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

glslang 14 doesn't need linking libHLSL anymore, nor does it provide it. Therefore remove HLSL from the build which fixes this fallout from glslang 14 update

Browse Source
This commit is contained in:
thfr
2024-02-29 03:07:21 +00:00
parent 476cf04657
commit 677c00bead
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emulators/snes9x/Makefile
+5 -4
View File
@@ -5,6 +5,7 @@ BROKEN-hppa = ICE/failure on filter/hq2x.cpp
GH_ACCOUNT = snes9xgit
GH_PROJECT = snes9x
GH_TAGNAME = 1.62.3
REVISION = 0
CATEGORIES = emulators games
@@ -15,12 +16,12 @@ MAINTAINER = Lucas Gabriel Vuotto <lucas@sexy.is>
# non-commercial
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} HLSL SDL2 SPIRV X11 Xext Xrandr
WANTLIB += ${COMPILER_LIBCXX} SDL2 SPIRV X11 Xext Xrandr
WANTLIB += Xv atk-1.0 atkmm-1.6 c cairo cairo-gobject cairomm-1.0
WANTLIB += epoxy gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4
WANTLIB += glib-2.0 glibmm-2.4 glslang gobject-2.0 gthread-2.0
WANTLIB += gtk-3 gtkmm-3.0 harfbuzz intl m pango-1.0 pangocairo-1.0
WANTLIB += pangomm-1.4 png sigc-2.0 z
WANTLIB += glib-2.0 glibmm-2.4 glslang glslang-default-resource-limits
WANTLIB += gobject-2.0 gthread-2.0 gtk-3 gtkmm-3.0 harfbuzz intl m
WANTLIB += pango-1.0 pangocairo-1.0 pangomm-1.4 png sigc-2.0 z
# libvulkan seems opened via dlopen, as the ports builds and links without it.
# Runtime will abort if Vulkan is used as the renderer and vulkan-loader isn't
emulators/snes9x/patches/patch-gtk_CMakeLists_txt
+4 -3
View File
@@ -1,6 +1,7 @@
No -ldl on OpenBSD.
Use system glslang and SPIRV-Cross.
Don't reach for Wayland headers.
libHLSL is gone since glslang 14
Index: gtk/CMakeLists.txt
--- gtk/CMakeLists.txt.orig
@@ -13,7 +14,7 @@ Index: gtk/CMakeLists.txt
list(APPEND ARGS ${SDL2_CFLAGS} ${GTK_CFLAGS} ${XRANDR_CFLAGS})
list(APPEND LIBS ${X11} ${XEXT} ${DL} ${SDL2_LIBRARIES} ${GTK_LIBRARIES} ${XRANDR_LIBRARIES})
@@ -78,16 +77,11 @@ list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
@@ -78,16 +77,10 @@ list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
if(USE_SLANG)
list(APPEND SOURCES ../shaders/slang.cpp)
@@ -25,12 +26,12 @@ Index: gtk/CMakeLists.txt
- add_subdirectory("../external/SPIRV-Cross" "SPIRV-Cross" EXCLUDE_FROM_ALL)
list(APPEND LIBS glslang
- OGLCompiler
HLSL
- HLSL
- OSDependent
SPIRV
glslang-default-resource-limits)
list(APPEND LIBS spirv-cross-core
@@ -95,10 +89,8 @@ if(USE_SLANG)
@@ -95,10 +88,8 @@ if(USE_SLANG)
spirv-cross-reflect
spirv-cross-cpp)
list(APPEND DEFINES "USE_SLANG")