summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-11-25 12:43:57 +0000
committernia <nia@pkgsrc.org>2019-11-25 12:43:57 +0000
commit6b83d8f2f4497e04b6cfa2c31949da073457e230 (patch)
treeac4bc4cf67f523e08831bcd3cc9b4ee7c88cee0b
parent624d57d15c57dfb3685626288f7f596f5a089b2a (diff)
downloadpkgsrc-6b83d8f2f4497e04b6cfa2c31949da073457e230.tar.gz
Remove audio/akode.
This library is dead upstream, used by nothing in pkgsrc. Readily available alternatives to the included example player include mpg123, flac123, ogg123 (part of vorbis-tools package), mpc, ffplay, etc. It's hard to find evidence of this existing in other package repositories. It was formerly part of KDE 3 (used by kde-multimedia 3) and the last release was in 2007. The original website disappeared at some point in 2010.
-rw-r--r--audio/akode/DESCR5
-rw-r--r--audio/akode/Makefile16
-rw-r--r--audio/akode/Makefile.common42
-rw-r--r--audio/akode/PLIST29
-rw-r--r--audio/akode/buildlink3.mk15
-rw-r--r--audio/akode/distinfo24
-rw-r--r--audio/akode/patches/patch-aa13
-rw-r--r--audio/akode/patches/patch-ab31
-rw-r--r--audio/akode/patches/patch-ac144
-rw-r--r--audio/akode/patches/patch-ad46
-rw-r--r--audio/akode/patches/patch-ae13
-rw-r--r--audio/akode/patches/patch-af19
-rw-r--r--audio/akode/patches/patch-ag48
-rw-r--r--audio/akode/patches/patch-ah29
-rw-r--r--audio/akode/patches/patch-ai22
-rw-r--r--audio/akode/patches/patch-aj12
-rw-r--r--audio/akode/patches/patch-ak13
-rw-r--r--audio/akode/patches/patch-akode-lib-converter.cpp13
-rw-r--r--audio/akode/patches/patch-akode-lib-crossfader.cpp22
-rw-r--r--audio/akode/patches/patch-akode-lib-fast_resampler.cpp13
-rw-r--r--audio/akode/patches/patch-akode-lib-volumefilter.cpp13
-rw-r--r--audio/akode/patches/patch-akode_plugins_sun__sink_sun__sink.cpp15
-rw-r--r--audio/akode/patches/patch-al12
-rw-r--r--audio/akode/patches/patch-am14
24 files changed, 0 insertions, 623 deletions
diff --git a/audio/akode/DESCR b/audio/akode/DESCR
deleted file mode 100644
index cea5a7617c6..00000000000
--- a/audio/akode/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-aKode is a simple audio decoding framework that provides a uniform interface
-to decode the most common audio formats. It also has a direct playback option
-for a number of audio outputs.
-
-This package provides the aKode library and akodeplay testing utility.
diff --git a/audio/akode/Makefile b/audio/akode/Makefile
deleted file mode 100644
index c8b40e47d92..00000000000
--- a/audio/akode/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2012/09/11 23:59:21 asau Exp $
-#
-
-PKGNAME= akode-2.0.2
-PKGREVISION= 3
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Simple audio decoding framework (base package)
-LICENSE= gnu-lgpl-v2
-
-.include "../../audio/akode/Makefile.common"
-
-REPLACE_SH= akode/akode-config.in
-
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/akode/Makefile.common b/audio/akode/Makefile.common
deleted file mode 100644
index 42d04185557..00000000000
--- a/audio/akode/Makefile.common
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2016/08/30 10:39:08 mef Exp $
-#
-# used by audio/akode/Makefile
-# used by audio/akode-plugins-alsa/Makefile
-# used by audio/akode-plugins-jack/Makefile
-# used by audio/akode-plugins-mpc/Makefile
-# used by audio/akode-plugins-mpeg/Makefile
-# used by audio/akode-plugins-oss/Makefile
-# used by audio/akode-plugins-pulseaudio/Makefile
-# used by audio/akode-plugins-resampler/Makefile
-# used by audio/akode-plugins-sun/Makefile
-# used by audio/akode-plugins-xiph/Makefile
-
-AKODE_VERSION= 2.0.2
-DISTNAME= 30375-akode-${AKODE_VERSION}
-CATEGORIES= audio
-MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.linux-apps.com/p/1126584/
-
-WRKSRC= ${WRKDIR}/akode-${AKODE_VERSION}
-
-GNU_CONFIGURE= yes
-SET_LIBDIR= yes
-USE_TOOLS+= gmake pkg-config
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-CONFIGURE_ARGS+= --without-flac
-CONFIGURE_ARGS+= --without-speex
-CONFIGURE_ARGS+= --without-libmad
-CONFIGURE_ARGS+= --without-libsamplerate
-CONFIGURE_ARGS+= --without-jack
-CONFIGURE_ARGS+= --without-polypaudio
-CONFIGURE_ARGS+= --without-ffmpeg
-CONFIGURE_ARGS+= --without-oss
-CONFIGURE_ARGS+= --without-sun
-CONFIGURE_ARGS+= --without-alsa
-CONFIGURE_ARGS+= --without-vorbis
-CONFIGURE_ARGS+= --without-mpc
diff --git a/audio/akode/PLIST b/audio/akode/PLIST
deleted file mode 100644
index aa9b92ec6a9..00000000000
--- a/audio/akode/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:01 joerg Exp $
-bin/akode-config
-bin/akodeplay
-include/akode/akode_export.h
-include/akode/akodelib.h
-include/akode/audiobuffer.h
-include/akode/audioconfiguration.h
-include/akode/audioframe.h
-include/akode/auto_sink.h
-include/akode/buffered_decoder.h
-include/akode/bytebuffer.h
-include/akode/converter.h
-include/akode/crossfader.h
-include/akode/decoder.h
-include/akode/encoder.h
-include/akode/fast_resampler.h
-include/akode/file.h
-include/akode/framedecoder.h
-include/akode/localfile.h
-include/akode/magic.h
-include/akode/mmapfile.h
-include/akode/player.h
-include/akode/pluginhandler.h
-include/akode/resampler.h
-include/akode/sink.h
-include/akode/void_sink.h
-include/akode/volumefilter.h
-include/akode/wav_decoder.h
-lib/libakode.la
diff --git a/audio/akode/buildlink3.mk b/audio/akode/buildlink3.mk
deleted file mode 100644
index a8fe7d6f4d7..00000000000
--- a/audio/akode/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/12/15 21:30:51 joerg Exp $
-
-BUILDLINK_TREE+= akode
-
-.if !defined(AKODE_BUILDLINK3_MK)
-AKODE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.akode+= akode>=2.0.2
-BUILDLINK_ABI_DEPENDS.akode+= akode>=2.0.2nb2
-BUILDLINK_PKGSRCDIR.akode?= ../../audio/akode
-
-.include "../../devel/libltdl/buildlink3.mk"
-.endif # AKODE_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -akode
diff --git a/audio/akode/distinfo b/audio/akode/distinfo
deleted file mode 100644
index 67a0d76f275..00000000000
--- a/audio/akode/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.12 2018/02/01 10:25:13 jperkin Exp $
-
-SHA1 (30375-akode-2.0.2.tar.bz2) = 10ad1e335bc53c2a90d133b493568324514c729c
-RMD160 (30375-akode-2.0.2.tar.bz2) = fa0322367d8e24e541007d3f9e508c3c31370d96
-SHA512 (30375-akode-2.0.2.tar.bz2) = 174bda1e0688ad5443c005378b7ffeab2a606edfff87dbd100055d49e768525009f98f529dbac47c21ed10a361dcffdc6e957073329f49915f1091e2a31004bb
-Size (30375-akode-2.0.2.tar.bz2) = 472605 bytes
-SHA1 (patch-aa) = e984dc5d4f1e62812d8c0c9db4bf0476c1edf3fa
-SHA1 (patch-ab) = eacf146458434fd6ecdbf39310c853f1af246202
-SHA1 (patch-ac) = 9e12ccc124cef7e547829fc4f4d0c4b35933e962
-SHA1 (patch-ad) = 9bd599a37dbbe7ed9ce9b1d3bc9520f5e53f7a87
-SHA1 (patch-ae) = e1b8b9439907a92531c1e0a0c4b494bd7776f770
-SHA1 (patch-af) = 99f17f5d3a58ad659a1a8c4dab5ddf6b5382dbff
-SHA1 (patch-ag) = bb9d4e56766fb5806ce88a9b956fcd42c5d0e629
-SHA1 (patch-ah) = f58249f5d32e86e82a5831a826dafc0590653a5e
-SHA1 (patch-ai) = 0b1196a792259ed573c964f66b68f56adb8a4b0e
-SHA1 (patch-aj) = c8dcff8937b4bf72b34479ac7d701fdf241d14cd
-SHA1 (patch-ak) = 45ce8e7d2ca98c64a56af4f549208de9de89757d
-SHA1 (patch-akode-lib-converter.cpp) = 5eacaa5a85b4ba2262de2e96be291ea247b4594e
-SHA1 (patch-akode-lib-crossfader.cpp) = 4b952c0fa2e1e39b0c530456405297aa33b91ceb
-SHA1 (patch-akode-lib-fast_resampler.cpp) = d244060bf2ab0035296ef96ab7f20460230f1f9c
-SHA1 (patch-akode-lib-volumefilter.cpp) = b070ec761fbb4fe34376f57b953fdc5529cf3068
-SHA1 (patch-akode_plugins_sun__sink_sun__sink.cpp) = 1c6019f0b27b0a910f9e5126605a5dc5317b7e15
-SHA1 (patch-al) = b910d7a82a1a341e8b3929e09f6d16470bdbb34f
-SHA1 (patch-am) = 4dfe0ef9dfb74ea9c4d2c02801860e307484c148
diff --git a/audio/akode/patches/patch-aa b/audio/akode/patches/patch-aa
deleted file mode 100644
index 2b347c4c17a..00000000000
--- a/audio/akode/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $
-
---- akode/plugins/xiph_decoder/flac113_decoder.cpp.orig 2008-12-05 15:27:25 +0200
-+++ akode/plugins/xiph_decoder/flac113_decoder.cpp 2008-12-05 15:27:44 +0200
-@@ -108,7 +108,7 @@ struct FLACDecoder::private_data {
- static FLAC__StreamDecoderReadStatus flac_read_callback(
- const FLAC__StreamDecoder *,
- FLAC__byte buffer[],
-- unsigned *bytes,
-+ size_t *bytes,
- void *client_data)
- {
- FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data;
diff --git a/audio/akode/patches/patch-ab b/audio/akode/patches/patch-ab
deleted file mode 100644
index 25f62c2910d..00000000000
--- a/audio/akode/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/11/23 23:25:36 joerg Exp $
-
---- akode/plugins/sun_sink/sun_sink.cpp.orig 2005-10-28 08:57:18.000000000 +0000
-+++ akode/plugins/sun_sink/sun_sink.cpp
-@@ -20,13 +20,15 @@
-
- #include <config.h>
-
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
- #include <sys/audioio.h>
-
--#include <sys/ioctl.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
--#include <alloca.h>
-
- #include <audioframe.h>
- #include "sun_sink.h"
-@@ -97,7 +99,7 @@ int SunSink::setAudioConfiguration(const
- {
- d->config = *config;
-
-- AUDIO_INITINFO(&d->auinfo)
-+ AUDIO_INITINFO(&d->auinfo);
-
- if (ioctl(d->audio_fd, AUDIO_GETINFO, &d->auinfo) < 0)
- {
diff --git a/audio/akode/patches/patch-ac b/audio/akode/patches/patch-ac
deleted file mode 100644
index 5454eb8e782..00000000000
--- a/audio/akode/patches/patch-ac
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2018/02/01 10:25:13 jperkin Exp $
-
-Remove bogus Solaris/GCC test.
-
---- configure.orig 2007-04-06 13:23:22.000000000 +0000
-+++ configure
-@@ -913,6 +913,8 @@ VORBIS_LIBS
- VORBISFILE_LIBS
- include_xiph_decoder_TRUE
- include_xiph_decoder_FALSE
-+include_mpc_decoder_FALSE
-+include_mpc_decoder_TRUE
- include_src_resampler_TRUE
- include_src_resampler_FALSE
- include_alsa_sink_TRUE
-@@ -1559,6 +1561,7 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-tags[=TAGS] include additional configurations [automatic]
-+ --with-mpc Enable MPC support [default=yes]
- --with-flac Enable FLAC support [default=check]
- --with-speex Enable speex support [default=check]
- --with-libmad Enable libmad support [default=check]
-@@ -7053,7 +7056,7 @@ fi
- *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
- *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
- *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-- *-*-solaris*)
-+ *-*-notsolaris*)
- if test "$GXX" = yes; then
- libstdcpp=`$CXX -print-file-name=libstdc++.so`
- if test ! -f $libstdcpp; then
-@@ -23630,6 +23633,12 @@ ac_config_headers="$ac_config_headers ak
-
-
-
-+# Check whether --with-mpc was given.
-+if test "${with_mpc+set}" = set; then
-+ withval=$with_mpc; with_mpc="$withval"
-+else
-+ with_mpc="yes"
-+fi
-
- # Check whether --with-flac was given.
- if test "${with_flac+set}" = set; then
-@@ -23639,6 +23648,8 @@ else
- fi
-
-
-+have_libFLAC=no
-+have_libOggFLAC=no
- if test "x$flac_test" = "xyes" ; then
-
-
-@@ -24539,6 +24550,7 @@ else
- fi
-
-
-+have_libspeex=no
- if test "x$speex_test" = "xyes" ; then
- { echo "$as_me:$LINENO: checking for speex headers" >&5
- echo $ECHO_N "checking for speex headers... $ECHO_C" >&6; }
-@@ -24554,8 +24566,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include <speex.h>
-- #include <speex_callbacks.h>
-+ #include <speex/speex.h>
-+ #include <speex/speex_callbacks.h>
- #include <ogg/ogg.h>
-
- int
-@@ -24733,10 +24745,10 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include <speex.h>
-- #include <speex_callbacks.h>
-- #include <speex_echo.h>
-- #include <speex_preprocess.h>
-+ #include <speex/speex.h>
-+ #include <speex/speex_callbacks.h>
-+ #include <speex/speex_echo.h>
-+ #include <speex/speex_preprocess.h>
- #include <ogg/ogg.h>
-
- int
-@@ -25506,12 +25518,12 @@ fi
-
-
- if test "x$polypaudio_test" = "xyes" ; then
--{ echo "$as_me:$LINENO: checking for Polypaudio 0.7 or later" >&5
--echo $ECHO_N "checking for Polypaudio 0.7 or later... $ECHO_C" >&6; }
--if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
-- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
-- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
-- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
-+{ echo "$as_me:$LINENO: checking for Pulseaudio 0.9.2 or later" >&5
-+echo $ECHO_N "checking for Pulseaudio 0.9.2 or later... $ECHO_C" >&6; }
-+if $PKG_CONFIG --atleast-version 0.7 libpulse-simple >/dev/null 2>&1 ; then
-+ POLYP_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
-+ POLYP_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
-+ POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
- have_polyp=yes
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -28341,6 +28353,13 @@ if test x$have_libFLAC$have_libOggFLAC$h
- fi
-
-
-+if test x$with_mpc = xyes; then
-+ include_mpc_decoder_TRUE=
-+ include_mpc_decoder_FALSE='#'
-+else
-+ include_mpc_decoder_TRUE='#'
-+ include_mpc_decoder_FALSE=
-+fi
-
- if test x$usefull_xiph_decoder = xyes; then
- include_xiph_decoder_TRUE=
-@@ -28660,6 +28679,13 @@ echo "$as_me: error: conditional \"inclu
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${include_mpc_decoder_TRUE}" && test -z "${include_mpc_decoder_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"include_mpc_decoder\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"include_mpc_decoder\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${include_xiph_decoder_TRUE}" && test -z "${include_xiph_decoder_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"include_xiph_decoder\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -30094,7 +30124,7 @@ if test "x$have_libOggFLAC" = "xno"; the
- echo ">"
- fi
-
--if test "x$have_libSPEEX" = "xno"; then
-+if test "x$have_libspeex" = "xno"; then
- echo ">"
- echo "> You do not seem to have libspeex installed."
- echo "> Without it aKode and aRts will not be"
diff --git a/audio/akode/patches/patch-ad b/audio/akode/patches/patch-ad
deleted file mode 100644
index 0e80e513526..00000000000
--- a/audio/akode/patches/patch-ad
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/06/14 12:46:44 hasso Exp $
-
---- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.orig 2006-08-10 21:37:20 +0300
-+++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2009-06-14 15:14:53 +0300
-@@ -26,9 +26,11 @@
- #include "decoder.h"
-
- #include <assert.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avio.h>
-+extern "C" {
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavformat/avio.h>
-+}
-
- #include "ffmpeg_decoder.h"
- #include <iostream>
-@@ -45,7 +47,7 @@ extern "C" {
- aKode::File *file = (aKode::File*)opaque;
- return file->write((char*)buf, size);
- }
-- static offset_t akode_seek(void* opaque, offset_t pos, int whence)
-+ static int64_t akode_seek(void* opaque, int64_t pos, int whence)
- {
- aKode::File *file = (aKode::File*)opaque;
- return file->seek(pos, whence);
-@@ -314,7 +316,7 @@ bool FFMPEGDecoder::readFrame(AudioFrame
- assert(d->packet.stream_index == d->audioStream);
-
- retry:
-- int len = avcodec_decode_audio( d->ic->streams[d->audioStream]->codec,
-+ int len = avcodec_decode_audio2( d->ic->streams[d->audioStream]->codec,
- (short*)d->buffer, &d->buffer_size,
- d->packetData, d->packetSize );
-
-@@ -349,7 +351,7 @@ retry:
- assert(false);
- }
- if (length == 0) return readFrame(frame);
-- std::cout << "akode: FFMPEG: Frame length: " << length << "\n";
-+ // std::cout << "akode: FFMPEG: Frame length: " << length << "\n";
-
- if( d->packetSize <= 0 )
- av_free_packet( &d->packet );
diff --git a/audio/akode/patches/patch-ae b/audio/akode/patches/patch-ae
deleted file mode 100644
index 9b2afdc9947..00000000000
--- a/audio/akode/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $
-
---- akode/plugins/Makefile.in.orig 2009-02-20 10:13:15 +0200
-+++ akode/plugins/Makefile.in 2009-02-20 10:13:53 +0200
-@@ -248,7 +248,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
- unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
--AKODE_MPC_DECODER = mpc_decoder
-+@include_mpc_decoder_TRUE@AKODE_MPC_DECODER = mpc_decoder
- @include_xiph_decoder_TRUE@AKODE_XIPH_DECODER = xiph_decoder
- @include_mpeg_decoder_TRUE@AKODE_MPEG_DECODER = mpeg_decoder
- @include_ffmpeg_decoder_TRUE@AKODE_FFMPEG_DECODER = ffmpeg_decoder
diff --git a/audio/akode/patches/patch-af b/audio/akode/patches/patch-af
deleted file mode 100644
index 0f21ffb72f5..00000000000
--- a/audio/akode/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $
-
---- akode/plugins/xiph_decoder/speex_decoder.cpp.orig 2009-02-20 13:47:29 +0200
-+++ akode/plugins/xiph_decoder/speex_decoder.cpp 2009-02-20 13:47:52 +0200
-@@ -25,10 +25,10 @@
- extern "C" {
- #include <string.h>
- #include <stdlib.h>
--#include <speex.h>
--#include <speex_header.h>
--#include <speex_callbacks.h>
--#include <speex_stereo.h>
-+#include <speex/speex.h>
-+#include <speex/speex_header.h>
-+#include <speex/speex_callbacks.h>
-+#include <speex/speex_stereo.h>
- #include <ogg/ogg.h>
- }
-
diff --git a/audio/akode/patches/patch-ag b/audio/akode/patches/patch-ag
deleted file mode 100644
index 448a72ed944..00000000000
--- a/audio/akode/patches/patch-ag
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2011/01/20 11:48:18 markd Exp $
-
-* Attempt fallback to ffmpeg decoder if loading the "native" one fails.
-* Reset resampler/converter if it isn't necessary any more.
-
---- akode/lib/player.cpp.orig 2009-02-20 15:04:49 +0200
-+++ akode/lib/player.cpp 2009-02-20 15:11:55 +0200
-@@ -37,6 +37,7 @@
-
- #include "player.h"
-
-+#include <cstring>
- #ifndef NDEBUG
- #include <iostream>
- #define AKODE_DEBUG(x) {std::cerr << "akode: " << x << "\n";}
-@@ -345,8 +345,11 @@ bool Player::load() {
- d->src = 0;
- return false;
- }
-- if (!d->decoder_handler.load(format))
-+ if (!d->decoder_handler.load(format)) {
- AKODE_DEBUG("Could not load " << format << "-decoder");
-+ if (!d->decoder_handler.load("ffmpeg"))
-+ AKODE_DEBUG("Could not load ffmpeg-decoder");
-+ }
- }
-
- if (!d->decoder_handler.isLoaded()) {
-@@ -398,6 +401,9 @@ bool Player::load() {
- if (d->sample_rate != first_frame.sample_rate) {
- AKODE_DEBUG("Resampling to " << d->sample_rate);
- d->resampler->setSampleRate(d->sample_rate);
-+ } else {
-+ delete d->resampler;
-+ d->resampler = 0;
- }
- int out_channels = d->sink->audioConfiguration()->channels;
- int in_channels = first_frame.channels;
-@@ -419,6 +425,9 @@ bool Player::load() {
- d->converter = new Converter(out_width);
- else
- d->converter->setSampleWidth(out_width);
-+ } else {
-+ delete d->converter;
-+ d->converter = 0;
- }
- }
- else
diff --git a/audio/akode/patches/patch-ah b/audio/akode/patches/patch-ah
deleted file mode 100644
index bd09d1a7f33..00000000000
--- a/audio/akode/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $
-
---- akode/plugins/jack_sink/jack_sink.cpp.orig 2009-02-20 15:39:03 +0200
-+++ akode/plugins/jack_sink/jack_sink.cpp 2009-02-20 19:56:17 +0200
-@@ -84,7 +84,7 @@ static int process (jack_nframes_t nfram
- m_data->pos++;
- }
-
-- return n;
-+ return 0;
- }
-
- static void shutdown (void *arg)
-@@ -147,13 +147,13 @@ int JACKSink::setAudioConfiguration(cons
-
- if (config->channel_config != MonoStereo ) return -1;
- m_data->left_port = jack_port_register (m_data->client, "left", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-- if (jack_connect (m_data->client, jack_port_name (m_data->left_port), "alsa_pcm:playback_1")) {
-+ if (jack_connect (m_data->client, jack_port_name (m_data->left_port), "system:playback_1")) {
- m_data->error = true;
- return -1;
- }
- if (config->channels > 1) {
- m_data->right_port = jack_port_register (m_data->client, "right", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-- if (jack_connect (m_data->client, jack_port_name (m_data->right_port), "alsa_pcm:playback_2")) {
-+ if (jack_connect (m_data->client, jack_port_name (m_data->right_port), "system:playback_2")) {
- m_data->config.channels = 1;
- res = 1;
- }
diff --git a/audio/akode/patches/patch-ai b/audio/akode/patches/patch-ai
deleted file mode 100644
index ff25f7ddbd3..00000000000
--- a/audio/akode/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $
-
---- akode/plugins/polyp_sink/polyp_sink.cpp.orig 2009-02-20 19:59:19 +0200
-+++ akode/plugins/polyp_sink/polyp_sink.cpp 2009-02-20 20:00:57 +0200
-@@ -25,7 +25,7 @@
- #elif defined(HAVE_INTTYPES_H)
- #include <inttypes.h>
- #endif
--#include <polyp/polyplib-simple.h>
-+#include <pulse/simple.h>
-
- #include "audioframe.h"
- #include "audiobuffer.h"
-@@ -59,7 +59,7 @@ PolypSink::PolypSink()
-
- bool PolypSink::open() {
- int error = 0;
-- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error );
-+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
- if (!m_data->server || error != 0) {
- m_data->error = true;
- close();
diff --git a/audio/akode/patches/patch-aj b/audio/akode/patches/patch-aj
deleted file mode 100644
index 1a0fea264fb..00000000000
--- a/audio/akode/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2011/01/20 11:48:18 markd Exp $
-
---- akode/lib/auto_sink.cpp.orig 2005-10-26 13:50:29.000000000 +0000
-+++ akode/lib/auto_sink.cpp
-@@ -21,6 +21,7 @@
- #include "audioframe.h"
- #include "auto_sink.h"
-
-+#include <cstdlib>
- #include <iostream>
-
- namespace aKode {
diff --git a/audio/akode/patches/patch-ak b/audio/akode/patches/patch-ak
deleted file mode 100644
index 9057b6ba694..00000000000
--- a/audio/akode/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2011/01/20 11:48:18 markd Exp $
-
---- akode/akodeplay/akodeplay.cpp.orig 2006-11-06 13:20:52.000000000 +0000
-+++ akode/akodeplay/akodeplay.cpp
-@@ -25,6 +25,8 @@
- #include "../lib/sink.h"
- #include "../lib/decoder.h"
-
-+#include <cstdlib>
-+
- #ifdef HAVE_GNU_GETOPT
- #include <getopt.h>
- #else
diff --git a/audio/akode/patches/patch-akode-lib-converter.cpp b/audio/akode/patches/patch-akode-lib-converter.cpp
deleted file mode 100644
index 5bcd18258a8..00000000000
--- a/audio/akode/patches/patch-akode-lib-converter.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-akode-lib-converter.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
-
---- akode/lib/converter.cpp.orig 2011-08-30 13:57:17.000000000 +0000
-+++ akode/lib/converter.cpp
-@@ -26,7 +26,7 @@ namespace aKode {
-
- Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
-
--template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
-+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
- static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
- {
- AudioConfiguration config = *in;
diff --git a/audio/akode/patches/patch-akode-lib-crossfader.cpp b/audio/akode/patches/patch-akode-lib-crossfader.cpp
deleted file mode 100644
index 4c363933d51..00000000000
--- a/audio/akode/patches/patch-akode-lib-crossfader.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-akode-lib-crossfader.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
-
---- akode/lib/crossfader.cpp.orig 2011-08-30 13:55:31.000000000 +0000
-+++ akode/lib/crossfader.cpp
-@@ -27,7 +27,7 @@ namespace aKode {
- CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
-
- // T is the input/output type, S is the fast arithmetics type, Div is a division method
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename U> class Arithm>
- static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
- {
- T** indata1 = (T**)in->data;
-@@ -66,7 +66,7 @@ static bool _doFrame(AudioFrame* in, int
- }
-
- // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename U> class Arithm>
- static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
- {
- T** indata = (T**)frame->data;
diff --git a/audio/akode/patches/patch-akode-lib-fast_resampler.cpp b/audio/akode/patches/patch-akode-lib-fast_resampler.cpp
deleted file mode 100644
index b8b772dcaae..00000000000
--- a/audio/akode/patches/patch-akode-lib-fast_resampler.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-akode-lib-fast_resampler.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
-
---- akode/lib/fast_resampler.cpp.orig 2011-08-30 13:31:41.000000000 +0000
-+++ akode/lib/fast_resampler.cpp
-@@ -37,7 +37,7 @@ FastResampler::FastResampler() : speed(1
- // A fast resampling by linear interpolation
- // I assume you know binary arithmetics and convertions if you're reading this
- // T is the input/output type, Arithm defines the used arithmetic
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename U> class Arithm>
- static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
- {
- unsigned long vt_pos_start = 0; // virtual positions of new sample
diff --git a/audio/akode/patches/patch-akode-lib-volumefilter.cpp b/audio/akode/patches/patch-akode-lib-volumefilter.cpp
deleted file mode 100644
index 171c5159227..00000000000
--- a/audio/akode/patches/patch-akode-lib-volumefilter.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-akode-lib-volumefilter.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
-
---- akode/lib/volumefilter.cpp.orig 2011-08-30 13:56:43.000000000 +0000
-+++ akode/lib/volumefilter.cpp
-@@ -29,7 +29,7 @@ namespace aKode {
- VolumeFilter::VolumeFilter() : m_volume(0) {}
-
- // T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
--template<typename T, typename S, template<typename S> class Arithm>
-+template<typename T, typename S, template<typename U> class Arithm>
- static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
- {
- T** indata = (T**)in->data;
diff --git a/audio/akode/patches/patch-akode_plugins_sun__sink_sun__sink.cpp b/audio/akode/patches/patch-akode_plugins_sun__sink_sun__sink.cpp
deleted file mode 100644
index 961ae431a89..00000000000
--- a/audio/akode/patches/patch-akode_plugins_sun__sink_sun__sink.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-akode_plugins_sun__sink_sun__sink.cpp,v 1.1 2012/02/15 19:33:26 hans Exp $
-
---- akode/plugins/sun_sink/sun_sink.cpp.orig 2012-01-12 19:07:47.881281153 +0100
-+++ akode/plugins/sun_sink/sun_sink.cpp 2012-01-12 19:20:50.139729686 +0100
-@@ -30,6 +30,10 @@
- #include <string.h>
- #include <unistd.h>
-
-+#ifdef __sun
-+#include <alloca.h>
-+#endif
-+
- #include <audioframe.h>
- #include "sun_sink.h"
-
diff --git a/audio/akode/patches/patch-al b/audio/akode/patches/patch-al
deleted file mode 100644
index fa0be54cd6d..00000000000
--- a/audio/akode/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2011/01/20 11:48:18 markd Exp $
-
---- akode/lib/magic.cpp.orig 2005-10-20 20:47:17.000000000 +0000
-+++ akode/lib/magic.cpp
-@@ -21,6 +21,7 @@
- #include "akodelib.h"
- #include "magic.h"
- #include "file.h"
-+#include <cstring>
- #include <iostream>
- using std::cerr;
-
diff --git a/audio/akode/patches/patch-am b/audio/akode/patches/patch-am
deleted file mode 100644
index c01d1c49ff1..00000000000
--- a/audio/akode/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.2 2014/01/10 20:01:02 joerg Exp $
-
---- akode/plugins/mpc_decoder/mppdec/synth_filter.cpp.orig 2004-11-04 23:13:31.000000000 +0000
-+++ akode/plugins/mpc_decoder/mppdec/synth_filter.cpp
-@@ -1,8 +1,6 @@
-+#include <cstddef>
- #include "stdafx.h"
-
--typedef int ptrdiff_t;
--
--
- /* C O N S T A N T S */
- #undef _
-