diff options
Diffstat (limited to 'subprojects/packagefiles')
6 files changed, 34 insertions, 57 deletions
diff --git a/subprojects/packagefiles/glfm/get_egl_internal.diff b/subprojects/packagefiles/glfm/get_egl_internal.diff deleted file mode 100644 index 3c9098c..0000000 --- a/subprojects/packagefiles/glfm/get_egl_internal.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/include/glfm.h b/include/glfm.h -index ceace39..d18711c 100644 ---- a/include/glfm.h -+++ b/include/glfm.h -@@ -892,6 +892,9 @@ ANativeActivity *glfmAndroidGetActivity(void) GLFM_DEPRECATED("Use glfmGetAndroi - /// ``GLFMAppFocusFunc``. - void *glfmGetAndroidActivity(const GLFMDisplay *display); - -+void *glfmGetEglDisplay(const GLFMDisplay *display); -+void *glfmGetEglContext(const GLFMDisplay *display); -+ - #endif // GLFM_EXPOSE_NATIVE_ANDROID - - #ifdef __cplusplus -diff --git a/src/glfm_android.c b/src/glfm_android.c -index 67d1927..7942ddf 100644 ---- a/src/glfm_android.c -+++ b/src/glfm_android.c -@@ -2800,4 +2800,20 @@ void *glfmGetAndroidActivity(const GLFMDisplay *display) { - return platformData->activity; - } - -+void *glfmGetEglDisplay(const GLFMDisplay *display) { -+ if (!display || !display->platformData) { -+ return NULL; -+ } -+ GLFMPlatformData *platformData = display->platformData; -+ return platformData->eglDisplay; -+} -+ -+void *glfmGetEglContext(const GLFMDisplay *display) { -+ if (!display || !display->platformData) { -+ return NULL; -+ } -+ GLFMPlatformData *platformData = display->platformData; -+ return platformData->eglContext; -+} -+ - #endif // __ANDROID__ diff --git a/subprojects/packagefiles/libcdio-paranoia/meson.build b/subprojects/packagefiles/libcdio-paranoia/meson.build index 42818f6..82b07b3 100644 --- a/subprojects/packagefiles/libcdio-paranoia/meson.build +++ b/subprojects/packagefiles/libcdio-paranoia/meson.build @@ -1,4 +1,4 @@ -project('libcdio-paranoia', 'c', version: 'git-28ad7d0', meson_version: '>=0.57.0') +project('libcdio-paranoia', 'c', version: 'git-717f126', meson_version: '>=0.57.0') ext_proj = import('unstable-external_project') diff --git a/subprojects/packagefiles/libplacebo/compiler_warnings.diff b/subprojects/packagefiles/libplacebo/compiler_warnings.diff new file mode 100644 index 0000000..f3ec3af --- /dev/null +++ b/subprojects/packagefiles/libplacebo/compiler_warnings.diff @@ -0,0 +1,19 @@ +diff --git a/src/include/libplacebo/utils/libav_internal.h b/src/include/libplacebo/utils/libav_internal.h +index 06b151b..67ac387 100644 +--- a/src/include/libplacebo/utils/libav_internal.h ++++ b/src/include/libplacebo/utils/libav_internal.h +@@ -59,11 +59,14 @@ PL_LIBAV_API enum pl_color_system pl_system_from_av(enum AVColorSpace spc) + case AVCOL_SPC_SMPTE170M: return PL_COLOR_SYSTEM_BT_601; + case AVCOL_SPC_SMPTE240M: return PL_COLOR_SYSTEM_SMPTE_240M; + case AVCOL_SPC_YCGCO: return PL_COLOR_SYSTEM_YCGCO; ++ case AVCOL_SPC_YCGCO_RE: return PL_COLOR_SYSTEM_UNKNOWN; // missing ++ case AVCOL_SPC_YCGCO_RO: return PL_COLOR_SYSTEM_UNKNOWN; // missing + case AVCOL_SPC_BT2020_NCL: return PL_COLOR_SYSTEM_BT_2020_NC; + case AVCOL_SPC_BT2020_CL: return PL_COLOR_SYSTEM_BT_2020_C; + case AVCOL_SPC_SMPTE2085: return PL_COLOR_SYSTEM_UNKNOWN; // missing + case AVCOL_SPC_CHROMA_DERIVED_NCL: return PL_COLOR_SYSTEM_UNKNOWN; // missing + case AVCOL_SPC_CHROMA_DERIVED_CL: return PL_COLOR_SYSTEM_UNKNOWN; // missing ++ case AVCOL_SPC_IPT_C2: return PL_COLOR_SYSTEM_UNKNOWN; // missing + // Note: this colorspace is confused between PQ and HLG, which libav* + // requires inferring from other sources, but libplacebo makes explicit. + // Default to PQ as it's the more common scenario. diff --git a/subprojects/packagefiles/notcurses/notcurses_xopen_source.diff b/subprojects/packagefiles/notcurses/notcurses_xopen_source.diff deleted file mode 100644 index f334169..0000000 --- a/subprojects/packagefiles/notcurses/notcurses_xopen_source.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d6c1420d..7f575f257 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -226,10 +226,8 @@ endif() - # don't want these on freebsd/dragonfly/osx - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - target_compile_definitions(notcurses-core -- PUBLIC -- _XOPEN_SOURCE=700 # wcwidth(3) requires _XOPEN_SOURCE, and is in our headers - PRIVATE -- _GNU_SOURCE _DEFAULT_SOURCE -+ _GNU_SOURCE _DEFAULT_SOURCE _XOPEN_SOURCE=700 - ) - target_compile_definitions(notcurses-core-static - PUBLIC diff --git a/subprojects/packagefiles/shaderc/third_party_fix_build.diff b/subprojects/packagefiles/shaderc/third_party_fix_build.diff new file mode 100644 index 0000000..03a1e11 --- /dev/null +++ b/subprojects/packagefiles/shaderc/third_party_fix_build.diff @@ -0,0 +1,13 @@ +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index d44f62a..608accd 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -87,7 +87,7 @@ if (NOT TARGET glslang) + # Glslang tests are off by default. Turn them on if testing Shaderc. + set(GLSLANG_TESTS ON) + endif() +- set(GLSLANG_ENABLE_INSTALL $<NOT:${SKIP_GLSLANG_INSTALL}>) ++ #set(GLSLANG_ENABLE_INSTALL $<NOT:${SKIP_GLSLANG_INSTALL}>) + add_subdirectory(${SHADERC_GLSLANG_DIR} glslang) + endif() + if (NOT TARGET glslang) diff --git a/subprojects/packagefiles/wuffs/meson.build b/subprojects/packagefiles/wuffs/meson.build index dafc5b2..c595249 100644 --- a/subprojects/packagefiles/wuffs/meson.build +++ b/subprojects/packagefiles/wuffs/meson.build @@ -1,2 +1,2 @@ -project('wuff', 'c', version: 'git-7bd37b9') +project('wuff', 'c', version: 'git-d662ef5') wuffs = declare_dependency(include_directories: include_directories('./release/c')) |