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
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 @@
1marcus 2006-11-11 02:56:18 UTC
2
3 FreeBSD ports repository
4
5 Modified files:
6 net/avahi Makefile distinfo
7 Added files:
8 net/avahi/files patch-avahi-daemon_dbus-protocol.c
9 Log:
10 Update to 0.6.15, and fix the build with D-BUS 1.0.
11
12 Revision Changes Path
13 1.43 +3 -3 ports/net/avahi/Makefile
14 1.12 +3 -3 ports/net/avahi/distinfo
15 1.3 +11 -0 ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new)
16
17--- avahi-daemon/dbus-protocol.c.orig Fri Nov 10 21:50:07 2006
18+++ avahi-daemon/dbus-protocol.c Fri Nov 10 21:50:55 2006
19@@ -1067,7 +1067,7 @@ static int dbus_connect(void) {
20 if (dbus_bus_request_name(
21 server->bus,
22 AVAHI_DBUS_NAME,
23-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
24+#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0
25 DBUS_NAME_FLAG_DO_NOT_QUEUE,
26 #else
27 DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
28
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 @@
1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" 1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
2SECTION = "network"
3PRIORITY = "optional"
4AUTHOR = "Lennart Poettering <lennart@poettering.net>" 2AUTHOR = "Lennart Poettering <lennart@poettering.net>"
5HOMEPAGE = "http://avahi.org" 3HOMEPAGE = "http://avahi.org"
6LICENSE= "GPL" 4SECTION = "network"
7PR = "r1" 5PRIORITY = "optional"
6LICENSE = "GPL"
8 7
9DEPENDS = "expat libdaemon dbus" 8DEPENDS = "expat libdaemon dbus"
10RRECOMMENDS = "libnss-mdns" 9RRECOMMENDS = "libnss-mdns"
10RRECOMMENDS_avahi-daemon = "libnss-mdns"
11 11
12SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" 12SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
13 13
14PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" 14inherit autotools pkgconfig update-rc.d
15
16EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
17
18PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
15 19
16FILES_libavahi-common = "${libdir}/libavahi-common.so.*" 20FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
17FILES_libavahi-core= "${libdir}/libavahi-core.so.*" 21FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
18FILES_avahi-daemon = "${sbindir}/avahi-daemon \ 22FILES_avahi-daemon = "${sbindir}/avahi-daemon \
19 ${sysconfdir}/avahi/avahi-daemon.conf \ 23 ${sysconfdir}/avahi/avahi-daemon.conf \
20 ${sysconfdir}/avahi/hosts \ 24 ${sysconfdir}/avahi/hosts \
21 ${sysconfdir}/avahi/services \ 25 ${sysconfdir}/avahi/services \
22 ${sysconfdir}/dbus-1 \ 26 ${sysconfdir}/dbus-1 \
23 ${sysconfdir}/init.d/avahi-daemon \ 27 ${sysconfdir}/init.d/avahi-daemon \
24 ${datadir}/avahi/introspection/*.introspect \ 28 ${datadir}/avahi/introspection/*.introspect \
25 ${datadir}/avahi/avahi-service.dtd \ 29 ${datadir}/avahi/avahi-service.dtd \
26 ${datadir}/avahi/service-types" 30 ${datadir}/avahi/service-types"
27FILES_libavahi-client = "${libdir}/libavahi-client.so.*" 31FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
28FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ 32FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
29 ${sysconfdir}/avahi/avahi-dnsconfd.action \ 33 ${sysconfdir}/avahi/avahi-dnsconfd.action \
30 ${sysconfdir}/init.d/avahi-dnsconfd" 34 ${sysconfdir}/init.d/avahi-dnsconfd"
31FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" 35FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
32FILES_avahi-utils = "${bindir}/avahi-*" 36FILES_avahi-utils = "${bindir}/avahi-*"
33 37
34CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" 38CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
35 39
36EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
37inherit autotools pkgconfig update-rc.d
38
39
40do_stage() {
41 autotools_stage_all
42}
43
44INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" 40INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
45INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" 41INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
46INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" 42INITSCRIPT_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 @@
1require avahi.inc
2
3SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0"
4
5FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
6 ${sysconfdir}/avahi/avahi-autoipd.action"
7
8do_stage() {
9 autotools_stage_all
10}