deadbeef: Update to 1.8.1

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Fri Jul 12 12:25:52 2019 +0100
Changeset:	a8035a8b6e1363ab5ef766f8751b6fed8b7e5aab

Modified Files:
	deadbeef/Makefile
	deadbeef/PLIST
	deadbeef/TODO
	deadbeef/distinfo
Removed Files:
	deadbeef/patches/patch-configure
	deadbeef/patches/patch-plugins_dumb_dumb-kode54_src_it_itrender.c
	deadbeef/patches/patch-plugins_oss_Makefile.in
	deadbeef/patches/patch-yasmwrapper.sh

Log Message:
deadbeef: Update to 1.8.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a8035a8b6e1363ab5ef766f8751b6fed8b7e5aab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 deadbeef/Makefile                                  |  52 ++++----
 deadbeef/PLIST                                     | 131 +++++++++++++++++++--
 deadbeef/TODO                                      |  12 +-
 deadbeef/distinfo                                  |  11 +-
 deadbeef/patches/patch-configure                   |  67 -----------
 ...atch-plugins_dumb_dumb-kode54_src_it_itrender.c |  13 --
 deadbeef/patches/patch-plugins_oss_Makefile.in     |  13 --
 deadbeef/patches/patch-yasmwrapper.sh              |  10 --
 8 files changed, 157 insertions(+), 152 deletions(-)

diffs:
diff --git a/deadbeef/Makefile b/deadbeef/Makefile
index 4602839a45..a37690738a 100644
--- a/deadbeef/Makefile
+++ b/deadbeef/Makefile
@@ -1,47 +1,57 @@
 # $NetBSD: Makefile,v 1.6 2015/07/13 10:30:47 roelants Exp $
-#
 
-DISTNAME=	deadbeef-0.5.2
+DISTNAME=	deadbeef-1.8.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=deadbeef/}
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	2
 
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 HOMEPAGE=	http://deadbeef.sourceforge.net/
-COMMENT=	Ultimate Music Player For GNU/Linux
+COMMENT=	Modular music player
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake intltool pkg-config
+USE_TOOLS+=	msgfmt msgmerge xgettext
+USE_TOOLS+=	bison perl
 
-CONFIGURE_ARGS+=	--disable-cdda
+TOOL_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
 
-LDFLAGS+=	-lintl
-MAKE_ENV+=	OSS_LIBS=${LIBOSSAUDIO}
+.include "../../mk/oss.buildlink3.mk"
 
-BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
+.if ${OSS_TYPE} != "none"
+CONFIGURE_ARGS+=	--enable-oss
+MAKE_ENV+=		OSS_LIBS=${LIBOSSAUDIO}
+.else
+CONFIGURE_ARGS+=	--disable-oss
+.endif
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+# using mpg123 instead
+CONFIGURE_ARGS+=	--disable-libmad
+
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/deadbeef
+
+.include "options.mk"
+.include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libcddb/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/musepack/buildlink3.mk"
+.include "../../audio/opusfile/buildlink3.mk"
+.include "../../audio/wavpack/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-#.include "../../misc/libcdio/buildlink3.mk"
-.include "../../multimedia/ffmpeg010/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/deadbeef/PLIST b/deadbeef/PLIST
index 7605071cf8..5728a72d2d 100644
--- a/deadbeef/PLIST
+++ b/deadbeef/PLIST
@@ -1,25 +1,125 @@
-@comment $NetBSD: PLIST,v 1.2 2015/07/13 10:30:47 roelants Exp $
+@comment $NetBSD$
 bin/deadbeef
+include/deadbeef/artwork.h
 include/deadbeef/deadbeef.h
 include/deadbeef/gtkui_api.h
 lib/deadbeef/adplug.la
+lib/deadbeef/alac.la
 lib/deadbeef/artwork.la
-@comment lib/deadbeef/cdda.la
 lib/deadbeef/converter.la
-lib/deadbeef/converter_gtk2.la
+lib/deadbeef/converter_gtk3.la
 lib/deadbeef/convpresets/AAC_(Nero_FAAC).txt
+lib/deadbeef/convpresets/ALAC.txt
 lib/deadbeef/convpresets/FLAC_(compression_level_5).txt
+lib/deadbeef/convpresets/File_Copy.txt
+lib/deadbeef/convpresets/File_Move.txt
 lib/deadbeef/convpresets/MP3_CBR_320_Kbps_(Lame).txt
 lib/deadbeef/convpresets/MP3_VBR_192Kbps_(Lame).txt
 lib/deadbeef/convpresets/MS_RIFF_WAV.txt
 lib/deadbeef/convpresets/MusePack.txt
+lib/deadbeef/convpresets/Ogg_FLAC.txt
 lib/deadbeef/convpresets/Ogg_Vorbis_(-q_5).txt
+lib/deadbeef/convpresets/Opus.txt
 lib/deadbeef/convpresets/TTA.txt
 lib/deadbeef/convpresets/WavPack.txt
+lib/deadbeef/data68/Replay/aenigmatica.bin
+lib/deadbeef/data68/Replay/alteredbeast.bin
+lib/deadbeef/data68/Replay/armalyte.bin
+lib/deadbeef/data68/Replay/asidifier.bin
+lib/deadbeef/data68/Replay/azidifier.bin
+lib/deadbeef/data68/Replay/bendaglish.deli.bin
+lib/deadbeef/data68/Replay/big.bin
+lib/deadbeef/data68/Replay/blipblop.bin
+lib/deadbeef/data68/Replay/blipp079.bin
+lib/deadbeef/data68/Replay/bs22.bin
+lib/deadbeef/data68/Replay/cabal.bin
+lib/deadbeef/data68/Replay/chipmon2.bin
+lib/deadbeef/data68/Replay/cosotfmx.bin
+lib/deadbeef/data68/Replay/crapman1.bin
+lib/deadbeef/data68/Replay/crapman2.bin
+lib/deadbeef/data68/Replay/deltamusic1.bin
+lib/deadbeef/data68/Replay/deltamusic2.bin
+lib/deadbeef/data68/Replay/digitfmx.bin
+lib/deadbeef/data68/Replay/dmu.bin
+lib/deadbeef/data68/Replay/dwaga.bin
+lib/deadbeef/data68/Replay/dyter07.bin
+lib/deadbeef/data68/Replay/elf.bin
+lib/deadbeef/data68/Replay/fc13_14.bin
+lib/deadbeef/data68/Replay/fireice.bin
+lib/deadbeef/data68/Replay/fred.bin
+lib/deadbeef/data68/Replay/gemx.bin
+lib/deadbeef/data68/Replay/harlequin.bin
+lib/deadbeef/data68/Replay/hippel-coso_note.deli.bin
+lib/deadbeef/data68/Replay/hpn-jam.bin
+lib/deadbeef/data68/Replay/huelsbeck.bin
+lib/deadbeef/data68/Replay/huntforredoct.bin
+lib/deadbeef/data68/Replay/ivanhoe.bin
+lib/deadbeef/data68/Replay/jamcracker10.bin
+lib/deadbeef/data68/Replay/jamcrackerpro.bin
+lib/deadbeef/data68/Replay/lastninja3.bin
+lib/deadbeef/data68/Replay/lastninjaiii.bin
+lib/deadbeef/data68/Replay/lcd.bin
+lib/deadbeef/data68/Replay/lx_mmme.bin
+lib/deadbeef/data68/Replay/mcoder.bin
+lib/deadbeef/data68/Replay/megatizer.bin
+lib/deadbeef/data68/Replay/metrocross.bin
+lib/deadbeef/data68/Replay/midi.bin
+lib/deadbeef/data68/Replay/mmme.bin
+lib/deadbeef/data68/Replay/mmmesid.bin
+lib/deadbeef/data68/Replay/mon.bin
+lib/deadbeef/data68/Replay/mon_old.deli.bin
+lib/deadbeef/data68/Replay/musmon1.bin
+lib/deadbeef/data68/Replay/musmon2.bin
+lib/deadbeef/data68/Replay/ninjaremix.bin
+lib/deadbeef/data68/Replay/ninjatfmx.bin
+lib/deadbeef/data68/Replay/nobuddiesland.bin
+lib/deadbeef/data68/Replay/none.bin
+lib/deadbeef/data68/Replay/note.bin
+lib/deadbeef/data68/Replay/note2.bin
+lib/deadbeef/data68/Replay/page.bin
+lib/deadbeef/data68/Replay/protracker.bin
+lib/deadbeef/data68/Replay/psg1.bin
+lib/deadbeef/data68/Replay/psgtrackerv2.bin
+lib/deadbeef/data68/Replay/puma.bin
+lib/deadbeef/data68/Replay/puma2.bin
+lib/deadbeef/data68/Replay/quartet.bin
+lib/deadbeef/data68/Replay/quartet_mindbomb.bin
+lib/deadbeef/data68/Replay/realms.bin
+lib/deadbeef/data68/Replay/robhubbard.deli.bin
+lib/deadbeef/data68/Replay/rollingronny.bin
+lib/deadbeef/data68/Replay/shadowdancer.bin
+lib/deadbeef/data68/Replay/sidmon1.bin
+lib/deadbeef/data68/Replay/sidmon2.bin
+lib/deadbeef/data68/Replay/sidsound.bin
+lib/deadbeef/data68/Replay/sndh_ice.bin
+lib/deadbeef/data68/Replay/soundfx.bin
+lib/deadbeef/data68/Replay/spacecrusade.bin
+lib/deadbeef/data68/Replay/spacegun.bin
+lib/deadbeef/data68/Replay/ssd1.bin
+lib/deadbeef/data68/Replay/stos.bin
+lib/deadbeef/data68/Replay/synthiv.bin
+lib/deadbeef/data68/Replay/tao_digi.bin
+lib/deadbeef/data68/Replay/tao_hubbard.bin
+lib/deadbeef/data68/Replay/tao_ms211.bin
+lib/deadbeef/data68/Replay/tao_ms25.bin
+lib/deadbeef/data68/Replay/tao_ms27.bin
+lib/deadbeef/data68/Replay/tao_tsd.bin
+lib/deadbeef/data68/Replay/tcbtracker.bin
+lib/deadbeef/data68/Replay/test.bin
+lib/deadbeef/data68/Replay/tfmx.bin
+lib/deadbeef/data68/Replay/tfmx_aga.bin
+lib/deadbeef/data68/Replay/tfmx_old.bin
+lib/deadbeef/data68/Replay/tfmx_st.bin
+lib/deadbeef/data68/Replay/timerc.bin
+lib/deadbeef/data68/Replay/toki.bin
+lib/deadbeef/data68/Replay/tsd1.bin
+lib/deadbeef/data68/Replay/utopia.bin
+lib/deadbeef/data68/Replay/vikingchild.bin
+lib/deadbeef/data68/Replay/xbiossound.bin
+lib/deadbeef/data68/Replay/zonewarrior.bin
 lib/deadbeef/dca.la
-lib/deadbeef/ddb_ao.la
 lib/deadbeef/ddb_dumb.la
-lib/deadbeef/ddb_gui_GTK2.la
+lib/deadbeef/ddb_gui_GTK3.la
 lib/deadbeef/ddb_mono2stereo.la
 lib/deadbeef/ddb_shn.la
 lib/deadbeef/dsp_libsrc.la
@@ -28,27 +128,35 @@ lib/deadbeef/ffmpeg.la
 lib/deadbeef/flac.la
 lib/deadbeef/gme.la
 lib/deadbeef/hotkeys.la
+lib/deadbeef/in_sc68.la
 lib/deadbeef/lastfm.la
 lib/deadbeef/m3u.la
 lib/deadbeef/mms.la
-lib/deadbeef/mpgmad.la
+lib/deadbeef/mp3.la
 lib/deadbeef/musepack.la
 lib/deadbeef/notify.la
 lib/deadbeef/nullout.la
+lib/deadbeef/opus.la
 lib/deadbeef/oss.la
-lib/deadbeef/pulse.la
+lib/deadbeef/pltbrowser_gtk3.la
+lib/deadbeef/psf.la
+lib/deadbeef/rg_scanner.la
 lib/deadbeef/shellexec.la
+lib/deadbeef/shellexecui_gtk3.la
 lib/deadbeef/sid.la
 lib/deadbeef/sndfile.la
 lib/deadbeef/supereq.la
 lib/deadbeef/tta.la
 lib/deadbeef/vfs_curl.la
