This updates Aqualung to the final 1.0 release. Code wise, not much
has changed. Upstream development has now switched to my GitHub.
Most patches go away, but there is a patch added, which is needed
because the audio/mac port is lagging behind upstream a bit.
I'll be committing this in a few days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile 26 Jul 2015 05:46:02 -0000 1.40
+++ Makefile 30 Aug 2015 20:10:57 -0000
@@ -2,12 +2,12 @@
COMMENT= advanced music player
-DISTNAME= aqualung-1.0-rc1
-PKGNAME= aqualung-1.0rc1
+VERSION= 1.0
+DISTNAME= aqualung-${VERSION}
EPOCH= 0
CATEGORIES= audio
-HOMEPAGE= http://aqualung.factorial.hu/
+HOMEPAGE= https://github.com/jeremyevans/aqualung
MAINTAINER= Jeremy Evans <jer...@openbsd.org>
@@ -24,7 +24,7 @@ WANTLIB += gdk_pixbuf-2.0 xml2 mac mad m
WANTLIB += avformat avutil wavpack lrdf oggz speex cddb cdio
WANTLIB += cdio_cdda cdio_paranoia modplug ${MODLUA_WANTLIB}
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqualung/}
+MASTER_SITES=
https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
MODULES= devel/gettext \
lang/lua
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/aqualung/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 26 Jul 2015 05:46:02 -0000 1.5
+++ distinfo 30 Aug 2015 20:09:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (aqualung-1.0-rc1.tar.gz) = S2x+ijivnwP7BC+BM8zoNPh9f1SJyvKoXp0tHkKK4ks=
-SIZE (aqualung-1.0-rc1.tar.gz) = 1939271
+SHA256 (aqualung-1.0.tar.gz) = wobBQywUdRJ/TpUlcCvLSG7YX8YlOb0+80TZIzPoQ0c=
+SIZE (aqualung-1.0.tar.gz) = 2014854
Index: patches/patch-src_core_c
===================================================================
RCS file: patches/patch-src_core_c
diff -N patches/patch-src_core_c
--- patches/patch-src_core_c 26 Jul 2015 05:49:37 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$OpenBSD: patch-src_core_c,v 1.3 2015/07/26 05:49:37 jeremy Exp $
-
-Fix use-after-free when sample rate switches. This isn't a perfect fix,
-as it does result in some uninitialized memory be used (displayed for
-a split second if the sample rate switches), but it's better than
-crashing.
-
---- src/core.c.orig Tue Jun 3 08:08:19 2014
-+++ src/core.c Fri Jul 17 23:54:46 2015
-@@ -372,7 +372,8 @@ disk_thread(void * arg) {
- (fdec->pdec != NULL)) {
-
- decoder_t * dec = (decoder_t
*)fdec->pdec;
--
-+ fileinfo_t fileinfo_sent;
-+
- cdda_decoder_reopen(dec,
filename);
- fdec->samples_left =
fdec->fileinfo.total_samples;
-
-@@ -382,9 +383,11 @@ disk_thread(void * arg) {
- sample_offset = 0;
-
- send_cmd = CMD_FILEINFO;
-+ fileinfo_sent = fdec->fileinfo;
-+ fileinfo_sent.format_str =
strdup(fdec->fileinfo.format_str);
- rb_write(rb_disk2gui, &send_cmd,
-
sizeof(send_cmd));
-- rb_write(rb_disk2gui, (char
*)&(fdec->fileinfo),
-+ rb_write(rb_disk2gui, (char
*)&fileinfo_sent,
-
sizeof(fileinfo_t));
-
- info->is_streaming = 1;
-@@ -411,6 +414,8 @@ disk_thread(void * arg) {
- rb_write(rb_disk2gui,
&send_cmd, 1);
- goto sleep;
- } else {
-+ fileinfo_t fileinfo_sent;
-+
- file_decoder_set_rva(fdec,
cue.voladj);
- info->in_SR_prev = info->in_SR;
- info->in_SR =
fdec->fileinfo.sample_rate;
-@@ -430,9 +435,11 @@ disk_thread(void * arg) {
- sample_offset = 0;
-
- send_cmd = CMD_FILEINFO;
-+ fileinfo_sent = fdec->fileinfo;
-+ fileinfo_sent.format_str =
strdup(fdec->fileinfo.format_str);
- rb_write(rb_disk2gui, &send_cmd,
-
sizeof(send_cmd));
-- rb_write(rb_disk2gui, (char
*)&(fdec->fileinfo),
-+ rb_write(rb_disk2gui, (char
*)&fileinfo_sent,
-
sizeof(fileinfo_t));
-
- info->is_streaming = 1;
Index: patches/patch-src_decoder_dec_mac_cpp
===================================================================
RCS file: patches/patch-src_decoder_dec_mac_cpp
diff -N patches/patch-src_decoder_dec_mac_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_decoder_dec_mac_cpp 30 Aug 2015 20:21:38 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Use glib character conversion function instead of MAC library function,
+since the function used isn't supported in the mac 3.99 version we
+have in ports. Taken from a patch in Aqualung Mantis bug #191.
+
+--- src/decoder/dec_mac.cpp.orig Sun Apr 19 05:49:49 2015
++++ src/decoder/dec_mac.cpp Sun Aug 30 13:19:54 2015
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <glib.h>
+
+
+ /* expand this to nothing so there's no error when including MACLib.h */
+@@ -174,9 +175,9 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+
+
+ int ret = 0;
+- wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+- pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+- free(pUTF16);
++ gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
++ pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret);
++ g_free(pUTF16);
+
+ if (!pdecompress || ret != ERROR_SUCCESS) {
+ return DECODER_OPEN_BADLIB;
Index: patches/patch-src_ext_lua_c
===================================================================
RCS file: patches/patch-src_ext_lua_c
diff -N patches/patch-src_ext_lua_c
--- patches/patch-src_ext_lua_c 26 Jul 2015 05:49:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_ext_lua_c,v 1.1 2015/07/26 05:49:37 jeremy Exp $
-
-Work with Lua 5.2 (r1302).
-
---- src/ext_lua.c.orig Sat Jul 18 00:52:28 2015
-+++ src/ext_lua.c Sat Jul 18 00:52:46 2015
-@@ -550,7 +550,7 @@ void setup_extended_title_formatting(void) {
- L = NULL;
- }
-
-- L = lua_open();
-+ L = luaL_newstate();
- luaL_openlibs(L);
-
- error = luaL_dostring(L, AQUALUNG_LUA_API);
Index: patches/patch-src_gui_main_c
===================================================================
RCS file: patches/patch-src_gui_main_c
diff -N patches/patch-src_gui_main_c
--- patches/patch-src_gui_main_c 26 Jul 2015 05:49:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_main_c,v 1.1 2015/07/26 05:49:37 jeremy Exp $
-
-Part of the use-after-free fix.
-
---- src/gui_main.c.orig Tue Jun 3 08:08:19 2014
-+++ src/gui_main.c Fri Jul 17 23:54:46 2015
-@@ -3974,6 +3974,10 @@ timeout_callback(gpointer data) {
- case CMD_FILEINFO:
- while (rb_read_space(rb_disk2gui) < sizeof(fileinfo_t))
- ;
-+ if (fileinfo.format_str != NULL) { /* free previous
format_str, if there is one */
-+ free(fileinfo.format_str);
-+ fileinfo.format_str = NULL;
-+ }
- rb_read(rb_disk2gui, (char *)&fileinfo,
sizeof(fileinfo_t));
-
- sample_pos = 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/aqualung/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 26 Jul 2015 05:49:37 -0000 1.8
+++ pkg/PLIST 30 Aug 2015 20:22:28 -0000
@@ -162,6 +162,7 @@ share/doc/aqualung/store.png
share/doc/aqualung/systray.png
share/doc/aqualung/timer.eps
share/doc/aqualung/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
@@ -173,6 +174,8 @@ share/locale/pl/LC_MESSAGES/aqualung.mo
share/locale/ru/LC_MESSAGES/aqualung.mo
share/locale/sv/LC_MESSAGES/aqualung.mo
share/locale/uk/LC_MESSAGES/aqualung.mo
+share/locale/zh/
+share/locale/zh/LC_MESSAGES/
share/locale/zh/LC_MESSAGES/aqualung.mo
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
