diff --git a/libquicktime.changes b/libquicktime.changes index 2a564dc..68636b7 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 25 06:10:58 UTC 2017 - olaf@aepfle.de + +- Enable lame unconditionally +- Remove ffmpeg conditional because it is always present + ------------------------------------------------------------------- Tue Jul 4 10:28:44 UTC 2017 - kstreitova@suse.com diff --git a/libquicktime.spec b/libquicktime.spec index 7f8901f..8330567 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -18,8 +18,6 @@ %bcond_with faac %bcond_with faad -%bcond_without ffmpeg -%bcond_with lame %bcond_with x264 %define sover 0 @@ -48,15 +46,14 @@ BuildRequires: doxygen BuildRequires: gtk2-devel BuildRequires: libdv-devel BuildRequires: libjpeg-devel +BuildRequires: libmp3lame-devel BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: pkg-config BuildRequires: schroedinger-devel BuildRequires: pkgconfig(gl) -%if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libswscale) -%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xext) @@ -70,9 +67,6 @@ BuildRequires: libfaac-devel %if %{with faad} BuildRequires: libfaad2-devel %endif -%if %{with lame} -BuildRequires: libmp3lame-devel -%endif %if %{with x264} BuildRequires: libx264-devel %endif @@ -165,15 +159,14 @@ find %{buildroot} -type f -name "*.la" -delete -print %dir %{_libdir}/libquicktime %{_libdir}/libquicktime/lqt_audiocodec.so %{_libdir}/libquicktime/lqt_dv.so +%{_libdir}/libquicktime/lqt_lame.so %{_libdir}/libquicktime/lqt_mjpeg.so %{_libdir}/libquicktime/lqt_png.so %{_libdir}/libquicktime/lqt_rtjpeg.so %{_libdir}/libquicktime/lqt_schroedinger.so %{_libdir}/libquicktime/lqt_videocodec.so %{_libdir}/libquicktime/lqt_vorbis.so -%if %{with ffmpeg} %{_libdir}/libquicktime/lqt_ffmpeg.so -%endif %if 0%{?BUILD_ORIG} %files orig-addon @@ -184,9 +177,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %if %{with faad} %{_libdir}/libquicktime/lqt_faad2.so %endif -%if %{with lame} -%{_libdir}/libquicktime/lqt_lame.so -%endif %if %{with x264} %{_libdir}/libquicktime/lqt_x264.so %endif