1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/gmediaserver/gmediaserver.patch Mon Jan 12 19:09:19 2009 +0100 1.3 @@ -0,0 +1,82 @@ 1.4 +Index: src/interface.c 1.5 +diff -Nau src/interface.c.orig src/interface.c 1.6 +--- src/interface.c.orig 2005-09-10 09:25:40.000000000 +0200 1.7 ++++ src/interface.c 2006-10-30 23:18:46.644745000 +0100 1.8 +@@ -28,8 +28,19 @@ 1.9 + #include <net/if.h> /* ? */ 1.10 + #include <netinet/in.h> /* ? */ 1.11 + #include <arpa/inet.h> /* ? */ 1.12 ++#if (defined(sun) && defined(__svr4__)) 1.13 ++#include <sys/sockio.h> 1.14 ++#endif 1.15 + #include "gmediaserver.h" 1.16 + 1.17 ++#ifndef MAX 1.18 ++#define MAX(a,b) ((a) > (b) ? (a) : (b)) 1.19 ++#endif 1.20 ++ 1.21 ++#ifndef MIN 1.22 ++#define MIN(a,b) ((a) < (b) ? (a) : (b)) 1.23 ++#endif 1.24 ++ 1.25 + char * 1.26 + get_ip_by_spec(char *spec) 1.27 + { 1.28 +Index: src/metadata.c 1.29 +diff -Nau src/metadata.c.orig src/metadata.c 1.30 +--- src/metadata.c.orig 2007-02-27 14:10:38.630894000 +0100 1.31 ++++ src/metadata.c 2007-02-27 14:11:50.191849000 +0100 1.32 +@@ -1071,6 +1071,7 @@ 1.33 + uint32_t c; 1.34 + uint32_t child_count = 0; 1.35 + 1.36 ++ root_entry = make_entry(ROOT_ENTRY_NAME, -1, true); 1.37 + children = xmalloc(sizeof(int32_t) * pathc); 1.38 + for (c = 0; c < pathc; c++) { 1.39 + Entry *entry; 1.40 +@@ -1088,13 +1089,12 @@ 1.41 + free(tmp); 1.42 + } 1.43 + 1.44 +- entry = scan_entry(pathv[c], name, -1, indent_size, NULL); 1.45 ++ entry = scan_entry(pathv[c], name, root_entry->id, indent_size, NULL); 1.46 + if (entry != NULL) 1.47 + children[child_count++] = entry->id; 1.48 + free(name); 1.49 + } 1.50 + if (child_count != 0) { 1.51 +- root_entry = make_entry(ROOT_ENTRY_NAME, -1, true); 1.52 + detail = get_entry_detail(root_entry, DETAIL_CHILDREN); 1.53 + detail->data.children.count = child_count; 1.54 + detail->data.children.list = children; 1.55 +Index: lib/Makefile.in 1.56 +diff -Nau lib/Makefile.in.orig lib/Makefile.in 1.57 +--- lib/Makefile.in.orig 2006-08-29 22:53:57.000000000 +0200 1.58 ++++ lib/Makefile.in 2006-11-01 10:25:38.000000000 +0100 1.59 +@@ -112,7 +112,16 @@ 1.60 + full-write.$(OBJEXT) getnline.$(OBJEXT) progname.$(OBJEXT) \ 1.61 + striconv.$(OBJEXT) version-etc.$(OBJEXT) xalloc-die.$(OBJEXT) \ 1.62 + xgethostname.$(OBJEXT) xstrndup.$(OBJEXT) xvasprintf.$(OBJEXT) \ 1.63 +- xasprintf.$(OBJEXT) 1.64 ++ xasprintf.$(OBJEXT) xmalloc.$(OBJEXT) quote.$(OBJEXT) error.$(OBJEXT) \ 1.65 ++ quotearg.$(OBJEXT) strftime.$(OBJEXT) \ 1.66 ++ strndup.$(OBJEXT) strnlen.$(OBJEXT) \ 1.67 ++ getopt.$(OBJEXT) getopt1.$(OBJEXT) \ 1.68 ++ basename.$(OBJEXT) dirname.$(OBJEXT) \ 1.69 ++ vasprintf.$(OBJEXT) vasnprintf.$(OBJEXT) \ 1.70 ++ full-read.$(OBJEXT) safe-read.$(OBJEXT) \ 1.71 ++ full-write.$(OBJEXT) safe-write.$(OBJEXT) \ 1.72 ++ printf-args.$(OBJEXT) printf-parse.$(OBJEXT) \ 1.73 ++ exitfail.$(OBJEXT) getndelim2.$(OBJEXT) sig2str.$(OBJEXT) 1.74 + libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) 1.75 + LTLIBRARIES = $(noinst_LTLIBRARIES) 1.76 + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 1.77 +@@ -553,7 +562,7 @@ 1.78 + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) 1.79 + libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) 1.80 + -rm -f libgnu.a 1.81 +- $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) 1.82 ++ $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) 1.83 + $(RANLIB) libgnu.a 1.84 + 1.85 + clean-noinstLTLIBRARIES: