[mpv] rebuild
by Leigh Scott
commit cde1930e55ce97ea7b0df14be2ba9d374197d40c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jun 30 21:14:28 2020 +0100
rebuild
mpv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mpv.spec b/mpv.spec
index 4ee714d..d20389b 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.32.0
-Release: 6%{?gitrelease}%{?dist}
+Release: 7%{?gitrelease}%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://mpv.io/
@@ -185,6 +185,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Tue Jun 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.32.0-7
+- rebuilt
+
* Wed Jun 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.32.0-6
- Enable vapoursynth (rfbz#5681)
4 years
[vlc] Add conditional
by Leigh Scott
commit 8110bab34b874db75504f23bfffe76c7cb50d64b
Author: Leigh Scott <leigh123linux(a)gmail.com>
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>
+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 || :
4 years
[vlc] Rebuilt
by Nicolas Chauvet
commit fb55b06a41c6661c3d3ce7dba631c8086b7b8e7d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 30 18:36:01 2020 +0200
Rebuilt
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 6cae8a1..6b6ba17 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -51,7 +51,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
@@ -588,6 +588,9 @@ fi || :
%changelog
+* Tue Jun 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.11-3
+- Rebuilt
+
* Wed Jun 24 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.11-2
- rebuilt
4 years
[libva-intel-driver/f31] (3 commits) ...Changelog
by Nicolas Chauvet
Summary of changes:
2ed725a... Switch to python3 (*)
e073536... Remove intel-vaapi-driver (*)
a0c8241... Changelog (*)
(*) This commit already existed in another branch; no separate mail sent
4 years
[libva-intel-driver] Changelog
by Nicolas Chauvet
commit a0c824146291aa1a90792e022bd57b75cedc7213
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 30 16:57:41 2020 +0200
Changelog
libva-intel-driver.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index 02207fd..5b7dfd3 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -5,7 +5,7 @@
Name: libva-intel-driver
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: HW video decode support for Intel integrated graphics
License: MIT and EPL
URL: https://github.com/intel/intel-vaapi-driver
@@ -90,6 +90,9 @@ fn=%{buildroot}%{_datadir}/appdata/intel-vaapi-driver.metainfo.xml
%changelog
+* Tue Jun 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-2
+- Bump
+
* Mon Jun 08 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-1
- Update to 2.4.1
4 years
[libva-intel-driver] Remove intel-vaapi-driver
by Nicolas Chauvet
commit e073536be08e00e4fccd2db171d7d46e5b1c7ba1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 30 16:57:18 2020 +0200
Remove intel-vaapi-driver
libva-intel-driver.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index a6b6724..02207fd 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -22,7 +22,9 @@ BuildRequires: python3
BuildRequires: libappstream-glib >= 0.6.3
#Renamed when moved to 01.org
-Provides: intel-vaapi-driver = %{version}-%{release}
+Provides: intel-vaapi-driver = 1:%{version}-%{release}
+# Once again repo war! so it's on purpose
+Obsoletes: intel-vaapi-driver
%{?_with_gen4asm:BuildRequires: pkgconfig(intel-gen4asm)}
BuildRequires: systemd
4 years
[libva-intel-driver/el8] Changelog
by Nicolas Chauvet
commit d80a5aafe00450ac1ad391dc6246ebec40087cfb
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 30 16:57:41 2020 +0200
Changelog
libva-intel-driver.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index 9b98b49..6a966c2 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -5,7 +5,7 @@
Name: libva-intel-driver
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: HW video decode support for Intel integrated graphics
License: MIT and EPL
URL: https://github.com/intel/intel-vaapi-driver
@@ -90,6 +90,9 @@ fn=%{buildroot}%{_datadir}/appdata/intel-vaapi-driver.metainfo.xml
%changelog
+* Tue Jun 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-2
+- Bump
+
* Mon Jun 08 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-1
- Update to 2.4.1
4 years
[libva-intel-driver/el8] Remove intel-vaapi-driver
by Nicolas Chauvet
commit 1d40a8e6994f7e96770ed74d4bbfce519c0fbb55
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 30 16:57:18 2020 +0200
Remove intel-vaapi-driver
libva-intel-driver.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index 1c53d37..9b98b49 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -22,7 +22,9 @@ BuildRequires: python3
BuildRequires: libappstream-glib >= 0.6.3
#Renamed when moved to 01.org
-Provides: intel-vaapi-driver = %{version}-%{release}
+Provides: intel-vaapi-driver = 1:%{version}-%{release}
+# Once again repo war! so it's on purpose
+Obsoletes: intel-vaapi-driver
%{?_with_gen4asm:BuildRequires: pkgconfig(intel-gen4asm)}
BuildRequires: systemd
4 years
[shotcut] Revert "Update to 20.06.28"
by Leigh Scott
commit 1127a358e64619d59256fa84a6f1a99ada74d766
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jun 30 12:00:59 2020 +0100
Revert "Update to 20.06.28"
This reverts commit 6f1cbe0effb906da3180da9e75e51d3842928bc8.
shotcut.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/shotcut.spec b/shotcut.spec
index 59d132b..0c5e05b 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -39,10 +39,6 @@ BuildRequires: pkgconfig(mlt++) >= 6.20.0
BuildRequires: pkgconfig(mlt-framework) >= 6.20.0
BuildRequires: x264-devel
BuildRequires: webvfx-devel
-%if 0%{?fedora} >= 33
-BuildRequires: gstreamer1-devel
-BuildRequires: gstreamer1-plugins-base-devel
-%endif
# mlt-freeworld is compellingly necessary otherwise shotcut coredumps
Requires: qt5-qtquickcontrols
4 years
