Updating link to change in openSUSE:Factory/vlc revision 116.0
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=873809d3882c29a1cb1e7ef572466a3b
This commit is contained in:
OBS User buildservice-autocommit
Git OBS Bridge
parent
ae947beb0d
commit
2ba2f80db1
48
vlc-gcc11.patch
Normal file
48
vlc-gcc11.patch
Normal file
@ -0,0 +1,48 @@
|
||||
Index: vlc-3.0.12/modules/demux/adaptive/playlist/SegmentInformation.cpp
|
||||
===================================================================
|
||||
--- vlc-3.0.12.orig/modules/demux/adaptive/playlist/SegmentInformation.cpp
|
||||
+++ vlc-3.0.12/modules/demux/adaptive/playlist/SegmentInformation.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
+#include <limits>
|
||||
|
||||
using namespace adaptive::playlist;
|
||||
|
||||
Index: vlc-3.0.12/modules/demux/hls/playlist/Parser.cpp
|
||||
===================================================================
|
||||
--- vlc-3.0.12.orig/modules/demux/hls/playlist/Parser.cpp
|
||||
+++ vlc-3.0.12/modules/demux/hls/playlist/Parser.cpp
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <map>
|
||||
#include <cctype>
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
using namespace adaptive;
|
||||
using namespace adaptive::playlist;
|
||||
Index: vlc-3.0.12/modules/demux/mkv/matroska_segment.cpp
|
||||
===================================================================
|
||||
--- vlc-3.0.12.orig/modules/demux/mkv/matroska_segment.cpp
|
||||
+++ vlc-3.0.12/modules/demux/mkv/matroska_segment.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include <new>
|
||||
#include <iterator>
|
||||
+#include <limits>
|
||||
|
||||
matroska_segment_c::matroska_segment_c( demux_sys_t & demuxer, EbmlStream & estream, KaxSegment *p_seg )
|
||||
:segment(p_seg)
|
||||
Index: vlc-3.0.12/modules/demux/mkv/mkv.cpp
|
||||
===================================================================
|
||||
--- vlc-3.0.12.orig/modules/demux/mkv/mkv.cpp
|
||||
+++ vlc-3.0.12/modules/demux/mkv/mkv.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "stream_io_callback.hpp"
|
||||
|
||||
#include <new>
|
||||
+#include <limits>
|
||||
|
||||
extern "C" {
|
||||
#include "../av1_unpack.h"
|
||||
24
vlc.changes
24
vlc.changes
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 26 11:08:14 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Guard post scriptlets to only run %{_libdir}/vlc/vlc-cache-gen if
|
||||
it already (or still, in case of uninstall) exists.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 26 10:12:32 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Add vlc-gcc11.patch: Fix build using gcc11 (boo#1181918).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 18 16:57:41 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop libpcre-devel BuildRequires: not been used in a while.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 18 12:48:15 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Limit libplacebo to is_openssue: vlc does not exist in SLE, which
|
||||
makes the usage of is_opensuse valid; backports has is_opensuse
|
||||
set to 1. This is mostly interesting for 3rd party build service
|
||||
instances.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 3 09:58:28 UTC 2021 - Aaron Stern <ukbeast89@protonmail.com>
|
||||
|
||||
|
||||
55
vlc.spec
55
vlc.spec
@ -51,6 +51,8 @@ Patch1: vlc-allow-deprecated-fribidi.patch
|
||||
Patch2: vlc-lua-5.3.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
|
||||
# PATCH-FIX-UPSTREAM vlc-gcc11.patch dimstar@opensuse.org -- Fix build using gcc11
|
||||
Patch4: vlc-gcc11.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
|
||||
@ -103,12 +105,13 @@ BuildRequires: lirc-devel
|
||||
BuildRequires: live555-devel >= 2015.01.27
|
||||
BuildRequires: lua-devel >= 5.1
|
||||
BuildRequires: mpg123-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: posix_cc
|
||||
BuildRequires: schroedinger-devel >= 1.0.10
|
||||
BuildRequires: pkgconfig(libudev) >= 142
|
||||
%if 0%{?is_opensuse}
|
||||
BuildRequires: pkgconfig(libplacebo)
|
||||
%endif
|
||||
#BuildRequires: slang-devel
|
||||
BuildRequires: speex-devel >= 1.0.5
|
||||
BuildRequires: update-desktop-files
|
||||
@ -294,11 +297,15 @@ suitable for server installations, for example, to run a streaming server.
|
||||
Should you decide to install the GUI modules, %{name}-noX will stay
|
||||
installed as a dependency.
|
||||
|
||||
|
||||
|
||||
|
||||
# we can't use %%lang_package, as we need a different dependency
|
||||
# boo#1012556
|
||||
# but the package name has to stay vlc-lang, as otherise the software centers
|
||||
# (AppStream based) can't see vlc being translated (vlc is the one listed in SC
|
||||
# not vlc-noX)
|
||||
|
||||
%package lang
|
||||
# FIXME: consider using %%lang_package macro
|
||||
Summary: Translations for package %{name}
|
||||
@ -399,6 +406,7 @@ OpenCV based video filters and a face detection example.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
|
||||
%patch100 -p1
|
||||
%endif
|
||||
@ -547,42 +555,65 @@ dd if=/dev/zero bs=1M count=1 of=%{buildroot}/%{_libdir}/vlc/plugins/plugins.dat
|
||||
%postun -n libvlc%{libvlc} -p /sbin/ldconfig
|
||||
%post -n libvlccore%{libvlccore} -p /sbin/ldconfig
|
||||
%postun -n libvlccore%{libvlccore} -p /sbin/ldconfig
|
||||
|
||||
%post -n %{name}-qt
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%if %{with gstreamer}
|
||||
%post -n %{name}-codec-gstreamer
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%postun -n %{name}-codec-gstreamer
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
%endif
|
||||
|
||||
%post -n %{name}-jack
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%postun -n %{name}-jack
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%if 0%{?BUILD_ORIG}
|
||||
%post -n %{name}-codecs
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%postun -n %{name}-codecs
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
%endif
|
||||
|
||||
%post -n %{name}-vdpau
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%postun -n %{name}-vdpau
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%post -n %{name}-opencv
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%postun -n %{name}-opencv
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
|
||||
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
|
||||
fi
|
||||
|
||||
%files
|
||||
%exclude %{_libdir}/vlc/libcompat.a
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user