svn commit: r398548 - in head/audio/aqualung: . files

[Thomas Zander]

Author: riggs
Date: Sat Oct  3 17:17:05 2015
New Revision: 398548
URL: https://svnweb.freebsd.org/changeset/ports/398548

Log:
  Update to upstream version 1.0
  
  PR:		203238
  Submitted by:	tkato432 at yahoo.com

Added:
  head/audio/aqualung/files/
  head/audio/aqualung/files/patch-src__decoder__dec_mac.cpp   (contents, props changed)
Modified:
  head/audio/aqualung/Makefile
  head/audio/aqualung/distinfo
  head/audio/aqualung/pkg-plist

Modified: head/audio/aqualung/Makefile
==============================================================================
--- head/audio/aqualung/Makefile	Sat Oct  3 17:12:25 2015	(r398547)
+++ head/audio/aqualung/Makefile	Sat Oct  3 17:17:05 2015	(r398548)
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	aqualung
-DISTVERSION=	1.0-rc1
+PORTVERSION=	1.0
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Music player with rich features
 
 LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libmp3lame.so:${PORTSDIR}/audio/lame \
@@ -28,10 +29,10 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audi
 		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
 		liblrdf.so:${PORTSDIR}/textproc/liblrdf
 
-USES=		gettext lua:51 pkgconfig
+USES=		gettext lua pkgconfig
 USE_GNOME=	gtk20 libxml2 libxslt
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-alsa=no --with-ifp=no
+CONFIGURE_ARGS=	--with-ifp=no
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -39,8 +40,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
 		"Audio;AudioVideo;GTK;" ""
 
-OPTIONS_DEFINE=		DOCS JACK PULSEAUDIO
+OPTIONS_DEFINE=		ALSA DOCS JACK PULSEAUDIO
 
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_ON=	--with-alsa=yes
+ALSA_CONFIGURE_OFF=	--with-alsa=no
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ON=	--with-jack=yes
 JACK_CONFIGURE_OFF=	--with-jack=no

Modified: head/audio/aqualung/distinfo
==============================================================================
--- head/audio/aqualung/distinfo	Sat Oct  3 17:12:25 2015	(r398547)
+++ head/audio/aqualung/distinfo	Sat Oct  3 17:17:05 2015	(r398548)
@@ -1,2 +1,2 @@
-SHA256 (aqualung-1.0-rc1.tar.gz) = 4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b
-SIZE (aqualung-1.0-rc1.tar.gz) = 1939271
+SHA256 (aqualung-1.0.tar.gz) = c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347
+SIZE (aqualung-1.0.tar.gz) = 2014854

Added: head/audio/aqualung/files/patch-src__decoder__dec_mac.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/aqualung/files/patch-src__decoder__dec_mac.cpp	Sat Oct  3 17:17:05 2015	(r398548)
@@ -0,0 +1,11 @@
+--- src/decoder/dec_mac.cpp.orig	2015-04-19 12:49:49 UTC
++++ src/decoder/dec_mac.cpp
+@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char *
+ 
+ 
+ 	int ret = 0;
+-        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
++        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+         free(pUTF16);
+ 

Modified: head/audio/aqualung/pkg-plist
==============================================================================
--- head/audio/aqualung/pkg-plist	Sat Oct  3 17:12:25 2015	(r398547)
+++ head/audio/aqualung/pkg-plist	Sat Oct  3 17:17:05 2015	(r398548)
@@ -150,6 +150,7 @@ man/man1/aqualung.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/systray.png
 %%PORTDOCS%%%%DOCSDIR%%/timer.eps
 %%PORTDOCS%%%%DOCSDIR%%/timer.png
+share/locale/cs/LC_MESSAGES/aqualung.mo
 share/locale/de/LC_MESSAGES/aqualung.mo
 share/locale/es/LC_MESSAGES/aqualung.mo
 share/locale/fr/LC_MESSAGES/aqualung.mo