From 3f91efdd4d1c15a825f2e5735eeece8acefc0dfef69727a56f9c74e793012a25 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 3 May 2019 20:28:12 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 95.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=6673cce95ba3584942b55af97ca7368b --- vlc.changes | 13 +++++++++++++ vlc.spec | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/vlc.changes b/vlc.changes index 85bdbff..7e1a97e 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu May 2 15:42:08 UTC 2019 - olaf@aepfle.de + +- The license of fdk-aac is not GPL compatible, therefore this pkg + can not possibly be built with fdk-aac by default + To gain fdk-aac support, recompile it at home and keep it there +- Restore code to handle faad + +------------------------------------------------------------------- +Wed Apr 24 17:44:49 UTC 2019 - Martin Liška + +- Disable LTO (boo#1133290). + ------------------------------------------------------------------- Wed Mar 20 11:05:26 UTC 2019 - Dominique Leuenberger diff --git a/vlc.spec b/vlc.spec index 9c6db2f..a823af0 100644 --- a/vlc.spec +++ b/vlc.spec @@ -30,6 +30,8 @@ %bcond_with fluidsynth # 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 +%bcond_with fdk_aac Name: vlc Version: 3.0.6 Release: 0 @@ -223,7 +225,12 @@ BuildRequires: pkgconfig(ncursesw) # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons. %if 0%{?BUILD_ORIG} BuildRequires: libxvidcore-devel +%if %{with faad} +BuildRequires: libfaad-devel +%endif +%if %{with fdk_aac} BuildRequires: pkgconfig(fdk-aac) +%endif BuildRequires: pkgconfig(libdca) >= 0.0.5 BuildRequires: pkgconfig(x264) >= 0.8.6 BuildRequires: pkgconfig(x265) @@ -402,6 +409,7 @@ sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt/dialogs/help.cpp src/ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c %build +%define _lto_cflags %{nil} %if 0%{?suse_version} < 1500 export CC=%{_bindir}/gcc-7 export CXX=%{_bindir}/g++-7 @@ -466,7 +474,12 @@ autoreconf -fiv --disable-wayland \ %endif %if 0%{?BUILD_ORIG} +%if %{with fdk_aac} --enable-fdkaac \ +%endif +%if %{with faad} + --enable-faad \ +%endif --enable-dca \ --enable-x265 \ %else @@ -1139,7 +1152,12 @@ done %if 0%{?BUILD_ORIG} %files codecs %{_libdir}/vlc/plugins/codec/libdca_plugin.so +%if %{with faad} +%{_libdir}/vlc/plugins/codec/libfaad_plugin.so +%endif +%if %{with fdk_aac} %{_libdir}/vlc/plugins/codec/libfdkaac_plugin.so +%endif %{_libdir}/vlc/plugins/codec/libx264_plugin.so %{_libdir}/vlc/plugins/codec/libx26410b_plugin.so %{_libdir}/vlc/plugins/codec/libx265_plugin.so