Forcibly disable hidden dep on Wayland.

The upstream knob to turn it off doesn't work, so Wayland is used
unconditionally if installed, necessitating patching the knob.

Even if it weren't junked during the build, making Wayland a dependency
of this port is not an option right now, as it requires SDL2 to have
been built with Wayland support.

Build breakage reported by ajacoutot@
master
bentley 2023-09-19 08:05:15 +00:00
parent 06bf7f53dc
commit e0a0d2ef77
2 changed files with 18 additions and 2 deletions

View File

@ -5,6 +5,7 @@ COMMENT = Sony PlayStation Portable emulator
DISTNAME = ppsspp-$V
V = 1.16.1
REVISION = 0
SITES = https://github.com/hrydgard/ppsspp/releases/download/v$V/
@ -37,11 +38,13 @@ LIB_DEPENDS = archivers/snappy \
COMPILER = base-clang ports-gcc
# Wayland not yet supported in sdl2
CONFIGURE_ARGS = -DUSE_SYSTEM_FFMPEG=ON \
-DUSE_SYSTEM_LIBZIP=ON \
-DUSE_SYSTEM_SNAPPY=ON \
-DUSE_SYSTEM_ZSTD=ON \
-DUSE_DISCORD=OFF \
-DUSE_WAYLAND_WSI=OFF \
-DUSING_EGL=OFF
DEBUG_PACKAGES = ${BUILD_PACKAGES}

View File

@ -1,10 +1,23 @@
- Honor CFLAGS and DEBUG
- Use system libpng on arm platforms
- Allow disabling Wayland even if found
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -378,13 +378,13 @@ if(NOT MSVC)
@@ -188,10 +188,9 @@ if(UNIX AND NOT (APPLE OR ANDROID) AND VULKAN)
find_package(Wayland)
if(NOT WAYLAND_FOUND)
message(STATUS "Could not find Wayland libraries, disabling Wayland WSI support for Vulkan.")
- else()
+ elseif(USE_WAYLAND_WSI)
include_directories(${WAYLAND_INCLUDE_DIR})
add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR)
- add_definitions(-DUSE_WAYLAND_WSI=ON)
endif()
if(USE_VULKAN_DISPLAY_KHR)
@@ -378,13 +377,13 @@ if(NOT MSVC)
endif()
endif()
@ -22,7 +35,7 @@ Index: CMakeLists.txt
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
# Enable checking printf-like format strings (also works for logging functions)
@@ -1125,7 +1125,7 @@ else()
@@ -1125,7 +1124,7 @@ else()
endif()
# Arm platforms require at least libpng17.