Update to aqualung 1.0-rc1

audio/aqualung/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2015/05/08 09:08:44 espie Exp $
+# $OpenBSD: Makefile,v 1.40 2015/07/26 05:46:02 jeremy Exp $
 
 COMMENT=	advanced music player
 
-DISTNAME=	aqualung-0.9beta11
-REVISION=	13
+DISTNAME=	aqualung-1.0-rc1
+PKGNAME=	aqualung-1.0rc1
 EPOCH=		0
 CATEGORIES=	audio
 
@@ -21,7 +21,7 @@ WANTLIB += gthread-2.0 m mp3lame ogg pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio stdc++
 WANTLIB += vorbis vorbisenc vorbisfile z gtk-x11-2.0 gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 xml2 mac mad mpcdec FLAC avcodec
-WANTLIB += avformat avutil jack wavpack lrdf oggz speex cddb cdio
+WANTLIB += avformat avutil wavpack lrdf oggz speex cddb cdio
 WANTLIB += cdio_cdda cdio_paranoia modplug ${MODLUA_WANTLIB}
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aqualung/}
@@ -31,16 +31,13 @@ MODULES=	devel/gettext \
 
 MODLUA_SA=	Yes
 
-BUILD_DEPENDS=	devel/autoconf/2.63 \
-		devel/automake/1.10
-
 LIB_DEPENDS=	audio/flac \
-		audio/jack \
 		audio/lame \
 		audio/libcdio \
 		audio/libcddb \
 		audio/libmad \
 		audio/libmodplug \
+		audio/libsamplerate \
 		audio/libsndfile \
 		audio/libvorbis \
 		audio/mac \
@@ -56,49 +53,41 @@ LIB_DEPENDS=	audio/flac \
 
 RUN_DEPENDS=	devel/desktop-file-utils
 
-AUTOCONF_VERSION= 2.63
-AUTOMAKE_VERSION= 1.10
-
 CFLAGS+=	-DPTHREAD_MIN_PRIORITY=0 -DPTHREAD_MAX_PRIORITY=31 \
 		-I${LOCALBASE}/include -I${MODLUA_INCL_DIR}
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib "
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib " \
+		lua_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
+		lua_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
 
 # ifp (requires libifp) - no package
 CONFIGURE_ARGS=	--with-cdda \
 		--with-cddb \
 		--with-flac \
-		--with-jack \
 		--with-ladspa \
 		--with-lame \
 		--with-lavc \
-		--with-loop \
 		--with-lua \
 		--with-mac \
 		--with-mod \
 		--with-mpc \
 		--with-mpeg \
-		--with-ogg \
-		--with-podcast \
 		--with-sndfile \
 		--with-sndio \
 		--with-speex \
 		--with-src \
-		--with-systray \
+		--with-vorbis \
 		--with-vorbisenc \
 		--with-wavpack \
 		--without-alsa \
 		--without-ifp \
+		--without-jack \
 		--without-oss \
-		--without-pulse
-
-post-patch:
-	@cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-	    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
+		--without-pulse \
+		--without-winmm
 
 post-install:
-	mv ${PREFIX}/share/aqualung/doc ${PREFIX}/share/doc/aqualung
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
 	@${SUBST_CMD} -m 0644 -c ${FILESDIR}/aqualung.desktop \
 		${PREFIX}/share/applications/aqualung.desktop

audio/aqualung/distinfo

@@ -1,2 +1,2 @@
-SHA256 (aqualung-0.9beta11.tar.gz) = MV6uRTnBA5l404vXvI75ZfPp3FGMfrb06dpSqb8zLd0=
-SIZE (aqualung-0.9beta11.tar.gz) = 1584700
+SHA256 (aqualung-1.0-rc1.tar.gz) = S2x+ijivnwP7BC+BM8zoNPh9f1SJyvKoXp0tHkKK4ks=
+SIZE (aqualung-1.0-rc1.tar.gz) = 1939271

audio/aqualung/patches/patch-configure_ac

@@ -1,116 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2013/01/18 08:15:55 brad Exp $
---- configure.ac.orig	Sun Jan 31 11:29:58 2010
-+++ configure.ac	Thu Jan 17 23:31:40 2013
-@@ -335,6 +335,21 @@ else
- 	fi
- fi
- 
-+AC_ARG_WITH([lavc],
-+    [AS_HELP_STRING([--with-lavc],
-+        [compile with Libav / FFmpeg support (default: detect)])],
-+    [], [with_lavc='detect'])
-+AS_IF([test "x$with_lavc" != 'xno'], [
-+    AC_MSG_NOTICE([Libav / FFmpeg Support])
-+    PKG_CHECK_MODULES([lavc], [libavcodec libavformat libavutil],
-+        [AS_IF([test "x$with_lavc" = 'xdetect'], [with_lavc='yes (found)'])],
-+        [AS_IF([test "x$with_lavc" = 'xyes'],
-+            [AC_MSG_ERROR([$lavc_PKG_ERRORS])])])
-+    AS_CASE([$with_lavc],
-+        [detect], [with_lavc='not found'],
-+        [yes*], [AC_DEFINE([HAVE_LAVC], [1],
-+                    [Define to build with Libav / FFmpeg support])])
-+])
- 
- AC_MSG_CHECKING(for sndfile support)
- AC_ARG_WITH(
-@@ -601,81 +616,6 @@ else
- fi
- 
- 
--AC_MSG_CHECKING(for LAVC support)
--AC_ARG_WITH(
--	lavc,
--	[  --with-lavc=yes,no      compile with lavc (FFmpeg) support (default: yes)],
--	lavc="$withval",
--	lavc="detect")
--if test "$lavc" = "no"; then
--	AC_MSG_RESULT(no)
--else
--	AC_CHECK_HEADER([avcodec.h], [avc_hdr=yes], [avc_hdr=no])
--	if test "$avc_hdr" = "yes"; then
--		AC_DEFINE([HAVE_AVCODEC_H], [1], [Define to 1 if you have the <avcodec.h> header file.])
--	else
--		AC_CHECK_HEADER([ffmpeg/avcodec.h], [avc_hdr=yes], [avc_hdr=no])
--		if test "$avc_hdr" = "yes"; then
--		        AC_DEFINE([HAVE_FFMPEG_AVCODEC_H], [1], [Define to 1 if you have the <ffmpeg/avcodec.h> header file.])
--		else
--			AC_CHECK_HEADER([libavcodec/avcodec.h], [avc_hdr=yes], [avc_hdr=no])
--			if test "$avc_hdr" = "yes"; then
--		                AC_DEFINE([HAVE_LIBAVCODEC_AVCODEC_H], [1], [Define to 1 if you have the <libavcodec/avcodec.h> header file.])
--			else
--				AC_CHECK_HEADER([ffmpeg/libavcodec/avcodec.h], [avc_hdr=yes], [avc_hdr=no])
--				if test "$avc_hdr" = "yes"; then
--		                        AC_DEFINE([HAVE_FFMPEG_LIBAVCODEC_AVCODEC_H], [1], [Define to 1 if you have the <ffmpeg/libavcodec/avcodec.h> header file.])
--				else
--					PKG_CHECK_MODULES(LIBAVCODEC, libavcodec, [avc_hdr=yes], [avc_hdr=no])
--					if test "$avc_hdr" = "yes"; then
--		                AC_DEFINE([HAVE_LIBAVCODEC_AVCODEC_H], [1], [Define to 1 if you have the <libavcodec/avcodec.h> header file.])
--					fi
--				fi
--			fi
--		fi
--	fi
--
--	AC_CHECK_HEADER([avformat.h], [avf_hdr=yes], [avf_hdr=no])
--	if test "$avf_hdr" = "yes"; then
--		AC_DEFINE([HAVE_AVFORMAT_H], [1], [Define to 1 if you have the <avformat.h> header file.])
--	else
--		AC_CHECK_HEADER([ffmpeg/avformat.h], [avf_hdr=yes], [avf_hdr=no])
--		if test "$avf_hdr" = "yes"; then
--		        AC_DEFINE([HAVE_FFMPEG_AVFORMAT_H], [1], [Define to 1 if you have the <ffmpeg/avformat.h> header file.])
--		else
--			AC_CHECK_HEADER([libavformat/avformat.h], [avf_hdr=yes], [avf_hdr=no])
--			if test "$avf_hdr" = "yes"; then
--		                AC_DEFINE([HAVE_LIBAVFORMAT_AVFORMAT_H], [1], [Define to 1 if you have the <libavformat/avformat.h> header file.])
--			else
--				AC_CHECK_HEADER([ffmpeg/libavformat/avformat.h], [avf_hdr=yes], [avf_hdr=no])
--				if test "$avf_hdr" = "yes"; then
--		                        AC_DEFINE([HAVE_FFMPEG_LIBAVFORMAT_AVFORMAT_H], [1], [Define to 1 if you have the <ffmpeg/libavformat/avformat.h> header file.])
--				else
--					PKG_CHECK_MODULES(LIBAVFORMAT, libavformat, [avf_hdr=yes], [avf_hdr=no])
--					if test "$avf_hdr" = "yes"; then
--		                AC_DEFINE([HAVE_LIBAVFORMAT_AVFORMAT_H], [1], [Define to 1 if you have the <libavformat/avformat.h> header file.])
--					fi
--				fi
--			fi
--		fi
--	fi
--
--	AC_CHECK_LIB(avformat, av_open_input_file, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz])
--	AC_CHECK_LIB(avcodec, avcodec_open, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz])
--
--	if test "$avc_hdr" = "yes" -a "$avf_hdr" = "yes" -a "$avc_lib" = "yes" -a "$avf_lib" = "yes" ; then
--	        lavc_LIBS="-lavformat -lavcodec -lavutil -lz"
--		AC_DEFINE([HAVE_LAVC], [1], [Defined if compile with LAVC support])
--	        lavc="yes"
--	else
--	        if test "$lavc" = "yes"; then
--		        AC_MSG_ERROR(You do not appear to have the LAVC decoder library (FFmpeg) installed. Grab it from http://ffmpeg.mplayerhq.hu/)
--		fi
--		lavc="no"
--	fi
--fi
--
--
- AC_MSG_CHECKING(for LAME (MP3 encoding) support)
- AC_ARG_WITH(
- 	lame,
-@@ -1005,7 +945,7 @@ echo "      MOD Audio (MOD, S3M, XM, IT, etc.)  :  $mo
- echo "      Musepack                            :  $mpc"
- echo "      Monkey's Audio Codec                :  $mac"
- echo "      WavPack                             :  $wavpack"
--echo "      LAVC (AC3, AAC, WavPack, WMA, etc.) :  $lavc"
-+echo "      LAVC (AC3, AAC, WavPack, WMA, etc.) :  $with_lavc"
- echo
- echo "  Encoding support:"
- echo "      sndfile (WAV)                       :  $sndfile"