+lib/deadbeef/vfs_zip.la
 lib/deadbeef/vorbis.la
 lib/deadbeef/vtx.la
+lib/deadbeef/wavpack.la
 lib/deadbeef/wildmidi.la
+lib/deadbeef/wma.la
 share/applications/deadbeef.desktop
 share/deadbeef/pixmaps/buffering_16.png
-share/deadbeef/pixmaps/noartwork.jpg
+share/deadbeef/pixmaps/noartwork.png
 share/deadbeef/pixmaps/pause_16.png
 share/deadbeef/pixmaps/play_16.png
 share/doc/deadbeef/COPYING.GPLv2
@@ -56,7 +164,6 @@ share/doc/deadbeef/COPYING.LGPLv2.1
 share/doc/deadbeef/ChangeLog
 share/doc/deadbeef/README
 share/doc/deadbeef/about.txt
-share/doc/deadbeef/help.pt_BR.txt
 share/doc/deadbeef/help.ru.txt
 share/doc/deadbeef/help.txt
 share/doc/deadbeef/translators.txt
@@ -82,9 +189,9 @@ share/locale/da/LC_MESSAGES/deadbeef.mo
 share/locale/de/LC_MESSAGES/deadbeef.mo
 share/locale/el/LC_MESSAGES/deadbeef.mo
 share/locale/en_GB/LC_MESSAGES/deadbeef.mo
-share/locale/eo/LC_MESSAGES/deadbeef.mo
 share/locale/es/LC_MESSAGES/deadbeef.mo
 share/locale/et/LC_MESSAGES/deadbeef.mo
+share/locale/eu/LC_MESSAGES/deadbeef.mo
 share/locale/fa/LC_MESSAGES/deadbeef.mo
 share/locale/fi/LC_MESSAGES/deadbeef.mo
 share/locale/fr/LC_MESSAGES/deadbeef.mo
@@ -99,14 +206,14 @@ share/locale/kk/LC_MESSAGES/deadbeef.mo
 share/locale/km/LC_MESSAGES/deadbeef.mo
 share/locale/lg/LC_MESSAGES/deadbeef.mo
 share/locale/lt/LC_MESSAGES/deadbeef.mo
-share/locale/nb/LC_MESSAGES/deadbeef.mo
+share/locale/lv/LC_MESSAGES/deadbeef.mo
 share/locale/nl/LC_MESSAGES/deadbeef.mo
 share/locale/pl/LC_MESSAGES/deadbeef.mo
 share/locale/pt/LC_MESSAGES/deadbeef.mo
 share/locale/pt_BR/LC_MESSAGES/deadbeef.mo
 share/locale/ro/LC_MESSAGES/deadbeef.mo
 share/locale/ru/LC_MESSAGES/deadbeef.mo
-share/locale/si/LC_MESSAGES/deadbeef.mo
+share/locale/si_LK/LC_MESSAGES/deadbeef.mo
 share/locale/sk/LC_MESSAGES/deadbeef.mo
 share/locale/sl/LC_MESSAGES/deadbeef.mo
 share/locale/sr/LC_MESSAGES/deadbeef.mo
