diff options
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/BLAKE3.wrap | 3 | ||||
| -rw-r--r-- | subprojects/libalabaster.wrap | 2 | ||||
| -rw-r--r-- | subprojects/libcdio-paranoia.wrap | 3 | ||||
| -rw-r--r-- | subprojects/libdvdcss.wrap | 1 | ||||
| -rw-r--r-- | subprojects/libdvdnav.wrap | 1 | ||||
| -rw-r--r-- | subprojects/libdvdread.wrap | 1 | ||||
| -rw-r--r-- | subprojects/libnaunet.wrap | 2 | ||||
| -rw-r--r-- | subprojects/libplacebo.wrap | 3 | ||||
| -rw-r--r-- | subprojects/miniaudio.wrap | 3 | ||||
| -rw-r--r-- | subprojects/notcurses.wrap | 1 | ||||
| -rw-r--r-- | subprojects/packagefiles/glfm/get_egl_internal.diff | 39 | ||||
| -rw-r--r-- | subprojects/packagefiles/libcdio-paranoia/meson.build | 2 | ||||
| -rw-r--r-- | subprojects/packagefiles/libplacebo/compiler_warnings.diff | 19 | ||||
| -rw-r--r-- | subprojects/packagefiles/notcurses/notcurses_xopen_source.diff | 16 | ||||
| -rw-r--r-- | subprojects/packagefiles/shaderc/third_party_fix_build.diff | 13 | ||||
| -rw-r--r-- | subprojects/packagefiles/wuffs/meson.build | 2 | ||||
| -rw-r--r-- | subprojects/shaderc.wrap | 5 | ||||
| -rw-r--r-- | subprojects/stela.wrap | 2 | ||||
| -rw-r--r-- | subprojects/wuffs.wrap | 3 | ||||
| -rw-r--r-- | subprojects/zlib.wrap | 5 |
20 files changed, 55 insertions, 71 deletions
diff --git a/subprojects/BLAKE3.wrap b/subprojects/BLAKE3.wrap index ebccf0d..7f3b7da 100644 --- a/subprojects/BLAKE3.wrap +++ b/subprojects/BLAKE3.wrap @@ -1,6 +1,7 @@ [wrap-git] +directory = BLAKE3-d2e8069 url = https://github.com/BLAKE3-team/BLAKE3.git -revision = 5c8b350b3531102359b89e9f0a3367e6de4a43f4 +revision = d2e8069161fef13bf0a5198a75dbaee81d8854d9 depth = 1 patch_directory = BLAKE3 method = cmake diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap index 1fec842..cceb244 100644 --- a/subprojects/libalabaster.wrap +++ b/subprojects/libalabaster.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/libalabaster -revision = 209310c561d89c9ed2040aa7053b320d32cc393c +revision = 562c730ac38749fb43ae5b7b53ae5f3043166bd1 depth = 1 diff --git a/subprojects/libcdio-paranoia.wrap b/subprojects/libcdio-paranoia.wrap index f1ed23c..c271d48 100644 --- a/subprojects/libcdio-paranoia.wrap +++ b/subprojects/libcdio-paranoia.wrap @@ -1,6 +1,7 @@ [wrap-git] +directory = libcdio-paranoia-717f126 url = https://github.com/rocky/libcdio-paranoia.git -revision = 28ad7d06c503989f4738bcc9d44b2a035f162d24 +revision = 717f1263910695e8bc66ad33d08a61ff572c0691 depth = 1 patch_directory = libcdio-paranoia diff --git a/subprojects/libdvdcss.wrap b/subprojects/libdvdcss.wrap index acbc6f2..fde6a82 100644 --- a/subprojects/libdvdcss.wrap +++ b/subprojects/libdvdcss.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = libdvdcss-d0b6a29 url = https://code.videolan.org/videolan/libdvdcss.git revision = d0b6a291c24eda3727ad5c7a14956fc1fc82446d depth = 1 diff --git a/subprojects/libdvdnav.wrap b/subprojects/libdvdnav.wrap index 6bc37a3..a0953d8 100644 --- a/subprojects/libdvdnav.wrap +++ b/subprojects/libdvdnav.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = libdvdnav-9831fe0 url = https://code.videolan.org/videolan/libdvdnav.git revision = 9831fe01488bd0e9d1e3521195da6940cd8415eb depth = 1 diff --git a/subprojects/libdvdread.wrap b/subprojects/libdvdread.wrap index 932fd51..f347dd4 100644 --- a/subprojects/libdvdread.wrap +++ b/subprojects/libdvdread.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = libdvdread-ba2227b url = https://code.videolan.org/videolan/libdvdread.git revision = ba2227bb8619724c2bfadcc4d8f25d741a3398ac depth = 1 diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap index 0466a46..7cce0e2 100644 --- a/subprojects/libnaunet.wrap +++ b/subprojects/libnaunet.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/libnaunet -revision = cef6cabce7ae97e9edfb6821ce4393d714579866 +revision = e48874a91a86ef561aa4b3298d6170ec9777954e depth = 1 diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap index 9eb608c..cc66e64 100644 --- a/subprojects/libplacebo.wrap +++ b/subprojects/libplacebo.wrap @@ -1,10 +1,11 @@ [wrap-git] +directory = libplacebo-118d810 url = https://code.videolan.org/videolan/libplacebo.git revision = 118d8106640796d3f2ceb55f8634a32a58a47aa2 clone-recursive = true depth = 1 -diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/no_dlltool_no_shaderc_version.diff +diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/no_dlltool_no_shaderc_version.diff, libplacebo/compiler_warnings.diff, libplacebo/glClientWaitSync_0_return.diff, libplacebo/info_priv_hash.diff [provide] dependency_names = libplacebo diff --git a/subprojects/miniaudio.wrap b/subprojects/miniaudio.wrap index 9936650..e4e8862 100644 --- a/subprojects/miniaudio.wrap +++ b/subprojects/miniaudio.wrap @@ -1,6 +1,7 @@ [wrap-git] +directory = miniaudio-6d5efde url = https://github.com/mackron/miniaudio.git -revision = fc905ec97fdd4935f6066e648cccf1a098cd66cb +revision = 6d5efde254a81e42294f3baf4a4376a76492c192 depth = 1 patch_directory = miniaudio diff_files = miniaudio/miniaudio_pulse_flush.diff, miniaudio/miniaudio_alsa_compile.diff diff --git a/subprojects/notcurses.wrap b/subprojects/notcurses.wrap index f946c58..eda7b98 100644 --- a/subprojects/notcurses.wrap +++ b/subprojects/notcurses.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = notcurses-c11efe8 url = https://github.com/dankamongmen/notcurses.git revision = c11efe877f2245901f5c9ce110de7a2c83cfa2ed depth = 1 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')) diff --git a/subprojects/shaderc.wrap b/subprojects/shaderc.wrap index 752f8e2..06e2e34 100644 --- a/subprojects/shaderc.wrap +++ b/subprojects/shaderc.wrap @@ -1,5 +1,8 @@ [wrap-git] +directory = shaderc-3158c54 url = https://github.com/google/shaderc.git -revision = ddac450a36a3be28a2c2173f26703249dd83cfdf +revision = 3158c54654b2d9589f402fa27aa7e28438fd6333 depth = 1 method = cmake +patch_directory = shaderc +diff_files = shaderc/third_party_fix_build.diff diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap index fb20893..26184ba 100644 --- a/subprojects/stela.wrap +++ b/subprojects/stela.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/stela -revision = 35a0c4feb6569895bf19c05c510a674666dcc4c6 +revision = a55bfe4c21858eef0eb1bddf4085fcfde1b7e07d depth = 1 diff --git a/subprojects/wuffs.wrap b/subprojects/wuffs.wrap index 165ae9e..113e521 100644 --- a/subprojects/wuffs.wrap +++ b/subprojects/wuffs.wrap @@ -1,5 +1,6 @@ [wrap-git] +directory = wuffs-d662ef5 url = https://github.com/google/wuffs.git -revision = 7bd37b9bc168f59c220995c152e68ff012a9935a +revision = d662ef548401b62e3addbd5df34056cfa83ee184 depth = 1 patch_directory = wuffs diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap deleted file mode 100644 index 2a4215f..0000000 --- a/subprojects/zlib.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-git] -url = https://github.com/madler/zlib.git -revision = 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 -depth = 1 -method = cmake |