rpms/vlc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt by autoport with build requirements: libx265-devel>=3.6-1mamba [release 3.0.20-2mamba;Sat May 04 2024]

Browse Source
This commit is contained in:
Automatic Build System 2024-05-07 11:18:49 +02:00
parent 74f1e34c3d
commit 4186e1314d
13 changed files with 13 additions and 652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlc-1.1.4.1-upnp-1.6.7.patch
View File

@ -1,12 +0,0 @@
diff -Nru vlc-1.1.4.1.orig//modules/services_discovery/upnp_intel.cpp vlc-1.1.4.1/modules/services_discovery/upnp_intel.cpp
--- vlc-1.1.4.1.orig//modules/services_discovery/upnp_intel.cpp 2010-09-24 11:32:00.000000000 +0200
+++ vlc-1.1.4.1/modules/services_discovery/upnp_intel.cpp 2010-10-30 19:14:34.172283121 +0200
@@ -35,7 +35,7 @@
#endif
#include "upnp_intel.hpp"
-
+#include <assert.h>
#include <vlc_plugin.h>
#include <vlc_services_discovery.h>

12
vlc-1.1.7-jack_autoconnect_true.patch
View File

@ -1,12 +0,0 @@
diff -Nru vlc-1.1.7.orig//modules/audio_output/jack.c vlc-1.1.7/modules/audio_output/jack.c
--- vlc-1.1.7.orig//modules/audio_output/jack.c 2010-06-11 16:46:11.000000000 +0200
+++ vlc-1.1.7/modules/audio_output/jack.c 2011-03-20 20:40:14.004224068 +0100
@@ -87,7 +87,7 @@
set_capability( "audio output", 100 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
- add_bool( AUTO_CONNECT_OPTION, false, NULL, AUTO_CONNECT_TEXT,
+ add_bool( AUTO_CONNECT_OPTION, true, NULL, AUTO_CONNECT_TEXT,
AUTO_CONNECT_LONGTEXT, true )
add_string( CONNECT_REGEX_OPTION, NULL, NULL, CONNECT_REGEX_TEXT,
CONNECT_REGEX_LONGTEXT, true )

12
vlc-2.0.1-freetype.patch
View File

@ -1,12 +0,0 @@
diff -Nru vlc-1.1.10.orig//modules/text_renderer/freetype.c vlc-1.1.10/modules/text_renderer/freetype.c
--- vlc-1.1.10.orig//modules/text_renderer/freetype.c 2011-06-06 01:31:20.000000000 +0200
+++ vlc-1.1.10/modules/text_renderer/freetype.c 2011-06-14 20:59:41.495983590 +0200
@@ -55,7 +55,7 @@
# define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
# define DEFAULT_FAMILY "Nokia Sans Bold"
#else
-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf"
# define DEFAULT_FAMILY "Serif Bold"
#endif

131
vlc-2.0.3-lua-5.2.patch
View File

@ -1,131 +0,0 @@
From a957114421fd2e875432e5fde0448ffc1ae60cfd Mon Sep 17 00:00:00 2001
From: Kelly Anderson <kelly@silka.with-linux.com>
Date: Thu, 5 Jan 2012 06:23:35 -0700
Subject: [PATCH] Cleanup lua script escape sequences for lua 5.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Converting \ to %, since 5.2 no longer accepts \.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---
share/lua/extensions/imdb.lua | 2 +-
share/lua/playlist/appletrailers.lua | 6 +++---
share/lua/playlist/extreme.lua | 10 +++++-----
share/lua/playlist/katsomo.lua | 2 +-
share/lua/playlist/mpora.lua | 4 ++--
share/lua/playlist/pinkbike.lua | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/share/lua/playlist/appletrailers.lua b/share/lua/playlist/appletrailers.lua
index 8bd4bea..4d0f5e7 100644
--- a/share/lua/playlist/appletrailers.lua
+++ b/share/lua/playlist/appletrailers.lua
@@ -67,7 +67,7 @@ function parse()
description = find( line, "h%d.->(.-)</h%d") .. ' '
end
if string.match( line, 'img src=') then
- for img in string.gmatch(line, '<img src="(http://.*\.jpg)" ') do
+ for img in string.gmatch(line, '<img src="(http://.*%.jpg)" ') do
art_url = img
end
for i,value in pairs(playlist) do
@@ -76,8 +76,8 @@ function parse()
else break end
end
end
- if string.match( line, "class=\"hd\".-\.mov") then
- for urlline,resolution in string.gmatch(line, "class=\"hd\".-href=\"(.-.mov)\".-(%d+.-p)") do
+ if string.match( line, 'class="hd".-%.mov') then
+ for urlline,resolution in string.gmatch(line, 'class="hd".-href="(.-%.mov)".-(%d+.-p)') do
urlline = string.gsub( urlline, "_"..resolution, "_h"..resolution )
table.insert( playlist, { path = urlline,
name = description .. '(' .. resolution .. ')',
diff --git a/share/lua/playlist/extreme.lua b/share/lua/playlist/extreme.lua
index 6fd7251..f5949ce 100644
--- a/share/lua/playlist/extreme.lua
+++ b/share/lua/playlist/extreme.lua
@@ -34,14 +34,14 @@ end
-- Probe function.
function probe()
return vlc.access == "http"
- and string.match( vlc.path, "extreme.com/." )
- or string.match( vlc.path, "freecaster.tv/." )
- or string.match( vlc.path, "player.extreme.com/info/.")
+ and string.match( vlc.path, "extreme%.com/." )
+ or string.match( vlc.path, "freecaster%.tv/." )
+ or string.match( vlc.path, "player%.extreme%.com/info/.")
end
-- Parse function.
function parse()
- if (string.match( vlc.path, "extreme\.com/." ) or string.match( vlc.path, "freecaster\.tv/." )) and not string.match( vlc.path, "player.extreme.com/info/") then
+ if (string.match( vlc.path, "extreme%.com/." ) or string.match( vlc.path, "freecaster%.tv/." )) and not string.match( vlc.path, "player%.extreme%.com/info/") then
while true do
line = vlc.readline()
if not line then break end
@@ -54,7 +54,7 @@ function parse()
return { { path = "http://player.extreme.com/info/" .. vid; name = "extreme.com video"; } }
end
- if string.match( vlc.path, "player.extreme.com/info/." ) then
+ if string.match( vlc.path, "player%.extreme%.com/info/." ) then
prefres = get_prefres()
gostraight = true
while true do
diff --git a/share/lua/playlist/katsomo.lua b/share/lua/playlist/katsomo.lua
index bf461c7..6965e4e 100644
--- a/share/lua/playlist/katsomo.lua
+++ b/share/lua/playlist/katsomo.lua
@@ -57,7 +57,7 @@ function parse()
then
arturl = "http://www.katsomo.fi"..find( line, " src=\"(.-)\" alt=" )
end
- for treeid,name in string.gmatch( line, "/\?treeId=(%d+)\">([^<]+)</a") do
+ for treeid,name in string.gmatch( line, '/%?treeId=(%d+)">([^<]+)</a') do
name = vlc.strings.resolve_xml_special_chars( name )
name = vlc.strings.from_charset( "ISO_8859-1", name )
path = "http://www.katsomo.fi/?treeId="..treeid
diff --git a/share/lua/playlist/mpora.lua b/share/lua/playlist/mpora.lua
index cfee5d0..d48c1e6 100644
--- a/share/lua/playlist/mpora.lua
+++ b/share/lua/playlist/mpora.lua
@@ -23,7 +23,7 @@
-- Probe function.
function probe()
return vlc.access == "http"
- and string.match( vlc.path, "video.mpora.com/watch/" )
+ and string.match( vlc.path, "video%.mpora%.com/watch/" )
end
-- Parse function.
@@ -40,7 +40,7 @@ function parse()
_,_,arturl = string.find( line, "image_src\" href=\"(.*)\" />" )
end
if string.match( line, "video_src" ) then
- _,_,video = string.find( line, "href=\"http://video\.mpora\.com/ep/(.*).swf\" />" )
+ _,_,video = string.find( line, 'href="http://video%.mpora%.com/ep/(.*)%.swf" />' )
end
end
diff --git a/share/lua/playlist/pinkbike.lua b/share/lua/playlist/pinkbike.lua
index 06105d7..f6787c8 100644
--- a/share/lua/playlist/pinkbike.lua
+++ b/share/lua/playlist/pinkbike.lua
@@ -45,10 +45,10 @@ function parse()
end
-- Try to find server which has our video
if string.match( line, "<link rel=\"videothumbnail\" href=\"http://(.*)/vt/svt-") then
- _,_,server = string.find (line, "<link rel=\"videothumbnail\"\ href=\"http://(.*)/vt/svt-" )
+ _,_,server = string.find (line, '<link rel="videothumbnail" href="http://(.*)/vt/svt-' )
end
if string.match( line, "<link rel=\"videothumbnail\" href=\"(.*)\" type=\"image/jpeg\"") then
- _,_,arturl = string.find (line, "<link rel=\"videothumbnail\" href=\"(.*)\"\ type=\"image/jpeg\"")
+ _,_,arturl = string.find (line, '<link rel="videothumbnail" href="(.*)" type="image/jpeg"')
end
end
--
1.7.10

38
vlc-2.0.7-libflac-1.3.0.patch
View File

@ -1,38 +0,0 @@
From 607065b410b4768372c204ccdbbca200230fff25 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Wed, 2 Jan 2013 22:44:33 +0100
Subject: [PATCH] Fix build with unreleased FLAC 1.3.x
The issue was initialy reported here:
http://bugzilla.redhat.com/891123
FLAC upstream has always expected to include <FLAC/ suffix
for included headers as shown in examples/c/decode/file/main.c
The FLAC suffix will not be be made available in the flac.pc
for the next release:
http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.html
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/codec/flac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 4cfbfa9..543e8bb 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -37,8 +37,8 @@
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <stream_decoder.h>
-#include <stream_encoder.h>
+#include <FLAC/stream_decoder.h>
+#include <FLAC/stream_encoder.h>
#include <vlc_block_helper.h>
#include <vlc_bits.h>
--
1.7.10.4

28
vlc-2.0.7-libva-1.2.patch
View File

@ -1,28 +0,0 @@
From 4674d6590ae9cd38567f00d555eaeff67528618f Mon Sep 17 00:00:00 2001
From: Armin K <krejzi@email.com>
Date: Sat, 29 Jun 2013 12:16:16 +0200
Subject: [PATCH] vaapi: Switch to compat api for VA-API 0.34.0
Fixes build with libva 1.2.x untill VLC VA-API
module is ported to the new API.
---
modules/codec/avcodec/vaapi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 893ea15..5871249 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -36,6 +36,9 @@
#include <libavcodec/vaapi.h>
#include <X11/Xlib.h>
#include <va/va_x11.h>
+#if VA_MINOR_VERSION >= 34
+# include <va/va_compat.h>
+#endif
#include "avcodec.h"
#include "va.h"
--
1.8.3.1

30
vlc-2.2.2-lua-5.3.patch
View File

@ -1,30 +0,0 @@
commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
Author: Vinson Lee <vlee@freedesktop.org>
Date: Thu Feb 5 14:48:53 2015 -0800
lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
In Lua 5.3.0, luaL_checkint was deprecated.
This patch fixes this build error with Lua 5.3.0.
lua/demux.c: In function ‘vlclua_demux_peek’:
lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
int n = luaL_checkint( L, 1 );
^
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index efd94f1..85c7fc1 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -38,6 +38,7 @@
#include <vlc_stream.h>
#include <vlc_demux.h>
+#define LUA_COMPAT_APIINTCASTS
#define LUA_COMPAT_MODULE
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */

34
vlc-2.2.2-no-qt5-check.patch
View File

@ -1,34 +0,0 @@
--- vlc-2.2.2/configure.orig 2016-02-14 21:03:20.506473555 +0100
+++ vlc-2.2.2/configure 2016-02-14 21:03:31.066438070 +0100
@@ -49179,18 +49179,6 @@
fi
fi
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.0 Qt5Core < 5.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.5.0 Qt5Core < 5.6.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- as_fn_error $? "\"You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c\"" "$LINENO" 5
-
-fi
-
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
for ac_prog in moc-qt5 moc
--- vlc-2.2.2/configure.ac.orig 2016-04-15 16:52:28.646023118 +0200
+++ vlc-2.2.2/configure.ac 2016-04-15 16:53:10.962987772 +0200
@@ -3754,10 +3754,6 @@
AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
])
- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
- ])
-
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])

