From 4974293c9cf88022c678d0ee506a0120c54961bf Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 1 Nov 2020 15:27:28 +0000 Subject: [PATCH] Drop obsolete patches --- ...9efc13a3a8f5259ce260655dfdd6f4830299.patch | 55 ---- ...32db726559743d08d2fcafbb90fc923c43ff.patch | 27 -- libplacebo_patch_1.patch | 101 ------- recent_srt_fix.patch | 25 ++ replace_deprecated_luaL_checkint.patch | 261 ------------------ vlc.spec | 4 + 6 files changed, 29 insertions(+), 444 deletions(-) delete mode 100644 4f899efc13a3a8f5259ce260655dfdd6f4830299.patch delete mode 100644 85aa32db726559743d08d2fcafbb90fc923c43ff.patch delete mode 100644 libplacebo_patch_1.patch create mode 100644 recent_srt_fix.patch delete mode 100644 replace_deprecated_luaL_checkint.patch diff --git a/4f899efc13a3a8f5259ce260655dfdd6f4830299.patch b/4f899efc13a3a8f5259ce260655dfdd6f4830299.patch deleted file mode 100644 index d7d78c4..0000000 --- a/4f899efc13a3a8f5259ce260655dfdd6f4830299.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4f899efc13a3a8f5259ce260655dfdd6f4830299 Mon Sep 17 00:00:00 2001 -From: Alexandre Janniaux -Date: Fri, 28 Aug 2020 10:08:37 +0200 -Subject: [PATCH 1/1] qt: add missing include for QPainterPath - -The include is not transitively included anymore with Qt 5.15. - -Original contribution of menaquinone from ticket #24882. - -Fix #24882, #25059 ---- - modules/gui/qt/components/playlist/views.cpp | 1 + - modules/gui/qt/util/timetooltip.cpp | 1 - - modules/gui/qt/util/timetooltip.hpp | 1 + - 3 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp -index ecc6b9918d..70dd29df72 100644 ---- a/modules/gui/qt/components/playlist/views.cpp -+++ b/modules/gui/qt/components/playlist/views.cpp -@@ -27,6 +27,7 @@ - #include "input_manager.hpp" /* THEMIM */ - - #include -+#include - #include - #include - #include -diff --git a/modules/gui/qt/util/timetooltip.cpp b/modules/gui/qt/util/timetooltip.cpp -index 7a63a9d7d9..8cfdab3206 100644 ---- a/modules/gui/qt/util/timetooltip.cpp -+++ b/modules/gui/qt/util/timetooltip.cpp -@@ -23,7 +23,6 @@ - - #include - #include --#include - #include - #include - #include -diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp -index b6d7c646c9..f213eac459 100644 ---- a/modules/gui/qt/util/timetooltip.hpp -+++ b/modules/gui/qt/util/timetooltip.hpp -@@ -25,6 +25,7 @@ - #include "qt.hpp" - - #include -+#include - - class TimeTooltip : public QWidget - { --- -2.20.1 - diff --git a/85aa32db726559743d08d2fcafbb90fc923c43ff.patch b/85aa32db726559743d08d2fcafbb90fc923c43ff.patch deleted file mode 100644 index 2c315ec..0000000 --- a/85aa32db726559743d08d2fcafbb90fc923c43ff.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 85aa32db726559743d08d2fcafbb90fc923c43ff Mon Sep 17 00:00:00 2001 -From: Pierre Lamot -Date: Wed, 27 May 2020 11:05:53 +0200 -Subject: [PATCH 1/1] qt: fix missing header when compiling with Qt 5.15 - -Cherry-picked from commit 0e88143ed2fe8eedfa4d3afdafcd0df901644c1d. - -Signed-off-by: Alexandre Janniaux ---- - modules/gui/qt/dialogs/plugins.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp -index 93c92b9fa6..e05ec0594a 100644 ---- a/modules/gui/qt/dialogs/plugins.cpp -+++ b/modules/gui/qt/dialogs/plugins.cpp -@@ -66,6 +66,7 @@ - #include - #include - #include -+#include - - //match the image source (width/height) - #define SCORE_ICON_WIDTH_SCALE 4 --- -2.20.1 - diff --git a/libplacebo_patch_1.patch b/libplacebo_patch_1.patch deleted file mode 100644 index f47fce3..0000000 --- a/libplacebo_patch_1.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 2215a98fbb1f11e5df8e58eba2ea15733cff7905 Mon Sep 17 00:00:00 2001 -From: Leigh Scott -Date: Thu, 19 Dec 2019 15:03:32 +0000 -Subject: [PATCH] Adapt patch from videolan mailing list - ---- - .../video_output/opengl/fragment_shaders.c | 6 +++++ - modules/video_output/opengl/vout_helper.c | 4 ++- - modules/video_output/opengl/vout_helper.h | 27 +++++++++++++++++-- - 3 files changed, 34 insertions(+), 3 deletions(-) - -diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c -index 8c1f67ee7a..f6fb2be6c5 100644 ---- a/modules/video_output/opengl/fragment_shaders.c -+++ b/modules/video_output/opengl/fragment_shaders.c -@@ -616,7 +616,13 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target, - color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); - color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); - color_params.tone_mapping_param = var_InheritFloat(tc->gl, "tone-mapping-param"); -+# if PL_API_VER >= 10 -+ color_params.desaturation_strength = var_InheritFloat(tc->gl, "desat-strength"); -+ color_params.desaturation_exponent = var_InheritFloat(tc->gl, "desat-exponent"); -+ color_params.desaturation_base = var_InheritFloat(tc->gl, "desat-base"); -+# else - color_params.tone_mapping_desaturate = var_InheritFloat(tc->gl, "tone-mapping-desat"); -+# endif - color_params.gamut_warning = var_InheritBool(tc->gl, "tone-mapping-warn"); - - struct pl_color_space dst_space = pl_color_space_unknown; -diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c -index 919560e603..12308e2060 100644 ---- a/modules/video_output/opengl/vout_helper.c -+++ b/modules/video_output/opengl/vout_helper.c -@@ -628,7 +628,9 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm, - .log_level = PL_LOG_INFO, - }); - if (tc->pl_ctx) { --# if PL_API_VER >= 6 -+# if PL_API_VER >= 20 -+ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL); -+# elif PL_API_VER >= 6 - tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); - # else - tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0); -diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h -index 978669f89c..cfc256530e 100644 ---- a/modules/video_output/opengl/vout_helper.h -+++ b/modules/video_output/opengl/vout_helper.h -@@ -148,6 +148,15 @@ static const char * const tone_text[] = { - #define TONEMAP_DESAT_TEXT "Tone-mapping desaturation coefficient" - #define TONEMAP_DESAT_LONGTEXT "How strongly to desaturate overbright colors towards white. 0.0 disables this behavior." - -+#define DESAT_STRENGTH_TEXT "Desaturation strength" -+#define DESAT_STRENGTH_LONGTEXT "How strongly to desaturate bright spectral colors towards white. 0.0 disables this behavior, 1.0 enables full desaturation (hollywood-style)" -+ -+#define DESAT_EXPONENT_TEXT "Desaturation exponent" -+#define DESAT_EXPONENT_LONGTEXT "Controls the steepness of the desaturation curve. If you set this to 0.0, the curve will be flat, i.e. desaturation always enabled (hollywood-style)." -+ -+#define DESAT_BASE_TEXT "Desaturation base" -+#define DESAT_BASE_LONGTEXT "Controls the starting offset of the desaturation curve. Brightness values below this base will always be colorimetrically tone mapped (never desaturated)." -+ - #define TONEMAP_WARN_TEXT "Highlight clipped pixels" - #define TONEMAP_WARN_LONGTEXT "Debugging tool to indicate which pixels were clipped as part of the tone mapping process." - -@@ -171,6 +180,21 @@ static const char * const dither_text[] = { - #define DEPTH_TEXT "Dither depth override (0 = framebuffer depth)" - #define DEPTH_LONGTEXT "Overrides the detected framebuffer depth. Useful to dither to lower bit depths than otherwise required." - -+ -+#if PL_API_VER >= 10 -+#define add_desat_params() \ -+ add_float("desat-strength", pl_color_map_default_params.desaturation_strength, \ -+ DESAT_STRENGTH_TEXT, DESAT_STRENGTH_LONGTEXT, false) \ -+ add_float("desat-exponent", pl_color_map_default_params.desaturation_exponent, \ -+ DESAT_EXPONENT_TEXT, DESAT_EXPONENT_LONGTEXT, false) \ -+ add_float("desat-base", pl_color_map_default_params.desaturation_base, \ -+ DESAT_BASE_TEXT, DESAT_BASE_LONGTEXT, false) -+#else -+#define add_desat_params() \ -+ add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \ -+ TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) -+#endif -+ - #define add_glopts_placebo() \ - set_section("Colorspace conversion", NULL) \ - add_integer("rendering-intent", pl_color_map_default_params.intent, \ -@@ -184,10 +208,9 @@ static const char * const dither_text[] = { - add_integer("tone-mapping", PL_TONE_MAPPING_HABLE, \ - TONEMAPPING_TEXT, TONEMAPPING_LONGTEXT, false) \ - change_integer_list(tone_values, tone_text) \ -+ add_desat_params() \ - add_float("tone-mapping-param", pl_color_map_default_params.tone_mapping_param, \ - TONEMAP_PARAM_TEXT, TONEMAP_PARAM_LONGTEXT, true) \ -- add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \ -- TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) \ - add_bool("tone-mapping-warn", false, TONEMAP_WARN_TEXT, TONEMAP_WARN_LONGTEXT, false) \ - set_section("Dithering", NULL) \ - add_integer("dither-algo", -1, DITHER_TEXT, DITHER_LONGTEXT, false) \ --- -2.24.1 - diff --git a/recent_srt_fix.patch b/recent_srt_fix.patch new file mode 100644 index 0000000..b6c4fa1 --- /dev/null +++ b/recent_srt_fix.patch @@ -0,0 +1,25 @@ +--- a/modules/access/srt.c ++++ b/modules/access/srt.c +@@ -165,7 +165,7 @@ + + /* Set latency */ + i_latency = var_InheritInteger( p_stream, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + psz_passphrase = var_InheritString( p_stream, "passphrase" ); + +--- a/modules/access_output/srt.c ++++ b/modules/access_output/srt.c +@@ -162,7 +162,7 @@ + + /* Set latency */ + i_latency = var_InheritInteger( p_access, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') + + diff --git a/replace_deprecated_luaL_checkint.patch b/replace_deprecated_luaL_checkint.patch deleted file mode 100644 index 3759d96..0000000 --- a/replace_deprecated_luaL_checkint.patch +++ /dev/null @@ -1,261 +0,0 @@ -From f90c88f72b87111992cb793d5d203a5d4aab97d4 Mon Sep 17 00:00:00 2001 -From: Leigh Scott -Date: Tue, 30 Jun 2020 20:05:31 +0100 -Subject: [PATCH] lua: replace deprecated luaL_checkint with luaL_checkinteger - ---- - modules/lua/demux.c | 4 ++-- - modules/lua/libs/dialog.c | 14 +++++++------- - modules/lua/libs/io.c | 2 +- - modules/lua/libs/net.c | 16 ++++++++-------- - modules/lua/libs/osd.c | 4 ++-- - modules/lua/libs/playlist.c | 10 +++++----- - modules/lua/libs/stream.c | 2 +- - modules/lua/libs/volume.c | 2 +- - 8 files changed, 27 insertions(+), 27 deletions(-) - -diff --git a/modules/lua/demux.c b/modules/lua/demux.c -index a4ea3af1aa..aec774af46 100644 ---- a/modules/lua/demux.c -+++ b/modules/lua/demux.c -@@ -52,7 +52,7 @@ struct vlclua_playlist - static int vlclua_demux_peek( lua_State *L ) - { - stream_t *s = (stream_t *)vlclua_get_this(L); -- int n = luaL_checkint( L, 1 ); -+ int n = luaL_checkinteger( L, 1 ); - const uint8_t *p_peek; - - ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n); -@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State *L ) - static int vlclua_demux_read( lua_State *L ) - { - stream_t *s = (stream_t *)vlclua_get_this(L); -- int n = luaL_checkint( L, 1 ); -+ int n = luaL_checkinteger( L, 1 ); - char *buf = malloc(n); - - if (buf != NULL) -diff --git a/modules/lua/libs/dialog.c b/modules/lua/libs/dialog.c -index 488b032226..8c1ab2c339 100644 ---- a/modules/lua/libs/dialog.c -+++ b/modules/lua/libs/dialog.c -@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_State *L ) - /* Read entry in the Lua registry */ - lua_pushlightuserdata( L, (void*) &key_update ); - lua_gettable( L, LUA_REGISTRYINDEX ); -- return luaL_checkint( L, -1 ); -+ return luaL_checkinteger( L, -1 ); - } - - /** Manually update a dialog -@@ -573,22 +573,22 @@ static int vlclua_create_widget_inner( lua_State *L, int i_args, - - /* Set common arguments: col, row, hspan, vspan, width, height */ - if( lua_isnumber( L, arg ) ) -- p_widget->i_column = luaL_checkint( L, arg ); -+ p_widget->i_column = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_row = luaL_checkint( L, arg ); -+ p_widget->i_row = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_horiz_span = luaL_checkint( L, arg ); -+ p_widget->i_horiz_span = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_vert_span = luaL_checkint( L, arg ); -+ p_widget->i_vert_span = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_width = luaL_checkint( L, arg ); -+ p_widget->i_width = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_height = luaL_checkint( L, arg ); -+ p_widget->i_height = luaL_checkinteger( L, arg ); - else goto end_of_args; - - end_of_args: -diff --git a/modules/lua/libs/io.c b/modules/lua/libs/io.c -index c01cf7137d..12267e1822 100644 ---- a/modules/lua/libs/io.c -+++ b/modules/lua/libs/io.c -@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_State *L ) - const char* psz_mode = luaL_optstring( L, 2, NULL ); - if ( psz_mode != NULL ) - { -- long i_offset = luaL_optlong( L, 3, 0 ); -+ long i_offset = luaL_optinteger( L, 3, 0 ); - int i_mode; - if ( !strcmp( psz_mode, "set" ) ) - i_mode = SEEK_SET; -diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c -index 5e10ee4860..8feba3d7b5 100644 ---- a/modules/lua/libs/net.c -+++ b/modules/lua/libs/net.c -@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_State *L ) - { - vlc_object_t *p_this = vlclua_get_this( L ); - const char *psz_host = luaL_checkstring( L, 1 ); -- int i_port = luaL_checkint( L, 2 ); -+ int i_port = luaL_checkinteger( L, 2 ); - int *pi_fd = net_ListenTCP( p_this, psz_host, i_port ); - if( pi_fd == NULL ) - return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port ); -@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_State *L ) - { - vlc_object_t *p_this = vlclua_get_this( L ); - const char *psz_host = luaL_checkstring( L, 1 ); -- int i_port = luaL_checkint( L, 2 ); -+ int i_port = luaL_checkinteger( L, 2 ); - int i_fd = net_ConnectTCP( p_this, psz_host, i_port ); - lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) ); - return 1; -@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( lua_State *L ) - - static int vlclua_net_close( lua_State *L ) - { -- int i_fd = luaL_checkint( L, 1 ); -+ int i_fd = luaL_checkinteger( L, 1 ); - vlclua_fd_unmap_safe( L, i_fd ); - return 0; - } - - static int vlclua_net_send( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len; - const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); - -@@ -278,7 +278,7 @@ static int vlclua_net_send( lua_State *L ) - - static int vlclua_net_recv( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); - char psz_buffer[i_len]; - -@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L ) - lua_pushnil( L ); - for( int i = 0; lua_next( L, 1 ); i++ ) - { -- luafds[i] = luaL_checkint( L, -2 ); -+ luafds[i] = luaL_checkinteger( L, -2 ); - p_fds[i].fd = vlclua_fd_get( L, luafds[i] ); - p_fds[i].events = luaL_checkinteger( L, -1 ); - p_fds[i].events &= POLLIN | POLLOUT | POLLPRI; -@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L ) - #ifndef _WIN32 - static int vlclua_fd_write( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len; - const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); - -@@ -371,7 +371,7 @@ static int vlclua_fd_write( lua_State *L ) - - static int vlclua_fd_read( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); - char psz_buffer[i_len]; - -diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c -index 917e52eab6..6c75d92448 100644 ---- a/modules/lua/libs/osd.c -+++ b/modules/lua/libs/osd.c -@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_string( const char *psz_name ) - - static int vlclua_osd_slider( lua_State *L ) - { -- int i_position = luaL_checkint( L, 1 ); -+ int i_position = luaL_checkinteger( L, 1 ); - const char *psz_type = luaL_checkstring( L, 2 ); - int i_type = vlc_osd_slider_type_from_string( psz_type ); - int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD ); -@@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( lua_State *L ) - - static int vlclua_spu_channel_clear( lua_State *L ) - { -- int i_chan = luaL_checkint( L, 1 ); -+ int i_chan = luaL_checkinteger( L, 1 ); - input_thread_t *p_input = vlclua_get_input_internal( L ); - if( !p_input ) - return luaL_error( L, "Unable to find input." ); -diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c -index 5cf879ea7a..c6d42081c1 100644 ---- a/modules/lua/libs/playlist.c -+++ b/modules/lua/libs/playlist.c -@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_State * L ) - - static int vlclua_playlist_skip( lua_State * L ) - { -- int i_skip = luaL_checkint( L, 1 ); -+ int i_skip = luaL_checkinteger( L, 1 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - playlist_Skip( p_playlist, i_skip ); - return 0; -@@ -127,7 +127,7 @@ static int vlclua_playlist_random( lua_State * L ) - - static int vlclua_playlist_gotoitem( lua_State * L ) - { -- int i_id = luaL_checkint( L, 1 ); -+ int i_id = luaL_checkinteger( L, 1 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - PL_LOCK; - playlist_ViewPlay( p_playlist, NULL, -@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua_State * L ) - - static int vlclua_playlist_delete( lua_State * L ) - { -- int i_id = luaL_checkint( L, 1 ); -+ int i_id = luaL_checkinteger( L, 1 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - - PL_LOCK; -@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( lua_State * L ) - - static int vlclua_playlist_move( lua_State * L ) - { -- int i_item = luaL_checkint( L, 1 ); -- int i_target = luaL_checkint( L, 2 ); -+ int i_item = luaL_checkinteger( L, 1 ); -+ int i_target = luaL_checkinteger( L, 2 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - PL_LOCK; - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item ); -diff --git a/modules/lua/libs/stream.c b/modules/lua/libs/stream.c -index c682759838..c9713a223c 100644 ---- a/modules/lua/libs/stream.c -+++ b/modules/lua/libs/stream.c -@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State *L ) - { - int i_read; - stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" ); -- int n = luaL_checkint( L, 2 ); -+ int n = luaL_checkinteger( L, 2 ); - uint8_t *p_read = malloc( n ); - if( !p_read ) return vlclua_error( L ); - -diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c -index 81a6156c2a..a7dbe86465 100644 ---- a/modules/lua/libs/volume.c -+++ b/modules/lua/libs/volume.c -@@ -48,7 +48,7 @@ - static int vlclua_volume_set( lua_State *L ) - { - playlist_t *p_this = vlclua_get_playlist_internal( L ); -- int i_volume = luaL_checkint( L, 1 ); -+ int i_volume = luaL_checkinteger( L, 1 ); - if( i_volume < 0 ) - i_volume = 0; - int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT ); --- -2.26.2 - diff --git a/vlc.spec b/vlc.spec index c773e1e..15d1a8a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -71,6 +71,9 @@ Patch7: Switch-to-Fedora-lua-5.1.patch # Backport for 3.0 notifyd without gtk3 Patch9: notify-don-t-depend-on-any-GTK-version.patch +# Fix build issue with recent SRT library +# Based on https://git.videolan.org/?p=vlc.git;a=commit;h=6e8d77431127c482196115a6eeb769daf56347b3 +Patch10: recent_srt_fix.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -345,6 +348,7 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac %endif %patch9 -p1 +%patch10 -p1 %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :