From 9c9a7087da52ae1ccdb144965bd293a3114720eb0f6ef3f00e3d95f46e0fd569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 11 Jun 2019 13:51:31 +0000 Subject: [PATCH] - Rename bcond fdk_aac to fdk_aac_dlopen - Remove fdk-aac BuildRequires now it's only dlopen'd OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=71 --- ffmpeg-4.changes | 2 ++ ffmpeg-4.spec | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 17a253e..5c0213e 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -5,6 +5,8 @@ Tue Jun 11 11:12:43 UTC 2019 - Ismail Dönmez from OpenMandriva to optionally enable runtime enabling of fdkaac/lame/x264/x265 - Enable runtime enabling for fdkaac via --enable-libfdk-aac-dlopen +- Rename bcond fdk_aac to fdk_aac_dlopen +- Remove fdk-aac BuildRequires now it's only dlopen'd ------------------------------------------------------------------- Tue May 14 11:38:01 UTC 2019 - Martin Liška diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 56a4a20..7278530 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -49,7 +49,7 @@ %else %bcond_with cuda_sdk %endif -%bcond_with fdk_aac +%bcond_with fdk_aac_dlopen %bcond_with librtmp %bcond_with opencore %bcond_with x264 @@ -207,9 +207,6 @@ BuildRequires: pkgconfig(zimg) %endif BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 -%if %{with fdk_aac} -BuildRequires: pkgconfig(fdk-aac) -%endif %if %{with librtmp} BuildRequires: pkgconfig(librtmp) %endif @@ -669,7 +666,7 @@ LDFLAGS="%_lto_cflags" \ %endif --enable-vaapi \ --enable-vdpau \ -%if %{with fdk_aac} +%if %{with fdk_aac_dlopen} --enable-libfdk-aac-dlopen \ --enable-nonfree \ %endif