Page MenuHomeSolus
Files F11048816

D10386.id24983.diff
No OneTemporary
Actions

D10386.id24983.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -69,7 +69,7 @@
libnotify.so.4
libogg.so.0
libopus.so.0
-libplacebo.so.72
+libplacebo.so.104
libpng16.so.16
libpostproc.so.55
libprotobuf-lite.so.23
@@ -83,6 +83,7 @@
libsoxr.so.0
libspeex.so.1
libspeexdsp.so.1
+libsrt.so.1
libssh2.so.1
libstdc++.so.6
libswscale.so.5
diff --git a/files/Fix-build-error-with-libsrt-1.4.2.patch b/files/Fix-build-error-with-libsrt-1.4.2.patch
new file mode 100644
--- /dev/null
+++ b/files/Fix-build-error-with-libsrt-1.4.2.patch
@@ -0,0 +1,39 @@
+From 14d2b1a1deb2ae591b369eb1f447fd0e39d3d1d6 Mon Sep 17 00:00:00 2001
+From: Alexander Vorobyev <avorobyev@protonmail.com>
+Date: Wed, 18 Nov 2020 12:58:35 +0300
+Subject: Fix build error with libsrt 1.4.2
+
+---
+ modules/access/srt.c | 2 +-
+ modules/access_output/srt.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/access/srt.c b/modules/access/srt.c
+index c74ef75a08..8cfb9e461a 100644
+--- a/modules/access/srt.c
++++ b/modules/access/srt.c
+@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(stream_t *p_stream)
+
+ /* 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" );
+diff --git a/modules/access_output/srt.c b/modules/access_output/srt.c
+index f76bf52302..9080fed444 100644
+--- a/modules/access_output/srt.c
++++ b/modules/access_output/srt.c
+@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_access_out_t *p_access)
+
+ /* 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')
+--
+2.29.2
+
diff --git a/files/qt-add-missing-include-for-QPainterPath.patch b/files/qt-add-missing-include-for-QPainterPath.patch
deleted file mode 100644
--- a/files/qt-add-missing-include-for-QPainterPath.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 4f899efc13a3a8f5259ce260655dfdd6f4830299 Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni@videolabs.io>
-Date: Fri, 28 Aug 2020 10:08:37 +0200
-Subject: [PATCH] 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 <QPainter>
-+#include <QPainterPath>
- #include <QRect>
- #include <QStyleOptionViewItem>
- #include <QFontMetrics>
-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 <QApplication>
- #include <QPainter>
--#include <QPainterPath>
- #include <QBitmap>
- #include <QFontMetrics>
- #include <QDesktopWidget>
-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 <QWidget>
-+#include <QPainterPath>
-
- class TimeTooltip : public QWidget
- {
---
-GitLab
-
diff --git a/files/qt-fix-missing-header-when-compiling-with-Qt-5.15.patch b/files/qt-fix-missing-header-when-compiling-with-Qt-5.15.patch
deleted file mode 100644
--- a/files/qt-fix-missing-header-when-compiling-with-Qt-5.15.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 85aa32db726559743d08d2fcafbb90fc923c43ff Mon Sep 17 00:00:00 2001
-From: Pierre Lamot <pierre@videolabs.io>
-Date: Wed, 27 May 2020 11:05:53 +0200
-Subject: [PATCH] qt: fix missing header when compiling with Qt 5.15
-
-Cherry-picked from commit 0e88143ed2fe8eedfa4d3afdafcd0df901644c1d.
-
-Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
----
- 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 <QSplitter>
- #include <QToolButton>
- #include <QStackedWidget>
-+#include <QPainterPath>
-
- //match the image source (width/height)
- #define SCORE_ICON_WIDTH_SCALE 4
---
-GitLab
-
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,3 +1,2 @@
lua53_compat.patch
-qt-fix-missing-header-when-compiling-with-Qt-5.15.patch
-qt-add-missing-include-for-QPainterPath.patch
+Fix-build-error-with-libsrt-1.4.2.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : vlc
-version : 3.0.11.1
-release : 121
+version : 3.0.12
+release : 122
source :
- - https://download.videolan.org/pub/videolan/vlc/3.0.11.1/vlc-3.0.11.1.tar.xz : 189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8
+ - https://download.videolan.org/pub/videolan/vlc/3.0.12/vlc-3.0.12.tar.xz : eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879
license :
- GPL-2.0-or-later
- LGPL-2.1-or-later
@@ -17,8 +17,8 @@
- pkgconfig(alsa)
- pkgconfig(avahi-client)
- pkgconfig(dav1d)
- - pkgconfig(dcadec)
- pkgconfig(dvdnav)
+ - pkgconfig(faad2)
- pkgconfig(flac)
- pkgconfig(fluidsynth)
- pkgconfig(gnutls)
@@ -34,6 +34,7 @@
- pkgconfig(libchromaprint)
- pkgconfig(libdc1394-2)
- pkgconfig(libdvbpsi)
+ - pkgconfig(libgcrypt)
- pkgconfig(libidn2)
- pkgconfig(libmatroska)
- pkgconfig(libmodplug)
@@ -59,6 +60,7 @@
- pkgconfig(sndfile)
- pkgconfig(soxr)
- pkgconfig(speexdsp)
+ - pkgconfig(srt)
- pkgconfig(taglib)
- pkgconfig(theora)
- pkgconfig(twolame)
@@ -73,9 +75,7 @@
- pkgconfig(xi)
- pkgconfig(xpm)
- pkgconfig(xproto)
- - faad-devel
- liba52dec-devel
- - libgcrypt-devel
- live-media-devel
setup : |
export BUILDCC="$CC"
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>vlc</Name>
<Packager>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Alexander Vorobyev</Name>
+ <Email>avorobyev@protonmail.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<License>LGPL-2.1-or-later</License>
@@ -80,6 +80,7 @@
<Path fileType="library">/usr/lib64/vlc/plugins/access/libaccess_mms_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libaccess_mtp_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libaccess_realrtsp_plugin.so</Path>
+ <Path fileType="library">/usr/lib64/vlc/plugins/access/libaccess_srt_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libattachment_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libavio_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libcdda_plugin.so</Path>
@@ -98,6 +99,7 @@
<Path fileType="library">/usr/lib64/vlc/plugins/access/liblinsys_hdsdi_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/liblive555_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libpulsesrc_plugin.so</Path>
+ <Path fileType="library">/usr/lib64/vlc/plugins/access/librist_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/librtp_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libsatip_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access/libsdp_plugin.so</Path>
@@ -115,7 +117,9 @@
<Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_file_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_http_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so</Path>
+ <Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_rist_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_shout_plugin.so</Path>
+ <Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_srt_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/access_output/libaccess_output_udp_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/audio_filter/libaudio_format_plugin.so</Path>
<Path fileType="library">/usr/lib64/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so</Path>
@@ -663,7 +667,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="121">vlc</Dependency>
+ <Dependency release="122">vlc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/vlc/deprecated.h</Path>
@@ -771,12 +775,12 @@
</Files>
</Package>
<History>
- <Update release="121">
- <Date>2020-12-27</Date>
- <Version>3.0.11.1</Version>
+ <Update release="122">
+ <Date>2021-01-18</Date>
+ <Version>3.0.12</Version>
<Comment>Packaging update</Comment>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Alexander Vorobyev</Name>
+ <Email>avorobyev@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 5:00 PM (2 h, 54 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5804948
Default Alt Text
D10386.id24983.diff (10 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.