commit 8110bab34b874db75504f23bfffe76c7cb50d64b Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Jun 30 20:46:38 2020 +0100 Add conditional replace_deprecated_luaL_checkint.patch | 261 +++++++++++++++++++++++++++++++++ vlc.spec | 5 + 2 files changed, 266 insertions(+) --- diff --git a/replace_deprecated_luaL_checkint.patch b/replace_deprecated_luaL_checkint.patch new file mode 100644 index 0000000..3759d96 --- /dev/null +++ b/replace_deprecated_luaL_checkint.patch @@ -0,0 +1,261 @@ +From f90c88f72b87111992cb793d5d203a5d4aab97d4 Mon Sep 17 00:00:00 2001 +From: Leigh Scott <leigh123linux(a)gmail.com&gt; +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 6b6ba17..2887a0a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -65,6 +65,8 @@ Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16. Patch1: 0001-vlc-3x-dvdread-nav-Fix-cases-where-DVD-_VERSION-are-.patch Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch Patch5: Lower-libgcrypt-to-1.5.3.patch +# Patch based on https://code.videolan.org/videolan/vlc/commit/0e0b070c26d197e848f1548fca4... +Patch6: replace_deprecated_luaL_checkint.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: fontpackages-devel @@ -324,6 +326,9 @@ sed -i -e 's/ header.channel_mapping,//' modules/codec/opus.c sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac . /opt/rh/devtoolset-%{dts_ver}/enable %endif +%if 0%{?fedora} +%patch6 -p1 +%endif %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :