diff --git a/_multibuild b/_multibuild index c71e6a4..7c253f7 100644 --- a/_multibuild +++ b/_multibuild @@ -1,3 +1,3 @@ - ffmpeg-5-mini-devel + ffmpeg-5-mini diff --git a/ffmpeg-5-mini-devel-rpmlintrc b/ffmpeg-5-mini-rpmlintrc similarity index 100% rename from ffmpeg-5-mini-devel-rpmlintrc rename to ffmpeg-5-mini-rpmlintrc diff --git a/ffmpeg-5-mini-devel.spec b/ffmpeg-5-mini.spec similarity index 76% rename from ffmpeg-5-mini-devel.spec rename to ffmpeg-5-mini.spec index d9f5045..f6abc9c 100644 --- a/ffmpeg-5-mini-devel.spec +++ b/ffmpeg-5-mini.spec @@ -1,5 +1,5 @@ # -# spec file for package ffmpeg-5-mini-devel +# spec file for package ffmpeg-5-mini # # Copyright (c) 2023 SUSE LLC # @@ -17,15 +17,12 @@ %define _name ffmpeg -%define _major_version 5 -%define _major_expected 6 -Name: ffmpeg-5-mini-devel +Name: ffmpeg-5-mini Version: 5.1.2 Release: 0 Summary: Set of libraries for working with various multimedia formats License: GPL-3.0-or-later -Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://ffmpeg.org/ #Git-Clone: git://source.ffmpeg.org/ffmpeg Source: https://www.ffmpeg.org/releases/%_name-%version.tar.xz @@ -42,34 +39,51 @@ Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-CVE-2022-3964.patch Patch91: ffmpeg-dlopen-openh264.patch BuildRequires: c_compiler -Provides: libavcodec-devel = %version-%release -Conflicts: libavcodec-devel -Conflicts: libavcodec59 -Provides: libavdevice-devel = %version-%release -Conflicts: libavdevice-devel -Conflicts: libavdevice59 -Provides: libavfilter-devel = %version-%release -Conflicts: libavfilter-devel -Conflicts: libavfilter8 -Provides: libavformat-devel = %version-%release -Conflicts: libavformat-devel -Conflicts: libavformat59 -Provides: libavutil-devel = %version-%release -Conflicts: libavutil-devel -Conflicts: libavutil57 -Provides: libpostproc-devel = %version-%release -Conflicts: libpostproc-devel -Conflicts: libpostproc56 -Provides: libswresample-devel = %version-%release -Conflicts: libswresample-devel -Conflicts: libswresample4 -Provides: libswscale-devel = %version-%release -Conflicts: libswscale-devel -Conflicts: libswscale6 %description -FFmpeg is a multimedia framework. This package merely builds -the API for the sake of other packages. +FFmpeg is a multimedia framework. +This package merely builds the API for the sake of other packages. + +%package libs +# Even with mini, we want ff5 libs to be coinstallable to ff4-devel(!), +# hence mini-libs and mini-devel are still separated. +Summary: Feature-reduced build of FFmpeg, a multimedia framework +Conflicts: libavcodec59 +Conflicts: libavdevice59 +Conflicts: libavfilter8 +Conflicts: libavformat59 +Conflicts: libavutil57 +Conflicts: libpostproc56 +Conflicts: libswresample4 +Conflicts: libswscale6 + +%description libs +FFmpeg is a multimedia framework. +This package contains a cut-down version for building other packages. + +%package devel +Summary: Header files for feature-reduced FFmpeg build +Provides: libavcodec-devel = %version-%release +Conflicts: libavcodec-devel +Provides: libavdevice-devel = %version-%release +Conflicts: libavdevice-devel +Provides: libavfilter-devel = %version-%release +Conflicts: libavfilter-devel +Provides: libavformat-devel = %version-%release +Conflicts: libavformat-devel +Provides: libavutil-devel = %version-%release +Conflicts: libavutil-devel +Provides: libpostproc-devel = %version-%release +Conflicts: libpostproc-devel +Provides: libswresample-devel = %version-%release +Conflicts: libswresample-devel +Provides: libswscale-devel = %version-%release +Conflicts: libswscale-devel +Requires: %name-devel = %version-%release + +%description devel +FFmpeg is a multimedia framework. +This package contains the headers accompanying %name. %prep %autosetup -p1 -n %_name-%version @@ -90,11 +104,9 @@ CFLAGS="%optflags" \ --disable-muxers --disable-demuxers \ --disable-encoders --disable-decoders \ --disable-programs --disable-doc - for i in MPEG4 H263 H264 HEVC VC1; do grep -q "#define CONFIG_${i}_DECODER 0" config_components.h done - cat config.h %make_build @@ -103,12 +115,22 @@ b="%buildroot" %make_install rm -Rf "$b/%_datadir/ffmpeg/examples" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig -%files +%files libs +%_libdir/libavcodec.so.* +%_libdir/libavdevice.so.* +%_libdir/libavfilter.so.* +%_libdir/libavformat.so.* +%_libdir/libavutil.so.* +%_libdir/libpostproc.so.* +%_libdir/libswresample.so.* +%_libdir/libswscale.so.* + +%files devel %license COPYING.GPLv2 LICENSE.md -%_libdir/lib* +%_libdir/*.so %_libdir/pkgconfig/*.pc %_includedir/ffmpeg/