- Update to 0.4.4

PR:		ports/156070
Submitted by:	Gvozdikov Veniamin <g.veniamin@googlemail.com> (maintainer)

4 files changed, 209 insertions, 20 deletions

diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 014367955a90..1d07b9ff74e7 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	deadbeef
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	0.4.4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -18,12 +17,16 @@ LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		mad.2:${PORTSDIR}/audio/libmad \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo"
-CONFIGURE_ARGS=	--disable-alsa --disable-nullout
+CONFIGURE_ARGS=	--disable-alsa --disable-nullout \
+		CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
@@ -47,7 +50,17 @@ OPTIONS=	PULSE "PulseAudio output plugin (unsupported)" off\
 		CDDA "CD-Audio plugin" on\
 		GME "Game Music Emu plugin for NSF, AY, etc" on\
 		DUMB "D.U.M.B. plugin for MOD, S3M and other" on\
-		NOTIFY "support for OSD notifications into GTKUI plugin" on
+		NOTIFY "support for OSD notifications into GTKUI plugin" on\
+		MUSEPACK "musepack plugin" on\
+		WILD "wildmidi plugin" on\
+		TTA "tta plugin" on\
+		DCA "dca (DTS audio) plugin" on\
+		AAC "AAC decoder based on FAAD2" on\
+		MMS "MMS streaming vfs plugin" on\
+		SHN "shorten plugin" on\
+		AO "audio overload plugin" on\
+		SHELLEXEC "shell commands plugin" on\
+		NLS "Native Language Support" on
 
 .include <bsd.port.options.mk>
 
@@ -210,10 +223,75 @@ PLIST_SUB+=	NOTIFY=""
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_MUSEPACK)
+CONFIGURE_ARGS+=	--disable-musepack
+PLIST_SUB+=	MUSEPACK="@comment "
+.else
+PLIST_SUB+=	MUSEPACK=""
+.endif
+
+.if defined(WITHOUT_WILD)
+CONFIGURE_ARGS+=	--disable-wildmidi
+PLIST_SUB+=	WILD="@comment "
+.else
+PLIST_SUB+=	WILD=""
+.endif
+
+.if defined(WITHOUT_TTA)
+CONFIGURE_ARGS+=	--disable-tta
+PLIST_SUB+=	TTA="@comment "
+.else
+PLIST_SUB+=	TTA=""
+.endif
+
+.if defined(WITHOUT_DCA)
+CONFIGURE_ARGS+=	--disable-dca
+PLIST_SUB+=	DCA="@comment "
+.else
+PLIST_SUB+=	DCA=""
+.endif
+
+.if defined(WITHOUT_AAC)
+CONFIGURE_ARGS+=	--disable-aac
+PLIST_SUB+=	AAC="@comment "
+.else
+PLIST_SUB+=	AAC=""
+LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+.endif
+
+.if defined(WITHOUT_MMS)
+CONFIGURE_ARGS+=	--disable-mms
+PLIST_SUB+=	MMS="@comment "
+.else
+PLIST_SUB+=	MMS=""
+.endif
+
+.if defined(WITHOUT_SHN)
+CONFIGURE_ARGS+=	--disable-shn
+PLIST_SUB+=	SHN="@comment "
+.else
+PLIST_SUB+=	SHN=""
+.endif
+
+.if defined(WITHOUT_AO)
+CONFIGURE_ARGS+=	--disable-ao
+PLIST_SUB+=	AO="@comment "
+.else
+PLIST_SUB+=	AO=""
+.endif
 
