Merge branch 'ivi'

3 files changed, 93 insertions, 0 deletions

diff --git a/meta/packages/gnet/files/buildfix.patch b/meta/packages/gnet/files/buildfix.patch
new file mode 100644
index 000000000..806762026
--- /dev/null
+++ b/meta/packages/gnet/files/buildfix.patch
@@ -0,0 +1,13 @@
+Index: gnet/examples/Makefile.am
+===================================================================
+--- gnet.orig/examples/Makefile.am
++++ gnet/examples/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ @SET_MAKE@
+ 
+-SUBDIRS = xmlrpc
++SUBDIRS =
+ 
+ if OS_WIN32
+ noinst_PROGRAMS = echoclient       echoserver 			\
diff --git a/meta/packages/gnet/files/configure_fix.patch b/meta/packages/gnet/files/configure_fix.patch
new file mode 100644
index 000000000..e6aadcc6a
--- /dev/null
+++ b/meta/packages/gnet/files/configure_fix.patch
@@ -0,0 +1,58 @@
+Index: trunk/configure.ac
+===================================================================
+--- trunk.orig/configure.ac
++++ trunk/configure.ac
+@@ -332,53 +332,6 @@ AC_DEFINE_UNQUOTED(GNET_SOCKADDR_FAMILY_
+           [$gnet_sockaddr_family_field_name],
+           [Name of sockaddr_storage family field])
+ 
+-dnl #######################################
+-dnl Check if abstract sockets are supported
+-dnl #######################################
+- 
+-AC_LANG_PUSH(C)
+-AC_CACHE_CHECK([for abstract socket namespace availability],
+-		ac_cv_gnet_have_abstract_sockets,
+-		[AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdio.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <errno.h>
+-]],
+-[[
+-  int listen_fd, len;
+-  struct sockaddr_un addr;
+-  
+-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
+-  if (listen_fd < 0) {
+-    perror ("socket() failed: ");
+-    exit (1);
+-  }
+-  memset (&addr, '\0', sizeof (addr));
+-  addr.sun_family = AF_UNIX;
+-  strcpy (addr.sun_path, "X/tmp/gnet-fake-socket-path-used-in-configure-test");
+-  len = SUN_LEN (&addr); /* calculate size before adding the \0 */
+-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
+-  
+-  if (bind (listen_fd, (struct sockaddr*) &addr, len) < 0) {
+-    perror ("Abstract socket namespace bind() failed: ");
+-    exit (1);
+-  }
+-  exit (0);
+-]])],
+-              [ac_cv_gnet_have_abstract_sockets=yes],
+-              [ac_cv_gnet_have_abstract_sockets=no]
+-)])
+-AC_LANG_POP(C)
+-
+-if test x$ac_cv_gnet_have_abstract_sockets = xyes ; then
+-   AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
+-fi
+-
+ ###############################
+ # Compiler characteristics
+ AC_C_CONST
diff --git a/meta/packages/gnet/gnet_svn.bb b/meta/packages/gnet/gnet_svn.bb
new file mode 100644
index 000000000..5ed604d69
--- /dev/null
+++ b/meta/packages/gnet/gnet_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
+LICENSE = "LGPL"
+SECTION = "libs/network"
+HOMEPAGE = "http://www.gnetlibrary.org"
+DEPENDS = "glib-2.0"
+PV = "2.0.7+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk \
+           file://buildfix.patch;patch=1 \
+	   file://configure_fix.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF =	"--disable-pthreads"
+
+FILES_${PN}-dev += "${libdir}/gnet-2.0"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}