From c88e187dc3cd636d0edd5f951d45b3f2b8a10b65ab725df7b48d5a1a755e1f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 31 Mar 2020 15:36:12 +0000 Subject: [PATCH] - Add Samba support for Factory (as this needs a fix in Samba itself) Add --enable-libsmbclient to configure, add BR on pkgconfig(smbclient) - License is now GPLv3+ by default (--enable-version3) OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=110 --- ffmpeg-4.changes | 7 +++++++ ffmpeg-4.spec | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index ea9c102..c08d104 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez + +- Add Samba support for Factory (as this needs a fix in Samba itself) + Add --enable-libsmbclient to configure, add BR on pkgconfig(smbclient) +- License is now GPLv3+ by default (--enable-version3) + ------------------------------------------------------------------- Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 153dc65..6948763 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -60,6 +60,7 @@ %bcond_without libaom %bcond_without mysofa %bcond_without vidstab +%bcond_without smbclient %bcond_without srt %bcond_without codec2 %bcond_without lv2 @@ -70,6 +71,7 @@ %bcond_with libaom %bcond_with mysofa %bcond_with vidstab +%bcond_with smbclient %bcond_with srt %bcond_with codec2 %bcond_with lv2 @@ -93,7 +95,7 @@ Name: ffmpeg-4 Version: 4.2.2 Release: 0 Summary: Library for working with various multimedia formats -License: LGPL-2.1-or-later AND GPL-2.0-or-later +License: GPL-3.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://ffmpeg.org/ @@ -177,6 +179,9 @@ BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(rubberband) %endif BuildRequires: pkgconfig(sdl2) +%if %{with smbclient} +BuildRequires: pkgconfig(smbclient) +%endif %if %{with soxr} BuildRequires: pkgconfig(soxr) %endif @@ -598,6 +603,10 @@ LDFLAGS="%_lto_cflags" \ --enable-shared \ --disable-static \ --enable-gpl \ + --enable-version3 \ +%if %{with smbclient} + --enable-libsmbclient \ +%endif --disable-openssl \ --enable-avresample \ --enable-gnutls \ @@ -687,11 +696,9 @@ LDFLAGS="%_lto_cflags" \ %if %{with opencore} --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ - --enable-version3 \ %endif %if %{with amrwb} --enable-libvo-amrwbenc \ - --enable-version3 \ %endif %if %{with x264} --enable-libx264 \