-.if ( ${OSVERSION} >= 802502 && ${OSVERSION} < 900000 ) || ${OSVERSION} >= 900027
-BROKEN=		does not build after log2 addition
+.if defined(WITHOUT_SHELLEXEC)
+CONFIGURE_ARGS+=	--disable-shellexec
+PLIST_SUB+=	SHELLEXEC="@comment "
+.else
+PLIST_SUB+=	SHELLEXEC=""
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+PLIST_SUB+=	NLS=""
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/deadbeef/distinfo b/audio/deadbeef/distinfo
index 2fc149c72ab0..1de06cde3e2d 100644
--- a/audio/deadbeef/distinfo
+++ b/audio/deadbeef/distinfo
@@ -1,2 +1,2 @@
-SHA256 (deadbeef-0.4.1.tar.bz2) = f80a898e1f8b803ddf8e428bae89d0e682433806aa2b06c2f7c8c53e07d852fe
-SIZE (deadbeef-0.4.1.tar.bz2) = 1205706
+SHA256 (deadbeef-0.4.4.tar.bz2) = 93547e776f1c67a68236d394a67d0d84478f12ad375a4208e6dbba5972f6ec32
+SIZE (deadbeef-0.4.4.tar.bz2) = 2612233
diff --git a/audio/deadbeef/files/patch-plugins__dumb__dumb-kode54__src__it__itrender.c b/audio/deadbeef/files/patch-plugins__dumb__dumb-kode54__src__it__itrender.c
new file mode 100644
index 000000000000..3d5510161aac
--- /dev/null
+++ b/audio/deadbeef/files/patch-plugins__dumb__dumb-kode54__src__it__itrender.c
@@ -0,0 +1,13 @@
+--- ./plugins/dumb/dumb-kode54/src/it/itrender.c.orig	2011-03-31 17:50:48.000000000 +0200
++++ ./plugins/dumb/dumb-kode54/src/it/itrender.c	2011-03-31 17:51:47.000000000 +0200
+@@ -3558,10 +3558,6 @@
+ 	playing->sample_vibrato_time += playing->sample->vibrato_speed;

+ }

+ 

+-#ifndef __linux__

+-static inline float log2(float x) {return (float)log(x)/(float)log(2.0f);}

+-#endif

+-

+ static int delta_to_note(float delta, int base)

+ {

+ 	float note;

diff --git a/audio/deadbeef/pkg-plist b/audio/deadbeef/pkg-plist
index c7f5b113d992..c9567d0e78b4 100644
--- a/audio/deadbeef/pkg-plist
+++ b/audio/deadbeef/pkg-plist
@@ -24,14 +24,18 @@ include/deadbeef/deadbeef.h
 %%GUI%%lib/deadbeef/gtkui.la
 %%GUI%%lib/deadbeef/gtkui.so
 %%GUI%%lib/deadbeef/gtkui.so.0
-%%HOTKEYS%%lib/deadbeef/hotkeys.a
-%%HOTKEYS%%lib/deadbeef/hotkeys.la
 %%HOTKEYS%%lib/deadbeef/hotkeys.so
+%%HOTKEYS%%lib/deadbeef/hotkeys.la
+%%HOTKEYS%%lib/deadbeef/hotkeys.a
 %%HOTKEYS%%lib/deadbeef/hotkeys.so.0
 lib/deadbeef/mpgmad.a
 lib/deadbeef/mpgmad.la
 lib/deadbeef/mpgmad.so
 lib/deadbeef/mpgmad.so.0
+%%MUSEPACK%%lib/deadbeef/musepack.so.0
+%%MUSEPACK%%lib/deadbeef/musepack.so
+%%MUSEPACK%%lib/deadbeef/musepack.la
+%%MUSEPACK%%lib/deadbeef/musepack.a
 lib/deadbeef/oss.a
 lib/deadbeef/oss.la
 lib/deadbeef/oss.so
@@ -60,6 +64,38 @@ lib/deadbeef/oss.so.0
 %%WAV%%lib/deadbeef/wavpack.la
 %%WAV%%lib/deadbeef/wavpack.so
 %%WAV%%lib/deadbeef/wavpack.so.0
+%%WILD%%lib/deadbeef/wildmidi.so.0
+%%WILD%%lib/deadbeef/wildmidi.so
+%%WILD%%lib/deadbeef/wildmidi.la
+%%WILD%%lib/deadbeef/wildmidi.a
+%%TTA%%lib/deadbeef/tta.so.0
+%%TTA%%lib/deadbeef/tta.so
+%%TTA%%lib/deadbeef/tta.la
+%%TTA%%lib/deadbeef/tta.a
+%%DCA%%lib/deadbeef/dca.so.0
+%%DCA%%lib/deadbeef/dca.so
+%%DCA%%lib/deadbeef/dca.la
+%%DCA%%lib/deadbeef/dca.a
+%%AAC%%lib/deadbeef/aac.so.0
+%%AAC%%lib/deadbeef/aac.so
+%%AAC%%lib/deadbeef/aac.la
+%%AAC%%lib/deadbeef/aac.a
+%%MMS%%lib/deadbeef/mms.so.0
+%%MMS%%lib/deadbeef/mms.so
+%%MMS%%lib/deadbeef/mms.la
+%%MMS%%lib/deadbeef/mms.a
+%%SHN%%lib/deadbeef/shn.so.0
+%%SHN%%lib/deadbeef/shn.so
+%%SHN%%lib/deadbeef/shn.la
+%%SHN%%lib/deadbeef/shn.a
+%%AO%%lib/deadbeef/ao.so.0
+%%AO%%lib/deadbeef/ao.so
+%%AO%%lib/deadbeef/ao.la
+%%AO%%lib/deadbeef/ao.a
+%%SHELLEXEC%%lib/deadbeef/shellexec.so.0
+%%SHELLEXEC%%lib/deadbeef/shellexec.so
+%%SHELLEXEC%%lib/deadbeef/shellexec.la
+%%SHELLEXEC%%lib/deadbeef/shellexec.a
 %%LASTFM%%lib/deadbeef/lastfm.so.0
 %%LASTFM%%lib/deadbeef/lastfm.so
 %%LASTFM%%lib/deadbeef/lastfm.la
@@ -90,31 +126,93 @@ lib/deadbeef/oss.so.0
 %%NOTIFY%%lib/deadbeef/notify.a
 share/applications/deadbeef.desktop
 %%DATADIR%%/pixmaps/buffering_16.png
-%%DATADIR%%/pixmaps/next_24.png
 %%DATADIR%%/pixmaps/pause_16.png
-%%DATADIR%%/pixmaps/pause_24.png
 %%DATADIR%%/pixmaps/play_16.png
-%%DATADIR%%/pixmaps/play_24.png
-%%DATADIR%%/pixmaps/prev_24.png
-%%DATADIR%%/pixmaps/random_24.png
-%%DATADIR%%/pixmaps/stop_24.png
 %%DOCSDIR%%/COPYING.GPLv2
 %%DOCSDIR%%/COPYING.LGPLv2.1
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/README
 %%DOCSDIR%%/about.txt
 %%DOCSDIR%%/help.txt
+%%DOCSDIR%%/translators.txt
+%%DOCSDIR%%/help.ru.txt
+%%DOCSDIR%%/help.pt_BR.txt
+%%NLS%%share/locale/bg/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/da/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/de/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/el/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/es/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/he/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/id/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/it/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/km/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/lg/LC_MESSAGES/deadbeef.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/deadbeef.mo
 share/icons/hicolor/16x16/apps/deadbeef.png
 share/icons/hicolor/32x32/apps/deadbeef.png
 share/icons/hicolor/48x48/apps/deadbeef.png
+share/icons/hicolor/128x128/apps/deadbeef.png
+share/icons/hicolor/192x192/apps/deadbeef.png
+share/icons/hicolor/22x22/apps/deadbeef.png
+share/icons/hicolor/24x24/apps/deadbeef.png
+share/icons/hicolor/256x256/apps/deadbeef.png
+share/icons/hicolor/36x36/apps/deadbeef.png
+share/icons/hicolor/64x64/apps/deadbeef.png
+share/icons/hicolor/72x72/apps/deadbeef.png
+share/icons/hicolor/96x96/apps/deadbeef.png
+share/icons/hicolor/scalable/apps/deadbeef.svg
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor/192x192/apps
+@dirrmtry share/icons/hicolor/192x192
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/36x36/apps
+@dirrmtry share/icons/hicolor/36x36
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
+@dirrmtry %%NLS%%share/locale/km/LC_MESSAGES
+@dirrmtry %%NLS%%share/locale/km
 %%DATADIR%%/pixmaps/noartwork.jpg
 @dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/pixmaps