Update gmediaserver to 0.12.0.

2006-09-01: GMediaServer 0.12.0 released. Fix compilation problems by including more headers in various places (from Jan Ceuleers, Sebastian Marek, Mohan Yellaji, and Alejandro Imass). Support libupnp 1.3.x properly by using headers in correct directory (from Jan Ceuleers). Added initial support for file types other than audio. Add support for JPEG images (patch from Jan Ceuleers). Use and depend on libmagic for file type identification. Add --file-types help to --help message. Fix libuuid detection (reported by Wayne Stallwood). Enable searching by adding 'searchable' attribute to containers (reported by Remi). Minor documentation improvements. Fix bug: GMediaServer would segfault when more than one directory was specified on the command line and one (or more) of them could not be scanned. Fix bugs: GMediaServer would segfault on any search. Output non-printable strings escaped properly.
2007-05-28 13:25:06 +00:00 · 2007-05-28 13:25:06 +00:00 · 742abf9088
commit 742abf9088
parent 7685700e5c
5 changed files with 66 additions and 42 deletions
--- a/gmediaserver/Makefile
+++ b/gmediaserver/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2007/04/01 02:19:12 obache Exp $
+# $NetBSD: Makefile,v 1.5 2007/05/28 13:25:06 obache Exp $

-DISTNAME=		gmediaserver-0.11.0
+DISTNAME=		gmediaserver-0.12.0
 CATEGORIES=		multimedia net
 MASTER_SITES=		http://download.savannah.gnu.org/releases/gmediaserver/

--- a/gmediaserver/distinfo
+++ b/gmediaserver/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/06/22 08:32:18 obache Exp $
+$NetBSD: distinfo,v 1.3 2007/05/28 13:25:07 obache Exp $

-SHA1 (gmediaserver-0.11.0.tar.gz) = cef9e55491b500f3b111d9de33adbf5247b2b0f9
-RMD160 (gmediaserver-0.11.0.tar.gz) = 9aec3700ff438024cec014300403322b379b5f29
-Size (gmediaserver-0.11.0.tar.gz) = 542491 bytes
-SHA1 (patch-aa) = edee9a2388f6700b275bec01701029f1a50f2ae8
-SHA1 (patch-ab) = efea5ffb31dd3f488549fdc14bb5e0b0e3c68058
-SHA1 (patch-ac) = aa532bd7eb3a09e235c264d77a7d5e71cf51bf3b
+SHA1 (gmediaserver-0.12.0.tar.gz) = ccac2b3360f2985ea7b3696167a941ff3aec0379
+RMD160 (gmediaserver-0.12.0.tar.gz) = e0a5f0461e87cba3e936e7f7a49aac9ef53c2574
+Size (gmediaserver-0.12.0.tar.gz) = 581926 bytes
+SHA1 (patch-aa) = e8b516928cb1b3fd06975736ed4fe932917f049b
+SHA1 (patch-ab) = 502b60ecde71f0f17aefb1908e48cea998cd7395
+SHA1 (patch-ac) = 04be1e0e4a1757afb131c57e041ebca100d36bfb
--- a/gmediaserver/patches/patch-aa
+++ b/gmediaserver/patches/patch-aa
@ -1,12 +1,33 @@
-$NetBSD: patch-aa,v 1.1 2006/06/22 08:32:18 obache Exp $
+$NetBSD: patch-aa,v 1.2 2007/05/28 13:25:07 obache Exp $

--- src/metadata.c.orig	2006-03-13 13:16:10.000000000 +0000
-+++ src/metadata.c
-@@ -55,6 +55,7 @@
- #include "strutil.h"
- #include "intutil.h"
- #include "gmediaserver.h"
-+#include <ithread.h>
+--- configure.orig	2006-08-29 20:53:54.000000000 +0000
+++ configure
+@@ -23324,7 +23324,7 @@ if test "${ac_cv_lib_magic_magic_open+se
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmagic  $LIBS"
+LIBS="-lmagic -lz $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23396,7 +23396,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_magic_magic_open" >&6; }
+ if test $ac_cv_lib_magic_magic_open = yes; then
+-  LIBMAGIC=-lmagic
+  LIBMAGIC="-lmagic -lz"
 
- #define DEFAULT_ENTRIES_SIZE 		512
- #define DEFAULT_FILE_TYPES 		"mp3,wma,m3u,pls"
+ else
+   { { echo "$as_me:$LINENO: error: libmagic library or magic_open function not found" >&5
+@@ -24725,6 +24725,10 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+	: Avoid regenerating within pkgsrc
+	exit 0
+	: Avoid regenerating within pkgsrc
+	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     echo "$ac_cs_version"; exit ;;
--- a/gmediaserver/patches/patch-ab
+++ b/gmediaserver/patches/patch-ab
@ -1,12 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2006/06/22 08:32:18 obache Exp $
+$NetBSD: patch-ab,v 1.2 2007/05/28 13:25:07 obache Exp $

--- src/webclient.c.orig	2005-09-16 14:31:12.000000000 +0000
-+++ src/webclient.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include <config.h>
-+#include <unistd.h>		/* POSIX */
- #include <sys/socket.h>		/* POSIX */
- #include <netinet/in.h>		/* POSIX */
- #include <netdb.h>		/* POSIX */
+--- src/main.c.orig	2006-08-31 18:44:25.000000000 +0000
+++ src/main.c
+@@ -399,7 +399,9 @@ main(int argc, char **argv)
+      */
+     if (!background)
+         write_pid_file(pidfilename, getpid(), false);
+-
+#ifndef MSG_NOSIGNAL
+    signal(SIGPIPE, SIG_IGN);
+#endif
+     signalaction.sa_handler = dummy_signal_handler;
+     if (sigemptyset(&signalaction.sa_mask) < 0)
+     	die(_("cannot empty signal set - %s\n"), errstr);
--- a/gmediaserver/patches/patch-ac
+++ b/gmediaserver/patches/patch-ac
@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2006/06/22 08:32:18 obache Exp $
+$NetBSD: patch-ac,v 1.2 2007/05/28 13:25:07 obache Exp $

--- src/webserver.c.orig	2006-03-04 18:58:47.000000000 +0000
-+++ src/webserver.c
-@@ -282,7 +282,7 @@ webserver_read(UpnpWebFileHandle fh, cha
- 	len = read(file->detail.local.fd, buf, buflen);
- 	break;
-     case FILE_MEMORY:
-	len = min(buflen, file->detail.memory.len - file->pos);
-+	len = MIN(buflen, file->detail.memory.len - file->pos);
- 	memcpy(buf, file->detail.memory.contents + file->pos, len);
- 	break;
-     case FILE_URL:
+--- po/Makefile.in.in.orig	2007-05-28 07:31:58.000000000 +0000
+++ po/Makefile.in.in
+@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-mkinstalldirs = $(SHELL) @install_sh@ -d
+mkinstalldirs = @install_sh@ -d
+ mkdir_p = @mkdir_p@
+ 
+ GMSGFMT_ = @GMSGFMT@