From 5c6ad0b40fa5137bbc5d379f5a360bd1ca5c8515 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 30 Apr 2018 00:50:42 +0200 Subject: [PATCH] - API that is required for lavcrate has been removed, so disable the plugin - rel 2 --- alsa-plugins.spec | 10 +++++++++- no-lavcreate.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 no-lavcreate.patch diff --git a/alsa-plugins.spec b/alsa-plugins.spec index b00ff1e..534f569 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,13 +1,18 @@ +# +# Conditional build: +%bcond_with lavcrate # build lavcrate plugin (requires ffmpeg < 4) +# Summary: Advanced Linux Sound Architecture - plugins Summary(pl.UTF-8): Advanced Linux Sound Architecture - wtyczki Name: alsa-plugins Version: 1.1.6 -Release: 1 +Release: 2 License: LGPL v2.1+ Group: Libraries Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 # Source0-md5: 8387279e99feeb2ecffaac5f293223d7 Source1: %{name}-pulse.conf +Patch0: no-lavcreate.patch URL: http://www.alsa-project.org/ BuildRequires: alsa-lib-devel >= 1.0.18 BuildRequires: autoconf >= 2.59 @@ -196,6 +201,7 @@ Wtyczka wejścia-wyjścia PCM usb_stream dla systemu ALSA. %prep %setup -q +%{!?with_lavcrate:%patch0 -p1} %build %{__libtoolize} @@ -237,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT %doc doc/README-jack %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_jack.so +%if %{with lavcrate} %files lavcrate %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate.so @@ -244,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_faster.so %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_high.so %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_higher.so +%endif %files maemo %defattr(644,root,root,755) diff --git a/no-lavcreate.patch b/no-lavcreate.patch new file mode 100644 index 0000000..2d9bdbb --- /dev/null +++ b/no-lavcreate.patch @@ -0,0 +1,11 @@ +--- alsa-plugins-1.1.6/Makefile.am~ 2018-04-03 09:01:38.000000000 +0200 ++++ alsa-plugins-1.1.6/Makefile.am 2018-04-30 00:47:42.414947728 +0200 +@@ -9,7 +9,7 @@ + SUBDIRS += rate + endif + if HAVE_AVCODEC +-SUBDIRS += a52 rate-lavc ++SUBDIRS += a52 + endif + if HAVE_MAEMO_PLUGIN + SUBDIRS += maemo -- 2.43.0