diff -r 6f9166cf333a -r b3a835aa617c gmediaserver/gmediaserver.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmediaserver/gmediaserver.patch Mon Jan 12 19:09:19 2009 +0100 @@ -0,0 +1,82 @@ +Index: src/interface.c +diff -Nau src/interface.c.orig src/interface.c +--- src/interface.c.orig 2005-09-10 09:25:40.000000000 +0200 ++++ src/interface.c 2006-10-30 23:18:46.644745000 +0100 +@@ -28,8 +28,19 @@ + #include /* ? */ + #include /* ? */ + #include /* ? */ ++#if (defined(sun) && defined(__svr4__)) ++#include ++#endif + #include "gmediaserver.h" + ++#ifndef MAX ++#define MAX(a,b) ((a) > (b) ? (a) : (b)) ++#endif ++ ++#ifndef MIN ++#define MIN(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ + char * + get_ip_by_spec(char *spec) + { +Index: src/metadata.c +diff -Nau src/metadata.c.orig src/metadata.c +--- src/metadata.c.orig 2007-02-27 14:10:38.630894000 +0100 ++++ src/metadata.c 2007-02-27 14:11:50.191849000 +0100 +@@ -1071,6 +1071,7 @@ + uint32_t c; + uint32_t child_count = 0; + ++ root_entry = make_entry(ROOT_ENTRY_NAME, -1, true); + children = xmalloc(sizeof(int32_t) * pathc); + for (c = 0; c < pathc; c++) { + Entry *entry; +@@ -1088,13 +1089,12 @@ + free(tmp); + } + +- entry = scan_entry(pathv[c], name, -1, indent_size, NULL); ++ entry = scan_entry(pathv[c], name, root_entry->id, indent_size, NULL); + if (entry != NULL) + children[child_count++] = entry->id; + free(name); + } + if (child_count != 0) { +- root_entry = make_entry(ROOT_ENTRY_NAME, -1, true); + detail = get_entry_detail(root_entry, DETAIL_CHILDREN); + detail->data.children.count = child_count; + detail->data.children.list = children; +Index: lib/Makefile.in +diff -Nau lib/Makefile.in.orig lib/Makefile.in +--- lib/Makefile.in.orig 2006-08-29 22:53:57.000000000 +0200 ++++ lib/Makefile.in 2006-11-01 10:25:38.000000000 +0100 +@@ -112,7 +112,16 @@ + full-write.$(OBJEXT) getnline.$(OBJEXT) progname.$(OBJEXT) \ + striconv.$(OBJEXT) version-etc.$(OBJEXT) xalloc-die.$(OBJEXT) \ + xgethostname.$(OBJEXT) xstrndup.$(OBJEXT) xvasprintf.$(OBJEXT) \ +- xasprintf.$(OBJEXT) ++ xasprintf.$(OBJEXT) xmalloc.$(OBJEXT) quote.$(OBJEXT) error.$(OBJEXT) \ ++ quotearg.$(OBJEXT) strftime.$(OBJEXT) \ ++ strndup.$(OBJEXT) strnlen.$(OBJEXT) \ ++ getopt.$(OBJEXT) getopt1.$(OBJEXT) \ ++ basename.$(OBJEXT) dirname.$(OBJEXT) \ ++ vasprintf.$(OBJEXT) vasnprintf.$(OBJEXT) \ ++ full-read.$(OBJEXT) safe-read.$(OBJEXT) \ ++ full-write.$(OBJEXT) safe-write.$(OBJEXT) \ ++ printf-args.$(OBJEXT) printf-parse.$(OBJEXT) \ ++ exitfail.$(OBJEXT) getndelim2.$(OBJEXT) sig2str.$(OBJEXT) + libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) + LTLIBRARIES = $(noinst_LTLIBRARIES) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -553,7 +562,7 @@ + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) + -rm -f libgnu.a +- $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) ++ $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) + $(RANLIB) libgnu.a + + clean-noinstLTLIBRARIES: