summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-12-24 09:34:49 +0000
committerRoss Burton <ross@openedhand.com>2006-12-24 09:34:49 +0000
commit81b49595078d38239bb3f907a7e7814e5d30bb16 (patch)
treef247aa3ca5c5b506543f99650b308f3d10d39d30 /meta
parent8de8a38bfcbf27e11eed096a35d5f6bccd8d6d2a (diff)
downloadpoky-81b49595078d38239bb3f907a7e7814e5d30bb16.tar.gz
poky-81b49595078d38239bb3f907a7e7814e5d30bb16.tar.bz2
poky-81b49595078d38239bb3f907a7e7814e5d30bb16.zip
Merge avahi 0.6.15 from OE, to enable builds against DBus 1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1092 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch28
-rw-r--r--meta/packages/avahi/avahi.inc (renamed from meta/packages/avahi/avahi_0.6.13.bb)44
-rw-r--r--meta/packages/avahi/avahi_0.6.15.bb10
3 files changed, 58 insertions, 24 deletions
diff --git a/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch b/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
new file mode 100644
index 0000000000..0971a9eea8
--- /dev/null
+++ b/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
@@ -0,0 +1,28 @@
+marcus 2006-11-11 02:56:18 UTC
+
+ FreeBSD ports repository
+
+ Modified files:
+ net/avahi Makefile distinfo
+ Added files:
+ net/avahi/files patch-avahi-daemon_dbus-protocol.c
+ Log:
+ Update to 0.6.15, and fix the build with D-BUS 1.0.
+
+ Revision Changes Path
+ 1.43 +3 -3 ports/net/avahi/Makefile
+ 1.12 +3 -3 ports/net/avahi/distinfo
+ 1.3 +11 -0 ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new)
+
+--- avahi-daemon/dbus-protocol.c.orig Fri Nov 10 21:50:07 2006
++++ avahi-daemon/dbus-protocol.c Fri Nov 10 21:50:55 2006
+@@ -1067,7 +1067,7 @@ static int dbus_connect(void) {
+ if (dbus_bus_request_name(
+ server->bus,
+ AVAHI_DBUS_NAME,
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0
+ DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ #else
+ DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+
diff --git a/meta/packages/avahi/avahi_0.6.13.bb b/meta/packages/avahi/avahi.inc
index a758997b4c..19ef64f0e1 100644
--- a/meta/packages/avahi/avahi_0.6.13.bb
+++ b/meta/packages/avahi/avahi.inc
@@ -1,46 +1,42 @@
DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
AUTHOR = "Lennart Poettering <lennart@poettering.net>"
HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-PR = "r1"
+SECTION = "network"
+PRIORITY = "optional"
+LICENSE = "GPL"
DEPENDS = "expat libdaemon dbus"
RRECOMMENDS = "libnss-mdns"
+RRECOMMENDS_avahi-daemon = "libnss-mdns"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
+inherit autotools pkgconfig update-rc.d
+
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
FILES_avahi-daemon = "${sbindir}/avahi-daemon \
- ${sysconfdir}/avahi/avahi-daemon.conf \
- ${sysconfdir}/avahi/hosts \
- ${sysconfdir}/avahi/services \
- ${sysconfdir}/dbus-1 \
- ${sysconfdir}/init.d/avahi-daemon \
- ${datadir}/avahi/introspection/*.introspect \
- ${datadir}/avahi/avahi-service.dtd \
- ${datadir}/avahi/service-types"
+ ${sysconfdir}/avahi/avahi-daemon.conf \
+ ${sysconfdir}/avahi/hosts \
+ ${sysconfdir}/avahi/services \
+ ${sysconfdir}/dbus-1 \
+ ${sysconfdir}/init.d/avahi-daemon \
+ ${datadir}/avahi/introspection/*.introspect \
+ ${datadir}/avahi/avahi-service.dtd \
+ ${datadir}/avahi/service-types"
FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
- ${sysconfdir}/avahi/avahi-dnsconfd.action \
- ${sysconfdir}/init.d/avahi-dnsconfd"
+ ${sysconfdir}/avahi/avahi-dnsconfd.action \
+ ${sysconfdir}/init.d/avahi-dnsconfd"
FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
FILES_avahi-utils = "${bindir}/avahi-*"
CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
-
-
-do_stage() {
- autotools_stage_all
-}
-
INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
diff --git a/meta/packages/avahi/avahi_0.6.15.bb b/meta/packages/avahi/avahi_0.6.15.bb
new file mode 100644
index 0000000000..07a429e133
--- /dev/null
+++ b/meta/packages/avahi/avahi_0.6.15.bb
@@ -0,0 +1,10 @@
+require avahi.inc
+
+SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0"
+
+FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
+ ${sysconfdir}/avahi/avahi-autoipd.action"
+
+do_stage() {
+ autotools_stage_all
+}