Compare commits
150 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
90cf284cf4 | ||
|
7052296496 | ||
|
f8931d8e16 | ||
|
6aaa7565f3 | ||
|
c50f93f5d8 | ||
|
037b8e7b56 | ||
|
32f723070b | ||
|
5fa80ba325 | ||
|
c8fb519bd5 | ||
|
4982495d81 | ||
|
b2d529be40 | ||
|
0953d1a233 | ||
|
4d6b327c96 | ||
|
0ea898ed7d | ||
|
46a5e0ab1d | ||
|
7dd518e74c | ||
|
492ebba9ea | ||
|
d40eb72e81 | ||
|
93b91daf9a | ||
|
cfd58babf9 | ||
|
2c078b5253 | ||
|
b6adcf6647 | ||
|
d30747330e | ||
|
71a71fe72a | ||
|
022ce4a695 | ||
|
093f4ccc7d | ||
|
9e70399876 | ||
|
360ed494c0 | ||
|
f797e8b937 | ||
|
3e6032ed4a | ||
|
1dc08930d3 | ||
|
106f7d02ad | ||
|
aa357694f9 | ||
|
3fa8d9ea9b | ||
|
315d3dfa22 | ||
|
6399c0bd27 | ||
|
0410563808 | ||
|
24f4ced017 | ||
|
0dca2a1888 | ||
|
3868242037 | ||
|
c728f1663d | ||
|
465dc10706 | ||
|
fed4d390af | ||
|
b58171e977 | ||
|
4b5a9234a2 | ||
|
21c4a02f28 | ||
|
e8602af0dd | ||
|
02ffeca138 | ||
|
23bb770596 | ||
|
5cf1297353 | ||
|
66701c0fa6 | ||
|
0b77b9d5fc | ||
|
4609491f46 | ||
|
7466b1831e | ||
|
b746b4b54a | ||
|
8050e20b4a | ||
|
f57b491ee1 | ||
|
dcafea02e6 | ||
|
e28a6501a8 | ||
|
7a004ec6c7 | ||
|
dc491ff9a5 | ||
|
13bf05eb8f | ||
|
32f637d785 | ||
|
8f517445ed | ||
|
e0bf38d3dd | ||
|
01eaffbd10 | ||
|
046d57a571 | ||
|
60011ac364 | ||
|
1df2224988 | ||
|
af6f70cf26 | ||
|
f3ac3a4f41 | ||
|
b0b1630bd4 | ||
|
974bd89e60 | ||
|
f1d17069be | ||
|
f3974dd3d9 | ||
|
5dba059adf | ||
|
2194f0664a | ||
|
f014f871bc | ||
|
fda1a957d3 | ||
|
aa723f371d | ||
|
5d922ba110 | ||
|
76149c9cc5 | ||
|
0036181509 | ||
|
31544b27e0 | ||
|
930dfcd6d0 | ||
|
3f45258a50 | ||
|
f5083701c7 | ||
|
8c38ac889e | ||
|
a49c78f644 | ||
|
ebd500c7d6 | ||
|
ecbe9040be | ||
|
6ff312410d | ||
|
1ffb812fc3 | ||
|
e73a65902f | ||
|
7e26732018 | ||
|
1e4285afab | ||
|
e698373517 | ||
|
e3a1a2e40c | ||
|
4b1fdd960b | ||
|
d0126770a3 | ||
|
67a9e416f0 | ||
|
c3b0f652b5 | ||
|
52c38baa1c | ||
|
5e2acc8ec0 | ||
|
3867a2a6ce | ||
|
4d9d52edbd | ||
|
2318cf177f | ||
|
43db5770c7 | ||
|
924de4cd12 | ||
|
955661ae04 | ||
|
4aba174a64 | ||
|
398f42be0c | ||
|
8d36eb3017 | ||
|
6e6f2b2b69 | ||
|
38b5f84776 | ||
|
7ef0bc84d9 | ||
|
ddcaeb1d63 | ||
|
8556638af1 | ||
|
172829a7fa | ||
|
518a6828de | ||
|
1cefba4698 | ||
|
276a7b0a58 | ||
|
f5a171af1d | ||
|
1dd41520ba | ||
|
28d9240a68 | ||
|
6f2427c28f | ||
|
75f2d78b74 | ||
|
46b7fa1c7e | ||
|
60647b0c9d | ||
|
01c965c4e6 | ||
|
005f647e19 | ||
|
7206d15251 | ||
|
d212c1a987 | ||
|
2127725990 | ||
|
4dd0b9e0c1 | ||
|
8d4f64949d | ||
|
e6a9b0a989 | ||
|
de9a5bd906 | ||
|
8d42aff6b7 | ||
|
000a8cfdf5 | ||
|
f198e392b5 | ||
|
51b4ebe559 | ||
|
e6ab0a710d | ||
|
7c0dd3aa60 | ||
|
2d777ba574 | ||
|
115dab779f | ||
|
ad4ea17918 | ||
|
6ba3824b58 | ||
|
8e25aaea5f | ||
|
c4dd7f0688 |
177
4645.patch
177
4645.patch
@ -1,177 +0,0 @@
|
||||
From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Guillem <thomas@gllm.fr>
|
||||
Date: Tue, 5 Dec 2023 09:23:35 +0100
|
||||
Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment
|
||||
|
||||
Fixes #28441
|
||||
---
|
||||
src/input/input_internal.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
|
||||
index d29731edca1b..ea02f39f5add 100644
|
||||
--- a/src/input/input_internal.h
|
||||
+++ b/src/input/input_internal.h
|
||||
@@ -117,7 +117,7 @@ typedef struct input_thread_private_t
|
||||
|
||||
/* Title infos FIXME multi-input (not easy) ? */
|
||||
int i_title;
|
||||
- const input_title_t **title;
|
||||
+ input_title_t * const *title;
|
||||
|
||||
int i_title_offset;
|
||||
int i_seekpoint_offset;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001
|
||||
From: Zhao Zhili <quinkblack@foxmail.com>
|
||||
Date: Thu, 1 Mar 2018 14:25:59 +0800
|
||||
Subject: [PATCH 2/5] yadif: fix variable type
|
||||
|
||||
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
|
||||
(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60)
|
||||
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
|
||||
---
|
||||
modules/video_filter/deinterlace/yadif.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h
|
||||
index 4bc592ba9307..af16443d0804 100644
|
||||
--- a/modules/video_filter/deinterlace/yadif.h
|
||||
+++ b/modules/video_filter/deinterlace/yadif.h
|
||||
@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
|
||||
}
|
||||
|
||||
static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) {
|
||||
- uint8_t *dst = (uint8_t *)dst8;
|
||||
- uint8_t *prev = (uint8_t *)prev8;
|
||||
- uint8_t *cur = (uint8_t *)cur8;
|
||||
- uint8_t *next = (uint8_t *)next8;
|
||||
+ uint16_t *dst = (uint16_t *)dst8;
|
||||
+ uint16_t *prev = (uint16_t *)prev8;
|
||||
+ uint16_t *cur = (uint16_t *)cur8;
|
||||
+ uint16_t *next = (uint16_t *)next8;
|
||||
int x;
|
||||
uint16_t *prev2= parity ? prev : cur ;
|
||||
uint16_t *next2= parity ? cur : next;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Sun, 3 Mar 2019 09:59:10 +0200
|
||||
Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion
|
||||
|
||||
(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058)
|
||||
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
|
||||
---
|
||||
modules/video_chroma/swscale.c | 12 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
|
||||
index 8993d11ec5dd..11897527355c 100644
|
||||
--- a/modules/video_chroma/swscale.c
|
||||
+++ b/modules/video_chroma/swscale.c
|
||||
@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
|
||||
{
|
||||
filter_sys_t *p_sys = p_filter->p_sys;
|
||||
uint8_t palette[AVPALETTE_SIZE];
|
||||
- uint8_t *src[4]; int src_stride[4];
|
||||
- uint8_t *dst[4]; int dst_stride[4];
|
||||
+ uint8_t *src[4], *dst[4];
|
||||
+ const uint8_t *csrc[4];
|
||||
+ int src_stride[4], dst_stride[4];
|
||||
|
||||
GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
|
||||
p_src, i_plane_count, b_swap_uvi );
|
||||
@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
|
||||
GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
|
||||
p_dst, i_plane_count, b_swap_uvo );
|
||||
|
||||
+ for (size_t i = 0; i < ARRAY_SIZE(src); i++)
|
||||
+ csrc[i] = src[i];
|
||||
+
|
||||
#if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
|
||||
- sws_scale( ctx, src, src_stride, 0, i_height,
|
||||
+ sws_scale( ctx, csrc, src_stride, 0, i_height,
|
||||
dst, dst_stride );
|
||||
#else
|
||||
- sws_scale_ordered( ctx, src, src_stride, 0, i_height,
|
||||
+ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
|
||||
dst, dst_stride );
|
||||
#endif
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Sun, 3 Mar 2019 17:20:04 +0200
|
||||
Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing
|
||||
|
||||
(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35)
|
||||
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
|
||||
---
|
||||
modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
|
||||
index a93462925e8a..a85f9aafb0b9 100644
|
||||
--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
|
||||
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
|
||||
@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] =
|
||||
void RegisterCommand( filter_t *p_filter )
|
||||
{
|
||||
filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
|
||||
- size_t i_index = 0;
|
||||
|
||||
p_sys->i_commands = ARRAY_SIZE(p_commands);
|
||||
p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) );
|
||||
if( !p_sys->pp_commands ) return;
|
||||
- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ )
|
||||
+ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ )
|
||||
{
|
||||
p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) );
|
||||
if( !p_sys->pp_commands[i_index] ) return;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Mon, 26 Feb 2018 20:43:03 +0200
|
||||
Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption
|
||||
|
||||
Font alpha is 8-bits, not 32-bits.
|
||||
|
||||
(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0)
|
||||
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
|
||||
---
|
||||
modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
|
||||
index a85f9aafb0b9..7a71c6f2373a 100644
|
||||
--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
|
||||
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
|
||||
@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end,
|
||||
skip_space( &psz_command );
|
||||
if( isdigit( (unsigned char)*psz_command ) )
|
||||
{
|
||||
- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC )
|
||||
+ int32_t value;
|
||||
+
|
||||
+ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC )
|
||||
return VLC_EGENERIC;
|
||||
+
|
||||
+ p_params->fontstyle.i_font_alpha = value;
|
||||
}
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Mon, 26 Feb 2018 20:36:29 +0200
|
||||
Subject: [PATCH] chromaprint: missing cast
|
||||
|
||||
(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547)
|
||||
Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
|
||||
---
|
||||
modules/stream_out/chromaprint.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c
|
||||
index 80ec31ba2590..c76cbda3c2bb 100644
|
||||
--- a/modules/stream_out/chromaprint.c
|
||||
+++ b/modules/stream_out/chromaprint.c
|
||||
@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
|
||||
if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer )
|
||||
{
|
||||
if(! chromaprint_feed( p_sys->p_chromaprint_ctx,
|
||||
- p_buf->p_buffer,
|
||||
+ (int16_t *)p_buf->p_buffer,
|
||||
p_buf->i_buffer / BYTESPERSAMPLE ) )
|
||||
msg_Warn( p_stream, "feed error" );
|
||||
id->i_samples -= i_samples;
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5
|
||||
size 25596392
|
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCZUCo4QAKCRBxgHE75Y0a
|
||||
3GimAJ4k9yxWiDibQ99KrHLXsRdZ3WUEnQCgmp6N6qQM3WxC8EbfrkoAgv6U/Io=
|
||||
=gCZR
|
||||
-----END PGP SIGNATURE-----
|
3
vlc-3.0.21.tar.xz
Normal file
3
vlc-3.0.21.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0
|
||||
size 25649288
|
6
vlc-3.0.21.tar.xz.asc
Normal file
6
vlc-3.0.21.tar.xz.asc
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCZmN15gAKCRBxgHE75Y0a
|
||||
3PDaAKCGjcMhmC7+t5FwH2nVc1Cuy2dPeQCfe2/pEfZUpMPG2rfu/wO71uZ+vMo=
|
||||
=Mt0w
|
||||
-----END PGP SIGNATURE-----
|
78
vlc.changes
78
vlc.changes
@ -1,3 +1,81 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 27 11:32:35 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Drop opencv sub-package, and hence no longer needed
|
||||
pkgconfig(opencv) BuildRequires and various provides, Supplements
|
||||
and Conflicts.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 11 11:11:11 UTC 2024 - olaf@aepfle.de
|
||||
|
||||
- Convert BuildRequires from libfaad-devel to pkgconfig(faad2)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 2 10:48:44 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop the requres_ge libbluray1 statement, which was added as a
|
||||
hack due to a libbluray ABI brak at version 0.5. By now libbluray
|
||||
is at .so.2, so that statement was actually a NOP. as RPM simply
|
||||
ignored in-existing package dependencies.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 27 13:54:03 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
|
||||
|
||||
- Restrict required version for libav* to avoid pulling in ffmpeg-6
|
||||
packages.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 14 13:14:32 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Build dca support only on Leap 15.6 and newer when not using 3rd
|
||||
party repositories (BUILD_ORIG): Leap prior to 15.6 do not have
|
||||
libdca.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 13 12:34:45 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Disable chromecast support on Leap < 15.6: not supported as
|
||||
of now.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 12 14:26:44 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Updte to version 3.0.21:
|
||||
+ Decoders:
|
||||
* Improve Opus ambisonic support
|
||||
* Fix some ASS subtitle rendering issues
|
||||
* Fix Opus in MP4 behaviour
|
||||
* Fix VAAPI hw decoding with some drivers
|
||||
+ Input:
|
||||
* Add support for HTTP content range handling according to RFC
|
||||
9110
|
||||
* Fix some HLS Adaptive Streaming not working in audio-only
|
||||
mode
|
||||
+ Video Output:
|
||||
* Super Resolution scaling with AMD GPUs
|
||||
* The D3D11 HDR option can also turn on/off HDR for all sources
|
||||
regardless of the display
|
||||
* Improve subtitles rendering on Apple platforms of notably
|
||||
Asian languages by correcting font fallback lookups
|
||||
+ Video Filter:
|
||||
* New AMD VQ Enhancer filter
|
||||
* Add D3D11 option to use NVIDIA TrueHDR to generate HDR from
|
||||
SDR sources
|
||||
+ Audio Output:
|
||||
* Fix regression on macOS causing crashes when using audio
|
||||
devices with more than 9 channels
|
||||
+ Services Discovery:
|
||||
* Fix exposed UPnP directory URL schemes to be compliant with
|
||||
RFC 3986
|
||||
+ libVLC:
|
||||
* the HWND passed to libvlc_media_player_set_hwnd must have the
|
||||
WS_CLIPCHILDREN style set.
|
||||
* Fix crashes when using caopengllayer
|
||||
+ Misc:
|
||||
* Fix various warnings, leaks and potential crashes
|
||||
* Fix security integer overflow in MMS module
|
||||
- Drop 4645.patch and 770789f2.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 22 12:52:19 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
75
vlc.spec
75
vlc.spec
@ -30,9 +30,11 @@
|
||||
# VNC support - the module is not really usable in most cases tested so far (e.g. against qemu-kvm -vnc :xx)
|
||||
%bcond_with vnc
|
||||
%bcond_with faad
|
||||
%define chromecast 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150600
|
||||
%define dca 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150600 || 0%{?BUILD_ORIG}
|
||||
|
||||
Name: vlc
|
||||
Version: 3.0.20
|
||||
Version: 3.0.21
|
||||
Release: 0
|
||||
Summary: Graphical media player
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@ -54,10 +56,6 @@ Patch4: fix-build-with-fdk-2.0.patch
|
||||
Patch5: vlc-libplacebo-5.patch
|
||||
# PATCH-FIX-UPSTREAM vlc-taglib-2.0.patch dimstar@opensuse.org -- Fix build against taglib 2.0
|
||||
Patch6: vlc-taglib-2.0.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch7: https://code.videolan.org/videolan/vlc/-/merge_requests/4645.patch
|
||||
# PATCH-FIX-UPSTREAM -- chromaprint, missing cast
|
||||
Patch8: https://code.videolan.org/videolan/vlc/-/commit/770789f2.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
|
||||
@ -121,9 +119,9 @@ BuildRequires: pkgconfig(libplacebo) < 6.292.0
|
||||
BuildRequires: speex-devel >= 1.0.5
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: vcdimager-devel
|
||||
BuildRequires: (pkgconfig(libavcodec) >= 57.37.100 with pkgconfig(libavcodec) < 59)
|
||||
BuildRequires: (pkgconfig(libavformat) >= 53.21.0 with pkgconfig(libavformat) < 59)
|
||||
BuildRequires: (pkgconfig(libavutil) >= 52.4.0 with pkgconfig(libavutil) < 57)
|
||||
BuildRequires: (pkgconfig(libavcodec) >= 57.37.100 with pkgconfig(libavcodec) < 60)
|
||||
BuildRequires: (pkgconfig(libavformat) >= 53.21.0 with pkgconfig(libavformat) < 60)
|
||||
BuildRequires: (pkgconfig(libavutil) >= 52.4.0 with pkgconfig(libavutil) < 58)
|
||||
BuildRequires: pkgconfig(Qt5Core) >= 5.5.0
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Svg)
|
||||
@ -138,7 +136,9 @@ BuildRequires: pkgconfig(gnutls) >= 3.2.0
|
||||
BuildRequires: pkgconfig(libarchive) >= 3.1.0
|
||||
BuildRequires: pkgconfig(libass) >= 0.9.8
|
||||
BuildRequires: pkgconfig(libbluray) >= 0.6.2
|
||||
%if %dca
|
||||
BuildRequires: pkgconfig(libdca) >= 0.0.5
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libgme)
|
||||
#BuildRequires: pkgconfig(libmodplug) >= 0.8.9
|
||||
BuildRequires: pkgconfig(libmpeg2) > 0.3.2
|
||||
@ -206,7 +206,6 @@ BuildRequires: pkgconfig(xi)
|
||||
%endif
|
||||
%if 0%{?is_opensuse}
|
||||
BuildRequires: pkgconfig(libupnp)
|
||||
BuildRequires: pkgconfig(opencv) > 2.0
|
||||
%ifarch %{ix86} x86_64
|
||||
%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
|
||||
BuildRequires: pkgconfig(libprojectM-qt5) >= 2.0.0
|
||||
@ -236,7 +235,7 @@ BuildRequires: libxvidcore-devel
|
||||
BuildRequires: pkgconfig(x264) >= 0.8.6
|
||||
BuildRequires: pkgconfig(x265)
|
||||
%if %{with faad}
|
||||
BuildRequires: libfaad-devel
|
||||
BuildRequires: pkgconfig(faad2)
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@ -281,12 +280,7 @@ Summary: VLC without X dependencies
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
Requires: libvlc%{libvlc} = %{version}-%{release}
|
||||
Requires: libvlccore%{libvlccore} = %{version}-%{release}
|
||||
# This is a hack only due to libbluray not having versioned symbols as well as
|
||||
# having a strange ABI/API break between 0.3 and 0.7
|
||||
%requires_ge libbluray1
|
||||
Recommends: %{name}-codecs
|
||||
# lang subpackage
|
||||
Recommends: %{name}-lang
|
||||
Recommends: libdvdcss
|
||||
Conflicts: %{conflicts}-noX
|
||||
# The lang-package was renamed to vlc-lang to assist AppStream building
|
||||
@ -396,30 +390,12 @@ Conflicts: %{conflicts}-qt
|
||||
This subpackage provides a Qt interface for VLC and selects it by
|
||||
default when `vlc` is invoked from an X session.
|
||||
|
||||
%package opencv
|
||||
Summary: OpenCV plugins for VLC media player
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
Requires: %{name}-noX = %{version}-%{release}
|
||||
# We need the noX package first, as it contains vlc-cache-gen
|
||||
Requires(post): %{name}-noX
|
||||
# Package split
|
||||
Provides: %{name}:%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
|
||||
Conflicts: %{name} < %{version}-%{release}
|
||||
Supplements: packageand(%{name}-noX:opencv3)
|
||||
# Data required for face detection
|
||||
Recommends: opencv3
|
||||
|
||||
%description opencv
|
||||
This subpackage provides a wrapper plugin for OpenCV for
|
||||
OpenCV based video filters and a face detection example.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 1 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 6 -p1
|
||||
%patch -P 7 -p1
|
||||
%patch -P 8 -p1
|
||||
%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
|
||||
%patch -P 100 -p1
|
||||
%endif
|
||||
@ -457,8 +433,16 @@ autoreconf -fiv
|
||||
--enable-aa \
|
||||
--enable-alsa \
|
||||
--enable-avcodec \
|
||||
%if %chromecast
|
||||
--enable-chromecast \
|
||||
%else
|
||||
--disable-chromecast \
|
||||
%endif
|
||||
%if %dca
|
||||
--enable-dca \
|
||||
%else
|
||||
--disable-dca \
|
||||
%endif
|
||||
--enable-dvbpsi \
|
||||
--enable-dvdnav \
|
||||
--enable-dvdread \
|
||||
@ -504,9 +488,6 @@ autoreconf -fiv
|
||||
%if %{with opengles}
|
||||
--enable-gles2 \
|
||||
%endif
|
||||
%if 0%{?is_opensuse}
|
||||
--enable-opencv \
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1500 && 0%{?is_opensuse}
|
||||
--enable-wayland \
|
||||
%else
|
||||
@ -639,16 +620,6 @@ if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%post -n %{name}-opencv
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%postun -n %{name}-opencv
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%files
|
||||
%exclude %{_libdir}/vlc/libcompat.a
|
||||
# The presence of the .desktop file is what gives AppStream the
|
||||
@ -916,7 +887,9 @@ fi
|
||||
%if 0%{?suse_version} >= 1550
|
||||
%{_libdir}/vlc/plugins/codec/libdav1d_plugin.so
|
||||
%endif
|
||||
%if %dca
|
||||
%{_libdir}/vlc/plugins/codec/libdca_plugin.so
|
||||
%endif
|
||||
%{_libdir}/vlc/plugins/codec/libddummy_plugin.so
|
||||
%{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
|
||||
%{_libdir}/vlc/plugins/codec/libedummy_plugin.so
|
||||
@ -973,7 +946,9 @@ fi
|
||||
%{_libdir}/vlc/plugins/demux/libavi_plugin.so
|
||||
%{_libdir}/vlc/plugins/demux/libcaf_plugin.so
|
||||
%{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so
|
||||
%if %chromecast
|
||||
%{_libdir}/vlc/plugins/demux/libdemux_chromecast_plugin.so
|
||||
%endif
|
||||
%{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so
|
||||
%{_libdir}/vlc/plugins/demux/libdemux_stl_plugin.so
|
||||
%{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so
|
||||
@ -1087,7 +1062,9 @@ fi
|
||||
%{_libdir}/vlc/plugins/stream_filter/libskiptags_plugin.so
|
||||
%{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
|
||||
%{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
|
||||
%if %chromecast
|
||||
%{_libdir}/vlc/plugins/stream_out/libstream_out_chromecast_plugin.so
|
||||
%endif
|
||||
%{_libdir}/vlc/plugins/stream_out/libstream_out_cycle_plugin.so
|
||||
%{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
|
||||
%{_libdir}/vlc/plugins/stream_out/libstream_out_description_plugin.so
|
||||
@ -1220,12 +1197,6 @@ fi
|
||||
%{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so
|
||||
%{_libdir}/vlc/plugins/video_output/libglconv_vdpau_plugin.so
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%files opencv
|
||||
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
|
||||
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
|
||||
%endif
|
||||
|
||||
%files -n libvlc%{libvlc}
|
||||
%{_libdir}/libvlc.so.%{libvlc}*
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user