Reinstate cuda_sdk conditional
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=12
This commit is contained in:
parent
003a83005a
commit
5d95e9d459
@ -11,7 +11,7 @@ Thu Mar 10 13:37:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
|||||||
- Drop pkgconfig(librtmp) BuildRequires and stop passing
|
- Drop pkgconfig(librtmp) BuildRequires and stop passing
|
||||||
conditional --enable-librtmp to configure, built-in RTMP support
|
conditional --enable-librtmp to configure, built-in RTMP support
|
||||||
is better, and has listen mode.
|
is better, and has listen mode.
|
||||||
- Drop bcond conditionals for cuda_sdk, libaom, srt, lv2, soxr,
|
- Drop bcond conditionals for libaom, srt, lv2, soxr,
|
||||||
zmq, zimg and openmpt, build unconditionally for all supported
|
zmq, zimg and openmpt, build unconditionally for all supported
|
||||||
versions of openSUSE.
|
versions of openSUSE.
|
||||||
- Drop pkgconfig(enca) BuildRequires: Seems unused.
|
- Drop pkgconfig(enca) BuildRequires: Seems unused.
|
||||||
|
@ -37,6 +37,17 @@
|
|||||||
%preamble_string ffmpeg-private-devel %comparator %conflicts_version \
|
%preamble_string ffmpeg-private-devel %comparator %conflicts_version \
|
||||||
%nil
|
%nil
|
||||||
|
|
||||||
|
%if 0%{?BUILD_ORIG}
|
||||||
|
%bcond_without cuda_sdk
|
||||||
|
%else
|
||||||
|
# If software H264 is disabled, the hw driver must be as well:
|
||||||
|
# HW drivers can fail to initialize, namely when the hardware is absent.
|
||||||
|
# Browsers choose video formats on sites like youtube based on `ffmpeg
|
||||||
|
# -codecs` rather than the success/failure status of libav* initialization.
|
||||||
|
# This becomes a problem when a format only has a HW driver;
|
||||||
|
# the browser thinks it can do H264 but never succeeds.
|
||||||
|
%bcond_with cuda_sdk
|
||||||
|
%endif
|
||||||
%bcond_with amrwb
|
%bcond_with amrwb
|
||||||
%bcond_with fdk_aac_dlopen
|
%bcond_with fdk_aac_dlopen
|
||||||
%bcond_with opencore
|
%bcond_with opencore
|
||||||
@ -543,6 +554,9 @@ LDFLAGS="%_lto_cflags" \
|
|||||||
--enable-ladspa \
|
--enable-ladspa \
|
||||||
%if %{with vulkan}
|
%if %{with vulkan}
|
||||||
--enable-libshaderc --enable-vulkan \
|
--enable-libshaderc --enable-vulkan \
|
||||||
|
%endif
|
||||||
|
%if !%{with cuda_sdk}
|
||||||
|
--disable-cuda-sdk \
|
||||||
%endif
|
%endif
|
||||||
--enable-libaom \
|
--enable-libaom \
|
||||||
--enable-libass \
|
--enable-libass \
|
||||||
|
Loading…
Reference in New Issue
Block a user