- updated to 1.1.1

- removed obsolete ffmpeg3 patch

diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index c3038095ec8f64df90a349961b6ffc155a98e4d1..02352fba3157ddc6fd3c82c62b1dcb55dfe12d94 100644 (file)
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -1,14 +1,13 @@
 Summary:       Advanced Linux Sound Architecture - plugins
 Summary(pl.UTF-8):     Advanced Linux Sound Architecture - wtyczki
 Name:          alsa-plugins
-Version:       1.1.0
-Release:       2
+Version:       1.1.1
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
-# Source0-md5: b123e42ed881b9adbc99e4040f257c39
+# Source0-md5: 69f9f3e2de3c97fc71d496e91e271fe5
 Source1:       %{name}-pulse.conf
-Patch0:                ffmpeg3.patch
 URL:           http://www.alsa-project.org/
 BuildRequires: alsa-lib-devel >= 1.0.18
 BuildRequires: automake
@@ -195,7 +194,6 @@ Wtyczka wejścia-wyjścia PCM usb_stream dla systemu ALSA.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .

diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644 (file)
index 3adf1d7..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- alsa-plugins-1.1.0/a52/pcm_a52.c.orig      2015-10-27 14:34:06.000000000 +0100
-+++ alsa-plugins-1.1.0/a52/pcm_a52.c   2016-03-21 12:25:16.452315942 +0100
-@@ -39,7 +39,7 @@
- #endif
- 
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
--#include <libavutil/audioconvert.h>
-+//#include <libavutil/audioconvert.h>
- #include <libavutil/mem.h>
- #define USE_AVCODEC_FRAME
- #endif
-@@ -513,7 +513,7 @@
-               rec->inbuf = NULL;
-       }
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
--      avcodec_free_frame(&rec->frame);
-+      av_frame_free(&rec->frame);
- #else
-       av_freep(&rec->frame);
- #endif
-@@ -557,7 +557,7 @@
- {
-       struct a52_ctx *rec = io->private_data;
- #ifdef USE_AVCODEC_FRAME
--      rec->frame = avcodec_alloc_frame();
-+      rec->frame = av_frame_alloc();
-       if (!rec->frame)
-               return -ENOMEM;
-       if (av_samples_alloc(rec->frame->data, rec->frame->linesize,