Updating link to change in openSUSE:Factory/vlc revision 124.0
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=1d7e87d6e3085599e401b22df1e85bc9
This commit is contained in:
OBS User buildservice-autocommit
Git OBS Bridge
parent
384d35e908
commit
f3d667ce3b
@ -1,13 +1,263 @@
|
||||
Index: vlc-3.0.2/modules/lua/libs/io.c
|
||||
From 0e0b070c26d197e848f1548fca455bf97db471a3 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Bergdoll <lukas.bergdoll@gmail.com>
|
||||
Date: Sat, 17 Nov 2018 13:53:27 +0100
|
||||
Subject: [PATCH] lua: replace deprecated luaL_checkint with luaL_checkinteger
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Acked-by: Shaleen Jain <shaleen@jain.sh>
|
||||
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
|
||||
---
|
||||
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(-)
|
||||
|
||||
Index: vlc-3.0.17.4/modules/lua/demux.c
|
||||
===================================================================
|
||||
--- vlc-3.0.2.orig/modules/lua/libs/io.c
|
||||
+++ vlc-3.0.2/modules/lua/libs/io.c
|
||||
--- vlc-3.0.17.4.orig/modules/lua/demux.c
|
||||
+++ vlc-3.0.17.4/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
|
||||
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)
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/dialog.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/dialog.c
|
||||
+++ vlc-3.0.17.4/modules/lua/libs/dialog.c
|
||||
@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_Stat
|
||||
/* 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( l
|
||||
|
||||
/* 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:
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/io.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/io.c
|
||||
+++ vlc-3.0.17.4/modules/lua/libs/io.c
|
||||
@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_Stat
|
||||
const char* psz_mode = luaL_optstring( L, 2, NULL );
|
||||
if ( psz_mode != NULL )
|
||||
{
|
||||
- long i_offset = luaL_optlong( L, 3, 0 );
|
||||
+ long i_offset = (long) luaL_optinteger(L, 3, 0);
|
||||
+ long i_offset = luaL_optinteger( L, 3, 0 );
|
||||
int i_mode;
|
||||
if ( !strcmp( psz_mode, "set" ) )
|
||||
i_mode = SEEK_SET;
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/net.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/net.c
|
||||
+++ vlc-3.0.17.4/modules/lua/libs/net.c
|
||||
@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_St
|
||||
{
|
||||
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_S
|
||||
{
|
||||
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_S
|
||||
|
||||
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];
|
||||
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/osd.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/osd.c
|
||||
+++ vlc-3.0.17.4/modules/lua/libs/osd.c
|
||||
@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_stri
|
||||
|
||||
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(
|
||||
|
||||
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." );
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/playlist.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/playlist.c
|
||||
+++ vlc-3.0.17.4/modules/lua/libs/playlist.c
|
||||
@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_Sta
|
||||
|
||||
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_S
|
||||
|
||||
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
|
||||
|
||||
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_S
|
||||
|
||||
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 );
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/stream.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/stream.c
|
||||
+++ vlc-3.0.17.4/modules/lua/libs/stream.c
|
||||
@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State
|
||||
{
|
||||
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 );
|
||||
|
||||
Index: vlc-3.0.17.4/modules/lua/libs/volume.c
|
||||
===================================================================
|
||||
--- vlc-3.0.17.4.orig/modules/lua/libs/volume.c
|
||||
+++ vlc-3.0.17.4/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 );
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 16:40:48 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Extend vlc-lua-5.3.patch: match upstream commit 0e0b070c26.
|
||||
- Add 867.patch: support LUA 5.4 (boo#1200944).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 23 10:14:07 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
11
vlc.spec
11
vlc.spec
@ -49,10 +49,11 @@ Patch0: vlc.a52.patch
|
||||
Patch1: vlc-allow-deprecated-fribidi.patch
|
||||
# PATCH-FIX-UPSTREAM vlc-lua-5.3.patch dimstar@opensuse.org -- Replace lua_optlong with lua_optinteger
|
||||
Patch2: vlc-lua-5.3.patch
|
||||
Patch3: 867.patch
|
||||
# PATCH-FIX-UPSTREAM fix-build-with-fdk-2.0.patch -- Fix building vlc with libfdk-aac v2
|
||||
Patch3: fix-build-with-fdk-2.0.patch
|
||||
Patch4: fix-build-with-fdk-2.0.patch
|
||||
# PATCH-FIX-UPSTREAM vlc-dav1d-1.0.patch -- Fix build with dav1d 1.0
|
||||
Patch4: vlc-dav1d-1.0.patch
|
||||
Patch5: vlc-dav1d-1.0.patch
|
||||
# PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant
|
||||
Patch100: vlc-projectM-qt5.patch
|
||||
# PATCH-FIX-UPSTREAM -- Use OpenCV C++ API
|
||||
@ -311,7 +312,6 @@ Summary: Translations for package %{name}
|
||||
# We do not want to require vlc, which is GUI based, but only vlc-noX
|
||||
Group: System/Localization
|
||||
Requires: %{name}-noX = %{version}
|
||||
Supplements: packageand(bundle-lang-other:%{name}-noX)
|
||||
Provides: %{name}-lang-all = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
@ -404,8 +404,8 @@ OpenCV based video filters and a face detection example.
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
|
||||
%patch100 -p1
|
||||
%endif
|
||||
@ -419,9 +419,8 @@ fi
|
||||
|
||||
### And LUA 5.3.1 has some more API changes
|
||||
if pkg-config --atleast-version 5.3.1 lua; then
|
||||
sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
|
||||
modules/lua/{demux,libs/{configuration,dialog,net,osd,playlist,stream,variables,volume}}.c
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
fi
|
||||
|
||||
# We do not rely on contrib but make use of system libraries
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user