From dcec3b11f7c26eb842f696309e3290b3710cb02b9055fd1e9bb4ab6db668d0a2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 25 Jul 2016 13:12:58 +0000 Subject: [PATCH] Accepting request 415077 from home:olh:branches:multimedia:libs - Convert buildconditionals for faac, faad, lame and x264 OBS-URL: https://build.opensuse.org/request/show/415077 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=62 --- libquicktime.changes | 5 +++++ libquicktime.spec | 26 ++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/libquicktime.changes b/libquicktime.changes index 4766b7d..99b53cc 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 25 12:44:39 UTC 2016 - olaf@aepfle.de + +- Convert buildconditionals for faac, faad, lame and x264 + ------------------------------------------------------------------- Wed Feb 17 13:26:59 UTC 2016 - olaf@aepfle.de diff --git a/libquicktime.spec b/libquicktime.spec index 06da9f2..7e8599a 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -16,6 +16,12 @@ # +%bcond_with faac +%bcond_with faad +%bcond_without ffmpeg +%bcond_with lame +%bcond_with x264 + %define soname 0 %define cvs 20150223 Name: libquicktime @@ -43,18 +49,26 @@ 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) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xv) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?BUILD_ORIG} +%if %{with faac} BuildRequires: libfaac-devel +%endif +%if %{with faad} BuildRequires: libfaad2-devel +%endif +%if %{with lame} BuildRequires: libmp3lame-devel +%endif +%if %{with x264} BuildRequires: libx264-devel %endif @@ -134,11 +148,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libquicktime/lqt_schroedinger.so %{_libdir}/libquicktime/lqt_videocodec.so %{_libdir}/libquicktime/lqt_vorbis.so +%if %{with ffmpeg} %{_libdir}/libquicktime/lqt_ffmpeg.so -%if 0%{?BUILD_ORIG} +%endif +%if %{with faac} %{_libdir}/libquicktime/lqt_faac.so +%endif +%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