summaryrefslogtreecommitdiff
path: root/package/gmediaserver
diff options
context:
space:
mode:
Diffstat (limited to 'package/gmediaserver')
-rw-r--r--package/gmediaserver/Makefile5
-rw-r--r--package/gmediaserver/patches/patch-src_contentdir_c10
-rw-r--r--package/gmediaserver/patches/patch-src_upnp_c20
3 files changed, 34 insertions, 1 deletions
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 240249145..af459b3f9 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gmediaserver
PKG_VERSION:= 0.13.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3
PKG_DESCR:= An UPnP music media server
PKG_SECTION:= multimedia
@@ -15,10 +15,13 @@ PKG_URL:= http://www.gnu.org/software/gmediaserver
PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/
PKG_CXX:= GMEDIASERVER
+PKG_LIBC_DEPENDS:= uclibc eglibc glibc
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_CPPFLAGS+= -D_GNU_SOURCE
CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz"
CONFIGURE_ARGS+= --with-id3lib="${STAGING_TARGET_DIR}/usr" \
--with-libupnp="${STAGING_TARGET_DIR}/usr"
diff --git a/package/gmediaserver/patches/patch-src_contentdir_c b/package/gmediaserver/patches/patch-src_contentdir_c
new file mode 100644
index 000000000..0f6e3166a
--- /dev/null
+++ b/package/gmediaserver/patches/patch-src_contentdir_c
@@ -0,0 +1,10 @@
+--- gmediaserver-0.13.0.orig/src/contentdir.c 2007-10-20 09:59:38.000000000 +0200
++++ gmediaserver-0.13.0/src/contentdir.c 2014-01-27 13:08:37.685276614 +0100
+@@ -18,6 +18,7 @@
+ *
+ */
+
++#include <assert.h>
+ #include <config.h>
+ #include <stdint.h> /* Gnulib/C99 */
+ #include <inttypes.h> /* ? */
diff --git a/package/gmediaserver/patches/patch-src_upnp_c b/package/gmediaserver/patches/patch-src_upnp_c
new file mode 100644
index 000000000..496694de2
--- /dev/null
+++ b/package/gmediaserver/patches/patch-src_upnp_c
@@ -0,0 +1,20 @@
+--- gmediaserver-0.13.0.orig/src/upnp.c 2007-10-28 09:20:43.000000000 +0100
++++ gmediaserver-0.13.0/src/upnp.c 2014-01-27 13:07:07.541007109 +0100
+@@ -265,7 +265,7 @@ handle_get_var_request(struct Upnp_State
+ say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN));
+ say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID));
+ say(3, _("Event variable name: %s\n"), quotearg(request->StateVarName));
+- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr));
++ say(3, _("Event source: %s\n"), inet_ntoa(*(struct in_addr *)&request->CtrlPtIPAddr));
+
+ if (strcmp(request->DevUDN, device_udn) != 0) {
+ say(1, _("Discarding event - event device UDN (%s) not recognized\n"), quotearg(request->DevUDN));
+@@ -306,7 +306,7 @@ handle_action_request(struct Upnp_Action
+ say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN));
+ say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID));
+ say(3, _("Event action name: %s\n"), quotearg(request->ActionName));
+- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr));
++ say(3, _("Event source: %s\n"), inet_ntoa(*(struct in_addr *)&request->CtrlPtIPAddr));
+ say_document(4, _("Event action request:\n"), request->ActionRequest);
+
+ if (strcmp(request->DevUDN, device_udn) != 0) {