audio/aqualung minor fixes

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

audio/aqualung minor fixes

Jeremy Evans-5
Here are a few minor fixes to audio/aqualung:

* Switch freedb.org:888 to gnudb.org:8880 for the CDDB lookup. The
  server is configurable but the port is not, so this is breaking
  for someone using a custom CDDB server.  I suppose you can setup
  pf.conf appropriately if you want to use a custom server with
  port 888.

* Handle case where ~/.config directory doesn't exist.

* Use default skin by default, instead of plain skin, as the
  plain skin has font issues.

Thanks to Nick Holland and naddy@ for notifying me about these issues.
If anyone could test the CDDB support, I would appreciate it, as I've
never used it.

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile 12 Jul 2019 20:43:31 -0000 1.54
+++ Makefile 16 Jun 2020 00:34:14 -0000
@@ -4,7 +4,7 @@ COMMENT= advanced music player
 
 VERSION= 1.0
 DISTNAME= aqualung-${VERSION}
-REVISION= 9
+REVISION= 10
 EPOCH= 0
 CATEGORIES= audio
 
Index: patches/patch-src_cddb_lookup_c
===================================================================
RCS file: patches/patch-src_cddb_lookup_c
diff -N patches/patch-src_cddb_lookup_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_cddb_lookup_c 29 Jun 2020 23:22:46 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Change default CDDB port to 8880, as that is what gnudb.org uses.
+
+Index: src/cddb_lookup.c
+--- src/cddb_lookup.c.orig
++++ src/cddb_lookup.c
+@@ -223,7 +223,7 @@ cddb_connection_setup(cddb_conn_t ** conn) {
+ cddb_set_server_port(*conn, 80);
+ } else {
+ cddb_http_disable(*conn);
+- cddb_set_server_port(*conn, 888);
++ cddb_set_server_port(*conn, 8880);
+ }
+ }
+
Index: patches/patch-src_core_c
===================================================================
RCS file: /cvs/ports/audio/aqualung/patches/patch-src_core_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_core_c
--- patches/patch-src_core_c 3 Feb 2019 03:58:35 -0000 1.6
+++ patches/patch-src_core_c 16 Jun 2020 20:56:01 -0000
@@ -3,6 +3,8 @@ $OpenBSD: patch-src_core_c,v 1.6 2019/02
 Reinit sndio if there is a audio(4) error.  Without this, aqualung is
 unusable after an audio(4) error until it is closed and reopened.
 
+Create .config directory before .config/aqualung if it does not exist.
+
 Index: src/core.c
 --- src/core.c.orig
 +++ src/core.c
@@ -59,3 +61,12 @@ Index: src/core.c
  AQUALUNG_THREAD_CREATE(info->sndio_thread_id, NULL, sndio_thread, info)
  set_thread_priority(info->sndio_thread_id, "sndio output", realtime, priority);
 
+@@ -1887,6 +1907,8 @@ load_default_cl(int * argc, char *** argv) {
+         if (chdir(options.confdir) != 0) {
+                 if (errno == ENOENT) {
+                         fprintf(stderr, "Creating directory %s\n", options.confdir);
++ /* Try creating .config before .config/aqualung */
++ mkdir(dirname(options.confdir), S_IRUSR | S_IWUSR | S_IXUSR);
+                         if (mkdir(options.confdir, S_IRUSR | S_IWUSR | S_IXUSR) < 0) {
+ perror("cannot create config directory: mkdir");
+ exit(1);
Index: patches/patch-src_gui_main_c
===================================================================
RCS file: patches/patch-src_gui_main_c
diff -N patches/patch-src_gui_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gui_main_c 29 Jun 2020 23:19:35 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Use the default skin by default.
+
+Switch from freedb.org to gnudb.org for the CDDB server.
+
+Index: src/gui_main.c
+--- src/gui_main.c.orig
++++ src/gui_main.c
+@@ -3565,7 +3565,7 @@ create_gui(int argc, char ** argv, int optind, int enq
+ if (options.title_format[0] == '\0')
+ sprintf(options.title_format, "%%a: %%t [%%r]");
+ if (options.skin[0] == '\0') {
+- sprintf(options.skin, "%s/plain", AQUALUNG_SKINDIR);
++ sprintf(options.skin, "%s/default", AQUALUNG_SKINDIR);
+ options.main_pos_x = 280;
+ options.main_pos_y = 30;
+ options.main_size_x = 380;
+@@ -3583,7 +3583,7 @@ create_gui(int argc, char ** argv, int optind, int enq
+ }
+
+ if (options.cddb_server[0] == '\0') {
+- sprintf(options.cddb_server, "freedb.org");
++ sprintf(options.cddb_server, "gnudb.org");
+ }
+
+ if (options.src_type == -1) {