rpm/libquicktime
SHA256
1
0
Fork 0
forked from pool/libquicktime
Code Pull Requests Activity

Accepting request 518648 from home:olh:branches:multimedia:libs

Browse Source 
- Enable lame unconditionally
- Remove ffmpeg conditional because it is always present

OBS-URL: https://build.opensuse.org/request/show/518648
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=74
This commit is contained in:
Tomáš Chvátal 2017-08-25 08:36:03 +00:00 committed by Git OBS Bridge
parent d761c3967f
commit 10804f8cf6
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libquicktime.changes
View File

@ -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 Tue Jul 4 10:28:44 UTC 2017 - kstreitova@suse.com

14
libquicktime.spec
View File

@ -18,8 +18,6 @@
%bcond_with faac %bcond_with faac
%bcond_with faad %bcond_with faad
%bcond_without ffmpeg
%bcond_with lame
%bcond_with x264 %bcond_with x264
%define sover 0 %define sover 0
@ -48,15 +46,14 @@ BuildRequires: doxygen
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: libdv-devel BuildRequires: libdv-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libmp3lame-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: schroedinger-devel BuildRequires: schroedinger-devel
BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gl)
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libswscale)
%endif
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xext)
@ -70,9 +67,6 @@ BuildRequires: libfaac-devel
%if %{with faad} %if %{with faad}
BuildRequires: libfaad2-devel BuildRequires: libfaad2-devel
%endif %endif
%if %{with lame}
BuildRequires: libmp3lame-devel
%endif
%if %{with x264} %if %{with x264}
BuildRequires: libx264-devel BuildRequires: libx264-devel
%endif %endif
@ -165,15 +159,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
%dir %{_libdir}/libquicktime %dir %{_libdir}/libquicktime
%{_libdir}/libquicktime/lqt_audiocodec.so %{_libdir}/libquicktime/lqt_audiocodec.so
%{_libdir}/libquicktime/lqt_dv.so %{_libdir}/libquicktime/lqt_dv.so
%{_libdir}/libquicktime/lqt_lame.so
%{_libdir}/libquicktime/lqt_mjpeg.so %{_libdir}/libquicktime/lqt_mjpeg.so
%{_libdir}/libquicktime/lqt_png.so %{_libdir}/libquicktime/lqt_png.so
%{_libdir}/libquicktime/lqt_rtjpeg.so %{_libdir}/libquicktime/lqt_rtjpeg.so
%{_libdir}/libquicktime/lqt_schroedinger.so %{_libdir}/libquicktime/lqt_schroedinger.so
%{_libdir}/libquicktime/lqt_videocodec.so %{_libdir}/libquicktime/lqt_videocodec.so
%{_libdir}/libquicktime/lqt_vorbis.so %{_libdir}/libquicktime/lqt_vorbis.so
%if %{with ffmpeg}
%{_libdir}/libquicktime/lqt_ffmpeg.so %{_libdir}/libquicktime/lqt_ffmpeg.so
%endif
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
%files orig-addon %files orig-addon
@ -184,9 +177,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
%if %{with faad} %if %{with faad}
%{_libdir}/libquicktime/lqt_faad2.so %{_libdir}/libquicktime/lqt_faad2.so
%endif %endif
%if %{with lame}
%{_libdir}/libquicktime/lqt_lame.so
%endif
%if %{with x264} %if %{with x264}
%{_libdir}/libquicktime/lqt_x264.so %{_libdir}/libquicktime/lqt_x264.so
%endif %endif