Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

12 files changed, 31 insertions, 12 deletions

diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
index 25ca037c04..639f1de34e 100644
--- a/packages/avahi/avahi-python_0.6.21.bb
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r7"
+PR = "r8"
 
 # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
 FILES_avahi-discover = ""
diff --git a/packages/avahi/avahi-ui_0.6.21.bb b/packages/avahi/avahi-ui_0.6.21.bb
index 28d4c07807..4323b49640 100644
--- a/packages/avahi/avahi-ui_0.6.21.bb
+++ b/packages/avahi/avahi-ui_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "avahi gtk+"
 
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 9a0685578c..cbd6ac3d03 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -76,10 +76,11 @@ pkg_postinst_avahi-daemon () {
 	grep "^avahi:" /etc/group > /dev/null || addgroup avahi
 	grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
 
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
+	DBUSPID="/var/run/dbus/pid"
+	if [ -f $DBUSPID ]; then
+		if ps `cat $DBUSPID` > /dev/null; then
+			/etc/init.d/dbus-1 force-reload
+		fi
 	fi
 }
 
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 6bc5a7055d..f3e9c6bdee 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-PR = "r9"
+PR = "r10"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 6bc5a7055d..f3e9c6bdee 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-PR = "r9"
+PR = "r10"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index c6236ad6d1..04f92f16d5 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
 SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index 43c1b15843..f1f82a053a 100644
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
 DEPENDS += "intltool-native"
-PR = "r9"
+PR = "r10"
 
 PACKAGES =+ "libavahi-gobject"
diff --git a/packages/avahi/avahi_0.6.23.bb b/packages/avahi/avahi_0.6.23.bb
index 15f56ffa95..61a62a54a4 100644
--- a/packages/avahi/avahi_0.6.23.bb
+++ b/packages/avahi/avahi_0.6.23.bb
@@ -1,5 +1,7 @@
 require avahi.inc
 
+PR = "r1"
+
 DEPENDS += "intltool-native"
 
 PACKAGES =+ "libavahi-gobject"
diff --git a/packages/gimp/gegl/gegl-resilience.patch b/packages/gimp/gegl/gegl-resilience.patch
new file mode 100644
index 0000000000..0e35dd50f6
--- /dev/null
+++ b/packages/gimp/gegl/gegl-resilience.patch
@@ -0,0 +1,11 @@
+--- trunk/operations/external/ff-load.c	2008-12-20 13:37:05.000000000 -0800

++++ trunk/operations/external/ff-load.c	2008-12-20 13:37:22.000000000 -0800

+@@ -278,7 +278,7 @@

+       p->enc = p->video_st->codec;

+       p->codec = avcodec_find_decoder (p->enc->codec_id);

+ 

+-      p->enc->error_resilience = 2;

++      p->enc->error_recognition = 2;

+       p->enc->error_concealment = 3;

+       p->enc->workaround_bugs = FF_BUG_AUTODETECT;

+ 

diff --git a/packages/gimp/gegl_svn.bb b/packages/gimp/gegl_svn.bb
index 134e699425..7f49e785ac 100644
--- a/packages/gimp/gegl_svn.bb
+++ b/packages/gimp/gegl_svn.bb
@@ -5,10 +5,12 @@ DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual
 SRCREV = "2543"
 PV = "0.0.19+svnr${SRCREV}"
 PE = "1"
+PR = "r1"
 
 inherit gnome
 
-SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk"
+SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk \
+           file://gegl-resilience.patch;patch=1"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index 00568dad8c..c11be98b39 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -52,4 +52,7 @@ do_install_append() {
 do_stage() {
 	install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
 	oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
+	oe_libinstall -C bin -a -so libtdb ${STAGING_LIBDIR}
+	oe_libinstall -C bin -a -so libtalloc ${STAGING_LIBDIR}
+	oe_libinstall -C bin -so libwbclient ${STAGING_LIBDIR}
 }
diff --git a/packages/samba/samba_3.2.5.bb b/packages/samba/samba_3.2.5.bb
index efee5e70a5..d1d5b7b4ce 100644
--- a/packages/samba/samba_3.2.5.bb
+++ b/packages/samba/samba_3.2.5.bb
@@ -1,7 +1,7 @@
 require samba.inc
 inherit update-rc.d
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://config-lfs.patch;patch=1 \
             file://quota.patch;patch=1;pnum=0 \