diff --git a/deadbeef/TODO b/deadbeef/TODO
index 732a8d287b..f220e72388 100644
--- a/deadbeef/TODO
+++ b/deadbeef/TODO
@@ -1,9 +1,3 @@
-* Check if/why perl-modules checked for in configure are needed.
-* Check why configure fails to detect right way to link with libintl.
-  Adding it to LDADD in the Makefile may not work on all platforms?
-* Turn some plugins into options, e.g. pulseaudio.
-* Enable alsa plugin optionally/when on linux? (Need someone to test.)
-* Check if plugins/converter Makefile can be patched to specify
-  filenames with parens in a way make can handle them.
-* Fix unresolved symbols in plugins.
-* Make it find its icon.
+Segfault:
+
+Undefined PLT symbol "trkproperties_build_key_list" (symnum = 155)
diff --git a/deadbeef/distinfo b/deadbeef/distinfo
index 0a122e5167..14900a109b 100644
--- a/deadbeef/distinfo
+++ b/deadbeef/distinfo
@@ -1,9 +1,6 @@
 $NetBSD: distinfo,v 1.2 2012/04/29 15:06:26 roelants Exp $
 
-SHA1 (deadbeef-0.5.2.tar.bz2) = 8567d36a55651717ada752781cda42f9a60cc63b
-RMD160 (deadbeef-0.5.2.tar.bz2) = 661e6351a0b1e2c30466beff596a75986d5b73c4
-Size (deadbeef-0.5.2.tar.bz2) = 2872396 bytes
-SHA1 (patch-configure) = 7e3d79309cb585421694739b7c59380145aff305
-SHA1 (patch-plugins_dumb_dumb-kode54_src_it_itrender.c) = 8c0afc9063091a17dc5b68572a37aa4e3687406a
-SHA1 (patch-plugins_oss_Makefile.in) = 0c1cada50afc904555fbe79c9bb9bea9abf89634
-SHA1 (patch-yasmwrapper.sh) = 0299a667ec6f7cefc48fa99a24ee6f7904cf5aa3
+SHA1 (deadbeef-1.8.1.tar.bz2) = 46f1110d4002f8b7e4f05cc0a2bfbf7c1b08379b
+RMD160 (deadbeef-1.8.1.tar.bz2) = 2212862083b5c0507008544a92720f41fe4592ce
+SHA512 (deadbeef-1.8.1.tar.bz2) = 16723050177b3515e6a73b28111d882b338bbbb5ebb7484ce3cb77143fa210b057563afab03174ab65c9ea64d3786dd273cf513c3b569ca614584a400fbcf5a2
+Size (deadbeef-1.8.1.tar.bz2) = 4875802 bytes
diff --git a/deadbeef/patches/patch-configure b/deadbeef/patches/patch-configure
deleted file mode 100644
index a7b3d1142b..0000000000
--- a/deadbeef/patches/patch-configure
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-configure,v 1.1.1.1 2012/04/20 14:50:11 roelants Exp $
-Replace non-portable test operator "==".
---- configure.orig	2012-03-24 10:23:14.000000000 +0000
-+++ configure
-@@ -23113,7 +23113,7 @@ _ACEOF
-     PORTABLE=yes
- 
- 
--    if test "x$enable_portable" == "xfull" ; then
-+    if test "x$enable_portable" = "xfull" ; then
- 
- cat >>confdefs.h <<_ACEOF
- #define PORTABLE_FULL 1
-@@ -23214,7 +23214,7 @@ fi
- fi
- 
- 
--if test "x$enable_gtk3" == "xyes" ; then
-+if test "x$enable_gtk3" = "xyes" ; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3_DEPS" >&5
-@@ -23290,7 +23290,7 @@ else
-     HAVE_GTK3=no
- fi
- 
--if test "x$enable_gtk2" == "xyes" ; then
-+if test "x$enable_gtk2" = "xyes" ; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2_DEPS" >&5
-@@ -24178,7 +24178,7 @@ fi
- fi
- 
- if test "x$enable_gtkui" != "xno" ; then
--    if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then
-+    if test "x$HAVE_GTK2" = "xyes" || test "x$HAVE_GTK3" = "xyes" ; then
-         HAVE_GTKUI=yes
-     fi
- fi
-@@ -24375,7 +24375,7 @@ $as_echo "yes" >&6; }
- fi
-         fi
- 
--        if test "x$enable_artwork_imlib2" == "xno" || test "x$HAVE_IMLIB2" == "xno" ; then
-+        if test "x$enable_artwork_imlib2" = "xno" || test "x$HAVE_IMLIB2" = "xno" ; then
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
- $as_echo_n "checking for main in -ljpeg... " >&6; }
- if ${ac_cv_lib_jpeg_main+:} false; then :
-@@ -24447,7 +24447,7 @@ fi
-         fi
-     fi
- 
--    if test "x$HAVE_VFS_CURL" = "xyes" && ( test "x$HAVE_JPEG" == "xyes" || test "x$HAVE_IMLIB2" == "xyes" ) ; then
-+    if test "x$HAVE_VFS_CURL" = "xyes" && ( test "x$HAVE_JPEG" = "xyes" || test "x$HAVE_IMLIB2" = "xyes" ) ; then
-         HAVE_ARTWORK=yes
-     fi
- fi
-@@ -24456,7 +24456,7 @@ if test "x$enable_adplug" != "xno" ; the
-     HAVE_ADPLUG=yes
- fi
- 
--if test "x$enable_ffap" != "xno" && ( test "x$HAVE_YASM" == "xyes" || test "x$APE_USE_YASM" != "xyes" ) ; then
-+if test "x$enable_ffap" != "xno" && ( test "x$HAVE_YASM" = "xyes" || test "x$APE_USE_YASM" != "xyes" ) ; then
-     HAVE_FFAP=yes
- fi
- 
diff --git a/deadbeef/patches/patch-plugins_dumb_dumb-kode54_src_it_itrender.c b/deadbeef/patches/patch-plugins_dumb_dumb-kode54_src_it_itrender.c
deleted file mode 100644
index 74a8c05961..0000000000
--- a/deadbeef/patches/patch-plugins_dumb_dumb-kode54_src_it_itrender.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_dumb_dumb-kode54_src_it_itrender.c,v 1.1.1.1 2012/04/20 14:50:11 roelants Exp $
-Don't add (wrong) declaration for log2 on non-linux.
---- plugins/dumb/dumb-kode54/src/it/itrender.c.orig	2012-03-24 10:09:37.000000000 +0000
-+++ plugins/dumb/dumb-kode54/src/it/itrender.c
-@@ -3558,7 +3558,7 @@ static void process_playing(DUMB_IT_SIGR
- 	playing->sample_vibrato_time += playing->sample->vibrato_speed;
- }
- 
--#ifndef __linux__
-+#if 0
- static inline float log2(float x) {return (float)log(x)/(float)log(2.0f);}
- #endif
- 
diff --git a/deadbeef/patches/patch-plugins_oss_Makefile.in b/deadbeef/patches/patch-plugins_oss_Makefile.in
deleted file mode 100644
index 5c72a27ebd..0000000000
--- a/deadbeef/patches/patch-plugins_oss_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_oss_Makefile.in,v 1.1 2012/04/29 15:06:27 roelants Exp $
-Make OSS plugin link with OSS library.
---- plugins/oss/Makefile.in.orig	2012-03-24 10:23:17.000000000 +0000
-+++ plugins/oss/Makefile.in
-@@ -68,7 +68,7 @@ am__base_list = \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(pkglibdir)"
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
--oss_la_LIBADD =
-+oss_la_LIBADD = ${OSS_LIBS}
- am__oss_la_SOURCES_DIST = oss.c
- @HAVE_OSS_TRUE@am_oss_la_OBJECTS = oss.lo
- oss_la_OBJECTS = $(am_oss_la_OBJECTS)
diff --git a/deadbeef/patches/patch-yasmwrapper.sh b/deadbeef/patches/patch-yasmwrapper.sh
deleted file mode 100644
index fcd8bdd95f..0000000000
--- a/deadbeef/patches/patch-yasmwrapper.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-yasmwrapper.sh,v 1.1.1.1 2012/04/20 14:50:11 roelants Exp $
-Don't use bash as interpreter.
---- yasmwrapper.sh.orig	2011-12-11 15:34:58.000000000 +0000
-+++ yasmwrapper.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- ARGS=""
- for i in $@ ; do
-     #if [ "$i" != "-fPIC" ] && [ "$i" != "-DPIC" ]; then