From 579ae1b76e5bc3dbdd8955023ad521cfc749a3117a1430de272425730b742bf5 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Thu, 2 May 2013 10:32:35 +0000 Subject: [PATCH] - By default disable VDPAU as requested by Dan Dennedy OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=34 --- libmlt.changes | 5 +++++ libmlt.spec | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libmlt.changes b/libmlt.changes index ddb212e..23adf90 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 2 10:31:45 UTC 2013 - reddwarf@opensuse.org + +- By default disable VDPAU as requested by Dan Dennedy + ------------------------------------------------------------------- Fri Apr 19 12:13:34 CEST 2013 - tiwai@suse.de diff --git a/libmlt.spec b/libmlt.spec index 373a1d1..3e69a92 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -17,6 +17,8 @@ %bcond_with ffmpeg +# Dan Dennedy asked to disable it since it's buggy and unmaintained (see e.g. http://www.kdenlive.org/mantis/view.php?id=3070) +%bcond_with vdpau %define _name mlt %define libname lib%{_name} @@ -36,7 +38,7 @@ Url: http://%{_name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE libmlt-0.8.2-vdpau.patch reddwarf@opensuse.org -- Make VDPAU support work without the devel package Patch1: libmlt-0.8.2-vdpau.patch -# PATCH-FIX-UPSTREAM libmlt-0.8.0-vdpau.patch sf#3555214 reddwarf@opensuse.org -- Install modules and data in versioned directories +# PATCH-FIX-UPSTREAM libmlt-0.8.0-versioned_dirs.patch sf#3555214 reddwarf@opensuse.org -- Install modules and data in versioned directories Patch2: libmlt-0.8.0-versioned_dirs.patch BuildRequires: gcc-c++ BuildRequires: ladspa-devel @@ -67,10 +69,12 @@ BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) +%if %{with vdpau} BuildRequires: pkgconfig(vdpau) # VDPAU support requires it BuildRequires: pkgconfig(x11) %endif +%endif %description MLT is an open source multimedia framework, designed and developed for @@ -162,9 +166,11 @@ Requires: %{libname}%{soname} = %{version} Recommends: frei0r-plugins %if %{with ffmpeg} Provides: mlt(%{soname})(avformat) +%if %{with vdpau} # I would recommend it, but to the best of my knowledge nobody but nvidia provides a backend Suggests: %(rpm -qf $(readlink -e %{_libdir}/libvdpau.so) --qf '%{NAME}') %endif +%endif %description -n %{libname}%{soname}-modules MLT is an open source multimedia framework, designed and developed for @@ -221,8 +227,10 @@ sed "s/__VDPAU_SONAME__/${VDPAU_SONAME}/" -i src/modules/avformat/vdpau.c --disable-mmx \ %endif %if %{with ffmpeg} +%if %{with vdpau} --avformat-vdpau \ %endif +%endif --swig-languages=python make %{?_smp_mflags}