Nicolas Chauvet
1 year ago
commit
56911bd961
@ -0,0 +1,45 @@
|
||||
From 982f44d09bb61490194baf371d52c12016e0c5c9 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Chauvet <kwizart@gmail.com>
|
||||
Date: Fri, 28 Jul 2023 12:25:44 +0200
|
||||
Subject: [PATCH] po: Fixup invalid format string
|
||||
|
||||
Will fix the following errors
|
||||
|
||||
oc.po:5301: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid.
|
||||
oc.po:5306: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid.
|
||||
oc.po:5312: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid.
|
||||
|
||||
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
|
||||
---
|
||||
po/oc.po | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/po/oc.po b/po/oc.po
|
||||
index 667696cfe785..ddb1677d8a53 100644
|
||||
--- a/po/oc.po
|
||||
+++ b/po/oc.po
|
||||
@@ -5298,18 +5298,18 @@ msgstr "Comanda+"
|
||||
#: src/misc/update.c:482
|
||||
#, c-format
|
||||
msgid "%.1f GiB"
|
||||
-msgstr "%.lf Gio"
|
||||
+msgstr "%.1f Gio"
|
||||
|
||||
#: src/misc/update.c:484
|
||||
#, c-format
|
||||
msgid "%.1f MiB"
|
||||
-msgstr "%.lf Mio"
|
||||
+msgstr "%.1f Mio"
|
||||
|
||||
#: src/misc/update.c:486 modules/gui/macosx/VLCPlaylistInfo.m:138
|
||||
#: modules/gui/macosx/VLCPlaylistInfo.m:140
|
||||
#, c-format
|
||||
msgid "%.1f KiB"
|
||||
-msgstr "%.lf Kio"
|
||||
+msgstr "%.1f Kio"
|
||||
|
||||
#: src/misc/update.c:488
|
||||
#, c-format
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1 +1 @@
|
||||
SHA512 (vlc-e9eceae.tar.gz) = 164e9e96954415ed25b5b0256e50f588a6853223a859805609ba7a4ce2ab0f1cc0966926182e7fe74a1a6d7b63deacbe3aaf67316b41c33b024999fb45b5902e
|
||||
SHA512 (vlc-32b50de.tar.gz) = 6a2b393cd45704528f9ef4aa894f552b93c0831f81dd54fa29ad877c0e5bc8bda836f830bf2d0bf049d482d4dad46135dddc73d28c5365bd15c1c33e460e72ed
|
||||
|
||||
@ -0,0 +1,131 @@
|
||||
From efbb1fdbc4420365b3ffd22e55dd27ad520037c7 Mon Sep 17 00:00:00 2001
|
||||
From: Niklas Haas <git@haasn.dev>
|
||||
Date: Sat, 16 Jul 2022 14:41:13 +0200
|
||||
Subject: [PATCH] opengl: port to libplacebo v4 API
|
||||
|
||||
These v3.x APIs will be removed in v5.x. Fortunately, the new APIs are a
|
||||
near drop-in replacement, so the change was minimal. Only the error
|
||||
handling was cleaned up slightly.
|
||||
---
|
||||
modules/video_output/opengl/converter.h | 18 ++++++++++--------
|
||||
modules/video_output/opengl/fragment_shaders.c | 4 ++--
|
||||
modules/video_output/opengl/vout_helper.c | 14 +++++++-------
|
||||
3 files changed, 19 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h
|
||||
index 7000e1f38e..cb8e593a9a 100644
|
||||
--- a/modules/video_output/opengl/converter.h
|
||||
+++ b/modules/video_output/opengl/converter.h
|
||||
@@ -52,6 +52,11 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_LIBPLACEBO
|
||||
+# include <libplacebo/log.h>
|
||||
+# include <libplacebo/shaders.h>
|
||||
+#endif
|
||||
+
|
||||
#define VLCGL_PICTURE_MAX 128
|
||||
|
||||
#ifndef GL_TEXTURE_RECTANGLE
|
||||
@@ -253,10 +258,6 @@ static inline bool HasExtension(const char *apis, const char *api)
|
||||
return false;
|
||||
}
|
||||
|
||||
-struct pl_context;
|
||||
-struct pl_shader;
|
||||
-struct pl_shader_res;
|
||||
-
|
||||
/*
|
||||
* Structure that is filled by "glhw converter" module probe function
|
||||
* The implementation should initialize every members of the struct that are
|
||||
@@ -272,8 +273,12 @@ struct opengl_tex_converter_t
|
||||
/* Pointer to object gl, set by the caller */
|
||||
vlc_gl_t *gl;
|
||||
|
||||
+#ifdef HAVE_LIBPLACEBO
|
||||
/* libplacebo context, created by the caller (optional) */
|
||||
- struct pl_context *pl_ctx;
|
||||
+ pl_log pl_log;
|
||||
+ pl_shader pl_sh;
|
||||
+ const struct pl_shader_res *pl_sh_res;
|
||||
+#endif
|
||||
|
||||
/* Function pointers to OpenGL functions, set by the caller */
|
||||
const opengl_vtable_t *vt;
|
||||
@@ -337,9 +342,6 @@ struct opengl_tex_converter_t
|
||||
bool yuv_color;
|
||||
GLfloat yuv_coefficients[16];
|
||||
|
||||
- struct pl_shader *pl_sh;
|
||||
- const struct pl_shader_res *pl_sh_res;
|
||||
-
|
||||
/* Private context */
|
||||
void *priv;
|
||||
|
||||
diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
|
||||
index 2246e33afd..16380335cc 100644
|
||||
--- a/modules/video_output/opengl/fragment_shaders.c
|
||||
+++ b/modules/video_output/opengl/fragment_shaders.c
|
||||
@@ -611,7 +611,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
|
||||
|
||||
#ifdef HAVE_LIBPLACEBO
|
||||
if (tc->pl_sh) {
|
||||
- struct pl_shader *sh = tc->pl_sh;
|
||||
+ pl_shader sh = tc->pl_sh;
|
||||
struct pl_color_map_params color_params = pl_color_map_default_params;
|
||||
color_params.intent = var_InheritInteger(tc->gl, "rendering-intent");
|
||||
color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping");
|
||||
@@ -634,7 +634,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
|
||||
pl_color_space_from_video_format(&tc->fmt),
|
||||
dst_space, NULL, false);
|
||||
|
||||
- struct pl_shader_obj *dither_state = NULL;
|
||||
+ pl_shader_obj dither_state = NULL;
|
||||
int method = var_InheritInteger(tc->gl, "dither-algo");
|
||||
if (method >= 0) {
|
||||
|
||||
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
|
||||
index 13d65e04c8..e971f5170b 100644
|
||||
--- a/modules/video_output/opengl/vout_helper.c
|
||||
+++ b/modules/video_output/opengl/vout_helper.c
|
||||
@@ -570,8 +570,8 @@ opengl_deinit_program(vout_display_opengl_t *vgl, struct prgm *prgm)
|
||||
|
||||
#ifdef HAVE_LIBPLACEBO
|
||||
FREENULL(tc->uloc.pl_vars);
|
||||
- if (tc->pl_ctx)
|
||||
- pl_context_destroy(&tc->pl_ctx);
|
||||
+ pl_shader_free(&tc->pl_sh);
|
||||
+ pl_log_destroy(&tc->pl_log);
|
||||
#endif
|
||||
|
||||
vlc_object_release(tc);
|
||||
@@ -622,21 +622,21 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
|
||||
// create the main libplacebo context
|
||||
if (!subpics)
|
||||
{
|
||||
- tc->pl_ctx = pl_context_create(PL_API_VER, &(struct pl_context_params) {
|
||||
+ tc->pl_log = pl_log_create(PL_API_VER, &(struct pl_log_params) {
|
||||
.log_cb = log_cb,
|
||||
.log_priv = tc,
|
||||
.log_level = PL_LOG_INFO,
|
||||
});
|
||||
- if (tc->pl_ctx) {
|
||||
+ if (tc->pl_log) {
|
||||
# if PL_API_VER >= 20
|
||||
- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, &(struct pl_shader_params) {
|
||||
+ tc->pl_sh = pl_shader_alloc(tc->pl_log, &(struct pl_shader_params) {
|
||||
.glsl.version = tc->glsl_version,
|
||||
.glsl.gles = tc->is_gles,
|
||||
});
|
||||
# elif PL_API_VER >= 6
|
||||
- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
|
||||
+ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0);
|
||||
# else
|
||||
- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
|
||||
+ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0, 0);
|
||||
# endif
|
||||
}
|
||||
}
|
||||
--
|
||||
2.38.1
|
||||
@ -0,0 +1,24 @@
|
||||
diff -up vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac.vpl vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac
|
||||
--- vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac.vpl 2023-06-17 17:19:28.954540887 +0200
|
||||
+++ vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac 2023-06-17 17:19:28.956540899 +0200
|
||||
@@ -2925,7 +2925,7 @@ fi
|
||||
dnl
|
||||
dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
|
||||
dnl
|
||||
-PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
|
||||
+PKG_ENABLE_MODULES_VLC([MFX], [qsv], [vpl], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
|
||||
|
||||
dnl
|
||||
dnl libfluidsynth (MIDI synthetizer) plugin
|
||||
diff -up vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c.vpl vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c
|
||||
--- vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c.vpl 2023-06-09 17:29:29.000000000 +0200
|
||||
+++ vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c 2023-06-17 17:22:05.468382540 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <vlc_picture.h>
|
||||
#include <vlc_codec.h>
|
||||
|
||||
-#include <mfx/mfxvideo.h>
|
||||
+#include <vpl/mfxvideo.h>
|
||||
|
||||
#define SOUT_CFG_PREFIX "sout-qsv-"
|
||||
|
||||
Loading…
Reference in new issue