[SCM] audacious-plugins/master: Drop no longer needed patches.

andrewsh at users.alioth.debian.org andrewsh at users.alioth.debian.org
Tue Jul 1 07:26:53 UTC 2014


The following commit has been merged in the master branch:
commit b0ee8bff0e96328c035a21c6d6e5277f6b5e9299
Author: Andrew Shadura <andrew at shadura.me>
Date:   Tue Jul 1 09:26:14 2014 +0200

    Drop no longer needed patches.

diff --git a/debian/patches/01-enable_ffaudio.patch b/debian/patches/01-enable_ffaudio.patch
deleted file mode 100644
index 8ef521a..0000000
--- a/debian/patches/01-enable_ffaudio.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Loosen dependency on libavcodec to allow the build FFaudio plugin.
-From: https://bugs.launchpad.net/ubuntu/+source/audacious-plugins/+bug/1200345
-Forwarded: no
----
- configure.ac |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -514,11 +514,11 @@ AC_ARG_ENABLE(ffaudio,
- 
- have_ffaudio=no
- if test "x$enable_ffaudio" != "xno"; then
--    PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0],
-+    PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.35.0 libavformat >= 53.5.0 libavutil >= 50.42.0],
-         [have_ffaudio=yes
-          INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"],
-         [if test "x$enable_ffaudio" = "xyes"; then
--            AC_MSG_ERROR([Cannot find FFmpeg development files (libavcodec ver >= 53.40.0, libavformat ver >= 53.5.0, libavutil ver >= 50.42.0), but compilation of ffaudio plugin has been explicitly requested; please install FFmpeg dev files and run configure again])
-+            AC_MSG_ERROR([Cannot find FFmpeg development files (libavcodec ver >= 53.35.0, libavformat ver >= 53.5.0, libavutil ver >= 50.42.0), but compilation of ffaudio plugin has been explicitly requested; please install FFmpeg dev files and run configure again])
-          fi]
-     )
- fi
diff --git a/debian/patches/libav10.patch b/debian/patches/libav10.patch
deleted file mode 100644
index c0f5129..0000000
--- a/debian/patches/libav10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8398c021f03fc89deab000c91464d1dd2fb8e9b4 Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton at khirnov.net>
-Date: Thu, 16 Jan 2014 12:52:59 +0100
-Subject: [PATCH] ffaudio: fix build with latest libavcodec versions
-
----
- src/ffaudio/ffaudio-core.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/ffaudio/ffaudio-core.c
-+++ b/src/ffaudio/ffaudio-core.c
-@@ -283,7 +283,11 @@ ffaudio_codec_is_seekable(AVCodec *codec
-      */
-     switch (codec->id) {
- #ifndef FFAUDIO_NO_BLACKLIST
-+#if CHECK_LIBAVCODEC_VERSION(54, 25, 0)
-+        case AV_CODEC_ID_MUSEPACK8:
-+#else
-         case CODEC_ID_MUSEPACK8:
-+#endif
-             AUDDBG("codec is blacklisted from seeking\n");
-             return FALSE;
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d00c45a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-enable_ffaudio.patch
-libav10.patch

-- 
Plugins for audacious



More information about the pkg-multimedia-commits mailing list