183
vlc-2.2.4-qt5-5.7.0-atomic.patch
View File

@ -1,183 +0,0 @@
diff -ru vlc-2.2.4/modules/gui/qt4/actions_manager.cpp vlc-2.2.4.patched/modules/gui/qt4/actions_manager.cpp
--- vlc-2.2.4/modules/gui/qt4/actions_manager.cpp 2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/actions_manager.cpp 2016-07-13 01:29:46.334802354 +0200
@@ -25,10 +25,11 @@
# include "config.h"
#endif
+#include "actions_manager.hpp"
+
#include <vlc_vout.h>
#include <vlc_keys.h>
-#include "actions_manager.hpp"
#include "dialogs_provider.hpp" /* Opening Dialogs */
#include "input_manager.hpp" /* THEMIM */
diff -ru vlc-2.2.4/modules/gui/qt4/adapters/seekpoints.hpp vlc-2.2.4.patched/modules/gui/qt4/adapters/seekpoints.hpp
--- vlc-2.2.4/modules/gui/qt4/adapters/seekpoints.hpp 2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/adapters/seekpoints.hpp 2016-07-13 01:36:11.476820842 +0200
@@ -26,14 +26,14 @@
#include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_interface.h>
-#include <vlc_input.h>
-
#include <QObject>
#include <QList>
#include <QMutex>
+#include <vlc_common.h>
+#include <vlc_interface.h>
+#include <vlc_input.h>
+
class SeekPoint
{
public:
diff -ru vlc-2.2.4/modules/gui/qt4/components/controller.cpp vlc-2.2.4.patched/modules/gui/qt4/components/controller.cpp
--- vlc-2.2.4/modules/gui/qt4/components/controller.cpp 2016-04-25 18:02:43.000000000 +0200
+++ vlc-2.2.4.patched/modules/gui/qt4/components/controller.cpp 2016-07-13 01:34:10.335122301 +0200
@@ -26,6 +26,12 @@
# include "config.h"
#endif
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QRegion>
+#include <QSignalMapper>
+#include <QTimer>
+
#include <vlc_vout.h> /* vout_thread_t for FSC */
/* Widgets */
diff -ru vlc-2.2.4/modules/gui/qt4/components/playlist/playlist_model.hpp vlc-2.2.4.patched/modules/gui/qt4/components/playlist/playlist_model.hpp
--- vlc-2.2.4/modules/gui/qt4/components/playlist/playlist_model.hpp 2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/components/playlist/playlist_model.hpp 2016-07-13 01:38:39.097459814 +0200
@@ -29,11 +29,6 @@
# include "config.h"
#endif
-#include <vlc_input.h>
-#include <vlc_playlist.h>
-#include "vlc_model.hpp"
-#include "playlist_item.hpp"
-
#include <QObject>
#include <QEvent>
#include <QSignalMapper>
@@ -43,6 +38,12 @@
#include <QModelIndex>
#include <QAction>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+#include "vlc_model.hpp"
+#include "playlist_item.hpp"
+
+
class PLItem;
class PLSelector;
class PlMimeData;
diff -ru vlc-2.2.4/modules/gui/qt4/dialogs/messages.hpp vlc-2.2.4.patched/modules/gui/qt4/dialogs/messages.hpp
--- vlc-2.2.4/modules/gui/qt4/dialogs/messages.hpp 2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/dialogs/messages.hpp 2016-07-13 01:27:12.000220784 +0200
@@ -55,7 +55,7 @@
void sinkMessage( const MsgEvent * );
bool matchFilter( const QString& );
- atomic_uint verbosity;
+ unsigned int verbosity;
static void MsgCallback( void *, int, const vlc_log_t *, const char *,
va_list );
diff -ru vlc-2.2.4/modules/gui/qt4/dialogs/vlm.hpp vlc-2.2.4.patched/modules/gui/qt4/dialogs/vlm.hpp
--- vlc-2.2.4/modules/gui/qt4/dialogs/vlm.hpp 2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/dialogs/vlm.hpp 2016-07-13 01:32:18.019407147 +0200
@@ -31,12 +31,13 @@
#ifdef ENABLE_VLM
+#include <QDateTime>
+
#include <vlc_vlm.h>
#include "ui/vlm.h"
#include "util/qvlcframe.hpp"
#include "util/singleton.hpp"
-#include <QDateTime>
enum{
QVLM_Broadcast,
diff -ru vlc-2.2.4/modules/gui/qt4/input_manager.hpp vlc-2.2.4.patched/modules/gui/qt4/input_manager.hpp
--- vlc-2.2.4/modules/gui/qt4/input_manager.hpp 2016-04-25 18:02:43.000000000 +0200
+++ vlc-2.2.4.patched/modules/gui/qt4/input_manager.hpp 2016-07-13 01:28:09.437062815 +0200
@@ -29,9 +29,10 @@
# include "config.h"
#endif
+#include "qt4.hpp"
+
#include <vlc_input.h>
-#include "qt4.hpp"
#include "util/singleton.hpp"
#include "adapters/variables.hpp"
diff -ru vlc-2.2.4/modules/gui/qt4/menus.cpp vlc-2.2.4.patched/modules/gui/qt4/menus.cpp
--- vlc-2.2.4/modules/gui/qt4/menus.cpp 2015-10-29 19:18:32.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/menus.cpp 2016-07-13 01:21:30.256823693 +0200
@@ -34,12 +34,13 @@
# include "config.h"
#endif
+#include "menus.hpp"
+
#include <vlc_common.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h> /* vout_thread_t */
#include <vlc_aout.h> /* audio_output_t */
-#include "menus.hpp"
#include "main_interface.hpp" /* View modifications */
#include "dialogs_provider.hpp" /* Dialogs display */
diff -ru vlc-2.2.4/modules/gui/qt4/qt4.hpp vlc-2.2.4.patched/modules/gui/qt4/qt4.hpp
--- vlc-2.2.4/modules/gui/qt4/qt4.hpp 2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/qt4.hpp 2016-07-13 01:22:29.520717970 +0200
@@ -29,12 +29,13 @@
# include "config.h"
#endif
+#define QT_NO_CAST_TO_ASCII
+#include <QString>
+
#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
#include <vlc_interface.h> /* intf_thread_t */
#include <vlc_playlist.h> /* playlist_t */
-#define QT_NO_CAST_TO_ASCII
-#include <QString>
#if ( QT_VERSION < 0x040600 )
# error Update your Qt version to at least 4.6.0
--- vlc-2.2.4/modules/visualization/projectm.cpp.orig 2016-07-13 02:11:35.900475637 +0200
+++ vlc-2.2.4/modules/visualization/projectm.cpp 2016-07-13 02:11:25.897492411 +0200
@@ -31,6 +31,8 @@
#include <assert.h>
+#include <libprojectM/projectM.hpp>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
@@ -40,7 +42,6 @@
#include <vlc_filter.h>
#include <vlc_rand.h>
-#include <libprojectM/projectM.hpp>
/*****************************************************************************
* Module descriptor

33
vlc-3.0.11.1-libqt5-5.15.patch
View File

@ -1,33 +0,0 @@
diff -u -r vlc-3.0.10/modules/gui/qt/components/playlist/views.cpp vlc-3.0.10-qt-5.15/modules/gui/qt/components/playlist/views.cpp
--- vlc-3.0.10/modules/gui/qt/components/playlist/views.cpp 2017-11-24 15:29:17.000000000 +0000
+++ vlc-3.0.10-qt-5.15/modules/gui/qt/components/playlist/views.cpp 2020-05-29 20:50:09.267959371 +0000
@@ -27,6 +27,7 @@
#include "input_manager.hpp" /* THEMIM */
#include <QPainter>
+#include <QPainterPath>
#include <QRect>
#include <QStyleOptionViewItem>
#include <QFontMetrics>
diff -u -r vlc-3.0.10/modules/gui/qt/dialogs/plugins.cpp vlc-3.0.10-qt-5.15/modules/gui/qt/dialogs/plugins.cpp
--- vlc-3.0.10/modules/gui/qt/dialogs/plugins.cpp 2017-11-24 15:29:17.000000000 +0000
+++ vlc-3.0.10-qt-5.15/modules/gui/qt/dialogs/plugins.cpp 2020-05-29 20:49:44.114275108 +0000
@@ -53,6 +53,7 @@
#include <QListView>
#include <QListWidget>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleOptionViewItem>
#include <QKeyEvent>
#include <QPushButton>
diff -u -r vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp vlc-3.0.10-qt-5.15/modules/gui/qt/util/timetooltip.hpp
--- vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp 2018-05-03 12:03:21.000000000 +0000
+++ vlc-3.0.10-qt-5.15/modules/gui/qt/util/timetooltip.hpp 2020-05-29 20:40:30.306628713 +0000
@@ -24,6 +24,7 @@
#include "qt.hpp"
+#include <QPainterPath>
#include <QWidget>
class TimeTooltip : public QWidget

60
vlc-3.0.17.3-libdav1d-1.0.0.patch
View File

@ -1,60 +0,0 @@
--- vlc-3.0.17.3/modules/codec/dav1d.c.orig 2022-04-01 10:38:16.386188801 +0200
+++ vlc-3.0.17.3/modules/codec/dav1d.c 2022-04-01 10:46:08.645646867 +0200
@@ -63,10 +63,16 @@
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC)
+#if DAV1D_API_VERSION_MAJOR >= 6
+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS,
+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
+ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0
+#else
add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS,
THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS,
THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
+#endif
vlc_module_end ()
/*****************************************************************************
@@ -294,6 +300,11 @@
return VLC_ENOMEM;
dav1d_default_settings(&p_sys->s);
+#if DAV1D_API_VERSION_MAJOR >= 6
+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
+ if (p_sys->s.n_threads == 0)
+ p_sys->s.n_threads = __MAX(1, vlc_GetCPUCount());
+#else
p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
if (p_sys->s.n_tile_threads == 0)
p_sys->s.n_tile_threads =
@@ -303,6 +314,7 @@
p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
if (p_sys->s.n_frame_threads == 0)
p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16;
+#endif
p_sys->s.allocator.cookie = dec;
p_sys->s.allocator.alloc_picture_callback = NewPicture;
p_sys->s.allocator.release_picture_callback = FreePicture;
@@ -313,12 +325,19 @@
return VLC_EGENERIC;
}
+#if DAV1D_API_VERSION_MAJOR >= 6
+ msg_Dbg(p_this, "Using dav1d version %s with %d threads",
+ dav1d_version(), p_sys->s.n_threads);
+
+ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
+#else
msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
+#endif
dec->pf_decode = Decode;
dec->pf_flush = FlushDecoder;
- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;

10
vlc-3.0.3-libqt5-5.12.0.patch
View File

@ -1,10 +0,0 @@
--- vlc-3.0.3/modules/gui/qt/components/simple_preferences.cpp.orig 2019-01-09 11:10:31.304881196 +0100
+++ vlc-3.0.3/modules/gui/qt/components/simple_preferences.cpp 2019-01-09 11:10:40.218918878 +0100
@@ -39,6 +39,7 @@
#include <QSignalMapper>
#include <QVBoxLayout>
#include <QScrollArea>
+#include <QButtonGroup>
#include <QStyleFactory>
#include <QSettings>

82
vlc.spec
View File

@ -4,7 +4,7 @@
Name: vlc
Version: 3.0.20
Release: 1mamba
Release: 2mamba
Summary: The VideoLAN client
Group: Graphical Desktop/Applications/Multimedia
Vendor: openmamba
@ -12,28 +12,14 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.videolan.org/
Source: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz
Patch0: %{name}-2.0.1-freetype.patch
Patch1: %{name}-1.1.4.1-upnp-1.6.7.patch
Patch4: %{name}-1.1.7-jack_autoconnect_true.patch
Patch5: vlc-2.0.3-lua-5.2.patch
Patch6: vlc-2.0.4-fix-undefined-symbol.patch
Patch7: vlc-2.0.7-libva-1.2.patch
Patch8: vlc-2.0.7-libflac-1.3.0.patch
Patch9: vlc-2.2.0-vorbisidec.patch
Patch10: vlc-2.2.2-no-qt5-check.patch
Patch11: vlc-2.2.2-lua-5.3.patch
Patch12: vlc-2.2.4-qt5-5.7.0-atomic.patch
Patch13: vlc-3.0.3-libqt5-5.12.0.patch
Patch14: vlc-3.0.11.1-libqt5-5.15.patch
Patch15: vlc-3.0.17.3-libdav1d-1.0.0.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libGLU-devel
BuildRequires: libICE-devel
BuildRequires: libQt5Svg-devel
BuildRequires: libQt5X11Extras-devel
BuildRequires: libSDL-devel
BuildRequires: libSDL_image-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
@ -42,6 +28,7 @@ BuildRequires: libXinerama-devel
BuildRequires: libXpm-devel
BuildRequires: liba52dec-devel
BuildRequires: libaa-devel
BuildRequires: libabseil-cpp-devel
BuildRequires: libalsa-devel
BuildRequires: libaom-devel
BuildRequires: libarchive-devel
@ -53,7 +40,6 @@ BuildRequires: libavcodec-ffmpeg-devel
BuildRequires: libavformat-ffmpeg-devel
BuildRequires: libavutil-ffmpeg-devel
BuildRequires: libbluray-devel
BuildRequires: libbrotli-devel
BuildRequires: libbzip2-devel
BuildRequires: libcaca-devel
BuildRequires: libcairo-devel
@ -66,7 +52,6 @@ BuildRequires: libdav1d-devel
BuildRequires: libdbus-devel
BuildRequires: libdc1394-devel
BuildRequires: libdca-devel
BuildRequires: libdirectfb-devel
BuildRequires: libdvbpsi-devel
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
@ -83,6 +68,7 @@ BuildRequires: libgcc
BuildRequires: libgcrypt-devel
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel
BuildRequires: libglu-devel
BuildRequires: libglvnd-devel
BuildRequires: libgme-devel
BuildRequires: libgnutls-devel
@ -118,7 +104,6 @@ BuildRequires: libpango-devel
BuildRequires: libpcre-devel
BuildRequires: libpng-devel
BuildRequires: libpostproc-ffmpeg-devel
BuildRequires: libprojectM-devel
BuildRequires: libprotobuf-devel
BuildRequires: libpulseaudio-devel
BuildRequires: libraw1394-devel
@ -126,12 +111,14 @@ BuildRequires: libreadline-devel
BuildRequires: librsvg-devel
BuildRequires: libsamplerate-devel
BuildRequires: libschroedinger-devel
BuildRequires: libsdl12-compat-devel
BuildRequires: libsecret-devel
BuildRequires: libshine-devel
BuildRequires: libshout-devel
BuildRequires: libsidplay2-devel
BuildRequires: libslang-devel
BuildRequires: libsmbclient-devel
BuildRequires: libsndio-devel
BuildRequires: libsoxr-devel
BuildRequires: libspeex-devel
BuildRequires: libspeexdsp-devel
@ -144,7 +131,6 @@ BuildRequires: libtag-devel
BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libts-devel
BuildRequires: libtwolame-devel
BuildRequires: libudev-devel
BuildRequires: libupnp-devel
@ -162,6 +148,7 @@ BuildRequires: libz-devel
BuildRequires: libzvbi-devel
BuildRequires: qt5-qtbase-devel
## AUTOBUILDREQ-END
BuildRequires: libx265-devel >= 3.6-1mamba
BuildRequires: libfreerdp-devel
BuildRequires: liblive-devel
BuildRequires: libprojectM-devel >= 3.1.7
@ -170,6 +157,7 @@ BuildRequires: libsasl2-devel
BuildRequires: libsndio-devel
BuildRequires: protobuf
BuildRequires: libva-static
BuildRequires: lua52
%ifarch arm aarch64
BuildRequires: libraspberrypi-devel
%endif
@ -212,15 +200,12 @@ Install this package if you need to build Videolan Client plugins or intend to l
#:<< _EOF
%patch 6 -p1
%patch 9 -p1
#%patch15 -p1
# FIXME: bootstrap: build with ffmpeg2 is correct, but libs are relinked with ffmpeg at install
./bootstrap
%build
#:<< ___EOF
#export LIBV4L2_LIBS=-L%{_libdir}/libv4l/ LIBV4L2_CFLAGS=-I%{_includedir}
#export PKG_CONFIG_PATH=%{_libdir}/ffmpeg2/pkgconfig
%configure \
BUILDCC=gcc \
LIBS_access_smb="-L%{_libdir}/samba" \
@ -271,46 +256,15 @@ Install this package if you need to build Videolan Client plugins or intend to l
%else
--without-contrib \
%endif
--with-kde-solid=%{_datadir}/apps/solid/actions \
--enable-tremor \
--disable-libplacebo \
LUAC=/usr/bin/luac-5.2 LUA_LIBS="`pkg-config --libs lua5.2`"
# PKG_CONFIG_PATH=%{_libdir}/ffmpeg2/pkgconfig \
#LIBS="-L%{_libdir}/ffmpeg2"
# --enable-mkv \
# --enable-sdl \
# --enable-vcdx \
#___EOF
%ifarch arm
LD_PRELOAD=/usr/lib/librsvg-2.so %make
%else
%make
%endif
#CFLAGS="%{optflags} -Wimplicit-function-declaration"
# --enable-glide \
# --with-wx-config-path=/path/to/your/wxWidgets-2.6.3
# --without-wingdi \
# --enable-fb \
# --disable-mp4
# WARNING: unrecognized options:
# --enable-wxwidgets, --with-wx-config,
# --enable-release, --with-ffmpeg-faac,
# --enable-tarkin, --enable-x11,
# --disable-qte, --disable-mga,
# --enable-esd, --enable-arts,
# --enable-kde, --disable-opie,
# --disable-qnx, --disable-intfwin,
# --enable-toolame, --disable-slp,
# --enable-pth, --disable-st,
# --disable-testsuite, --enable-plugins,
# --enable-DAAP, --with-schroedinger, --disable-gg
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
#export PKG_CONFIG_PATH=%{_libdir}/ffmpeg2/pkgconfig
%ifarch arm
LD_PRELOAD=/usr/lib/librsvg-2.so %makeinstall
%else
@ -348,11 +302,10 @@ fi
%{_datadir}/metainfo/vlc.appdata.xml
%dir %{_datadir}/vlc
%{_datadir}/vlc/*
%{_kde4_datadir}/solid/actions/vlc-*.desktop
%{_datadir}/apps/solid/actions/vlc-*.desktop
%{_datadir}/icons/hicolor/*/apps/vlc*.png
%{_datadir}/icons/hicolor/*/apps/vlc*.xpm
%{_mandir}/man1/vlc.1*
#%{_mandir}/man1/vlc-config.1*
%{_mandir}/man1/vlc-wrapper.1*
%files -n lib%{name}
@ -365,12 +318,8 @@ fi
%{_libdir}/vlc/libvlc_vdpau.so.*
%{_libdir}/vlc/lua
%dir %{_libdir}/vlc/plugins
#%{_libdir}/vlc/plugins/3dnow
%{_libdir}/vlc/plugins/access
%{_libdir}/vlc/plugins/access_output
%ifarch arm
%{_libdir}/vlc/plugins/arm_neon
%endif
%{_libdir}/vlc/plugins/audio_filter
%{_libdir}/vlc/plugins/audio_mixer
%dir %{_libdir}/vlc/plugins/audio_output
@ -378,11 +327,7 @@ fi
%{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
%{_libdir}/vlc/plugins/audio_output/libalsa_plugin.so
%{_libdir}/vlc/plugins/audio_output/libamem_plugin.so
#%{_libdir}/vlc/plugins/audio_output/libaout_file_plugin.so
#%{_libdir}/vlc/plugins/audio_output/libaout_sdl_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
#%{_libdir}/vlc/plugins/audio_output/liboss_plugin.so
#%{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%{_libdir}/vlc/plugins/audio_output/libsndio_plugin.so
%{_libdir}/vlc/plugins/codec
@ -394,14 +339,11 @@ fi
%{_libdir}/vlc/plugins/lua
%{_libdir}/vlc/plugins/meta_engine
%{_libdir}/vlc/plugins/misc
#%{_libdir}/vlc/plugins/mmx
#%{_libdir}/vlc/plugins/mmxext
%{_libdir}/vlc/plugins/mux
%{_libdir}/vlc/plugins/notify
%{_libdir}/vlc/plugins/packetizer
%{_libdir}/vlc/plugins/plugins.dat
%{_libdir}/vlc/plugins/services_discovery
#%{_libdir}/vlc/plugins/sse2
%{_libdir}/vlc/plugins/spu
%{_libdir}/vlc/plugins/stream_extractor
%{_libdir}/vlc/plugins/stream_filter
@ -421,7 +363,6 @@ fi
%files -n lib%{name}-devel
%defattr(-,root,root)
#%{_bindir}/vlc-config
%dir %{_includedir}/vlc
%{_includedir}/vlc/*
%{_libdir}/libvlc.so
@ -435,6 +376,9 @@ fi
%doc ChangeLog README THANKS
%changelog
* Sat May 04 2024 Automatic Build System <autodist@mambasoft.it> 3.0.20-2mamba
- rebuilt by autoport with build requirements: libx265-devel>=3.6-1mamba
* Mon Nov 20 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.20-1mamba
- update to 3.0.20