- Update MASTER_SITES

- Fix portaudio2 support

PR:		176555
Submitted by:	Ports Fury

3 files changed, 84 insertions, 6 deletions

diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 3fd69f36347b..1fd91e6d59fc 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.1.9
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/ \
-		ftp://ftp.aegisub.org/pub/archives/releases/srouce/ \
+		ftp://ftp.aegisub.org/pub/archives/releases/source/ \
 		ftp://ftp2.aegisub.org/pub/archives/releases/source/ \
 		GOOGLE_CODE:ffms
 PROJECTHOST=	ffmpegsource
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT=	ASS PULSEAUDIO FFMPEG HUNSPELL LUA
 GCOV_DESC=	GCOV (require profiling)
 EFENCE_DESC=	Electric Fence (require profiling)
 ASS_DESC=	libASS subtitle provider
-HUNSPELL_DESC=	Hunspell support
+HUNSPELL_DESC=	Spell checking via Hunspell
 
 USE_GNOME=	intltool
 USE_WX=		2.8
@@ -39,7 +39,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-lua50
+CONFIGURE_ARGS=	--disable-gcc-prec --without-lua50
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
@@ -99,11 +99,9 @@ CONFIGURE_ARGS+=	--without-openal
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-BROKEN=		portaudio2 support is broken
 BUILD_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 RUN_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
-CFLAGS+=	-isystem ${LOCALBASE}/include/portaudio2
-LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2
+CONFIGURE_ENV+=	PORTAUDIO_LIBS="${LOCALBASE}/lib/portaudio2/libportaudio.so"
 .else
 CONFIGURE_ARGS+=	--without-portaudio
 .endif
@@ -170,6 +168,10 @@ post-patch:
 		's|@HAVE_AUTO3_LUA_TRUE@|#| ; \
 		 s|@HAVE_AUTO3_LUA_FALSE@||' ${WRKSRC}/${i}
 .endfor
+.for i in src/audio_player_portaudio.h
+	@${REINPLACE_CMD} -e \
+		's|<portaudio\.h>|<portaudio2/portaudio.h>|' ${WRKSRC}/${i}
+.endfor
 
 pre-configure:
 .if ${PORT_OPTIONS:MFFMPEG}
diff --git a/multimedia/aegisub/files/patch-src__audio_player_alsa.cpp b/multimedia/aegisub/files/patch-src__audio_player_alsa.cpp
new file mode 100644
index 000000000000..afbcd874d56c
--- /dev/null
+++ b/multimedia/aegisub/files/patch-src__audio_player_alsa.cpp
@@ -0,0 +1,56 @@
+--- src/audio_player_alsa.cpp.orig
++++ src/audio_player_alsa.cpp
+@@ -192,7 +192,7 @@
+ 
+ 	snd_pcm_t *pcm = 0;
+ 	if (snd_pcm_open(&pcm, ps.device_name.c_str(), SND_PCM_STREAM_PLAYBACK, 0) != 0)
+-		return "snd_pcm_open";
++		return (void*)"snd_pcm_open";
+ 	//printf("alsa_player: opened pcm\n");
+ 
+ do_setup:
+@@ -209,7 +209,7 @@
+ 		break;
+ 	default:
+ 		snd_pcm_close(pcm);
+-		return "snd_pcm_format_t";
++		return (void*)"snd_pcm_format_t";
+ 	}
+ 	if (snd_pcm_set_params(pcm,
+ 	                       pcm_format,
+@@ -219,7 +219,7 @@
+ 	                       1, // allow resample
+ 	                       100*1000 // 100 milliseconds latency
+ 	                      ) != 0)
+-		return "snd_pcm_set_params";
++		return (void*)"snd_pcm_set_params";
+ 	//printf("alsa_player: set pcm params\n");
+ 
+ 	size_t framesize = ps.provider->GetChannels() * ps.provider->GetBytesPerSample();
+@@ -261,7 +261,7 @@
+ 				delete[] buf;
+ 				snd_pcm_close(pcm);
+ 				//printf("alsa_player: error filling buffer\n");
+-				return "snd_pcm_writei";
++				return (void*)"snd_pcm_writei";
+ 			}
+ 		}
+ 		delete[] buf;
+@@ -319,7 +319,7 @@
+ 					delete[] buf;
+ 					snd_pcm_close(pcm);
+ 					//printf("alsa_player: error filling buffer, written=%d\n", written);
+-					return "snd_pcm_writei";
++					return (void*)"snd_pcm_writei";
+ 				}
+ 			}
+ 			delete[] buf;
+@@ -353,7 +353,7 @@
+ 		case SND_PCM_STATE_DISCONNECTED:
+ 			// lost device, close the handle and return error
+ 			snd_pcm_close(pcm);
+-			return "SND_PCM_STATE_DISCONNECTED";
++			return (void*)"SND_PCM_STATE_DISCONNECTED";
+ 
+ 		default:
+ 			// everything else should either be fine or impossible (here)
diff --git a/multimedia/aegisub/files/patch-src__audio_player_pulse.cpp b/multimedia/aegisub/files/patch-src__audio_player_pulse.cpp
new file mode 100644
index 000000000000..e61621823012
--- /dev/null
+++ b/multimedia/aegisub/files/patch-src__audio_player_pulse.cpp
@@ -0,0 +1,20 @@
+--- src/audio_player_pulse.cpp.orig
++++ src/audio_player_pulse.cpp
+@@ -144,7 +144,7 @@
+ 	pa_stream_set_write_callback(stream, (pa_stream_request_cb_t)pa_stream_write, this);
+ 
+ 	// Connect stream
+-	paerror = pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_NOT_MONOTONOUS|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL);
++	paerror = pa_stream_connect_playback(stream, NULL, NULL, (pa_stream_flags_t) (PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_NOT_MONOTONOUS|PA_STREAM_AUTO_TIMING_UPDATE), NULL, NULL);
+ 	if (paerror) {
+ 		printf("PulseAudio reported error: %s (%d)\n", pa_strerror(paerror), paerror);
+ 		wxString s(pa_strerror(paerror), wxConvUTF8);
+@@ -217,7 +217,7 @@
+ 
+ 	play_start_time = 0;
+ 	pa_threaded_mainloop_lock(mainloop);
+-	paerror = pa_stream_get_time(stream, &play_start_time);
++	paerror = pa_stream_get_time(stream, (pa_usec_t*) &play_start_time);
+ 	pa_threaded_mainloop_unlock(mainloop);
+ 	if (paerror) {
+ 		printf("PulseAudio player: Error getting stream time: %s (%d)\n", pa_strerror(paerror), paerror);