[oe-commits] org.oe.dev merge of '045e00ff4301aa05fddab174a3ac5bf9c260343b'

[koen commit]

merge of '045e00ff4301aa05fddab174a3ac5bf9c260343b'
     and '90204f8950d2ea5d6cc182ba36902a2e41bdfc7e'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0
ViewMTN: http://monotone.openembedded.org/revision/info/6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0
Files:
1
packages/pidgin/pidgin_2.4.3.bb
packages/pidgin/pidgin_2.5.0.bb
packages/pidgin/pidgin/purple-OE-branding-25.patch
site/common-glibc
packages/cairo/cairo_1.6.4.bb
packages/gstreamer/gst-ffmpeg_0.10.4.bb
packages/xorg-lib/pixman_0.11.8.bb
packages/xorg-xserver/xserver-kdrive_1.4.2.bb
packages/xorg-xserver/xserver-xorg_1.4.2.bb
Diffs:

#
# mt diff -r045e00ff4301aa05fddab174a3ac5bf9c260343b -r6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0
#
#
#
# rename "packages/pidgin/pidgin_2.4.3.bb"
#     to "packages/pidgin/pidgin_2.5.0.bb"
# 
# add_file "packages/pidgin/pidgin/purple-OE-branding-25.patch"
#  content [bee5c1fbce91eba6ff2add8e1b80500fb2e22538]
# 
# patch "packages/pidgin/pidgin_2.5.0.bb"
#  from [b23d77d5165ec006f9ac378b17cba948b42599b2]
#    to [ffbb207ab4c35740a8327a5b8678c09b6125a4ac]
# 
# patch "site/common-glibc"
#  from [72834411958b3142d8d1258723ece2ee96b5556c]
#    to [fada5eeddd50c0e3ddb01c39dcdadb17a5609dcc]
#
============================================================
--- packages/pidgin/pidgin/purple-OE-branding-25.patch	bee5c1fbce91eba6ff2add8e1b80500fb2e22538
+++ packages/pidgin/pidgin/purple-OE-branding-25.patch	bee5c1fbce91eba6ff2add8e1b80500fb2e22538
@@ -0,0 +1,16 @@
+Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h
+===================================================================
+--- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h	2008-08-19 01:53:38.000000000 +0000
++++ pidgin-2.5.0/libpurple/protocols/irc/irc.h	2008-08-27 11:15:58.000000000 +0000
+@@ -36,9 +36,9 @@
+ 
+ #define IRC_DEFAULT_CHARSET "UTF-8"
+ #define IRC_DEFAULT_AUTODETECT FALSE
+-#define IRC_DEFAULT_ALIAS "purple"
++#define IRC_DEFAULT_ALIAS "OE-user"
+ 
+-#define IRC_DEFAULT_QUIT "Leaving."
++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
+ 
+ #define IRC_INITIAL_BUFSIZE 1024
+ 
============================================================
--- packages/pidgin/pidgin_2.4.3.bb	b23d77d5165ec006f9ac378b17cba948b42599b2
+++ packages/pidgin/pidgin_2.5.0.bb	ffbb207ab4c35740a8327a5b8678c09b6125a4ac
@@ -1,12 +1,10 @@ require pidgin.inc
 require pidgin.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
            file://sanitize-configure.ac.patch;patch=1 \
            file://gconf-no-errors.patch;patch=1 \
 	   file://pidgin.desktop-set-icon.patch;patch=1 \
-	   file://purple-OE-branding.patch;patch=1 \
+	   file://purple-OE-branding-25.patch;patch=1 \
 	   file://pidgin-cross-python.patch;patch=1 \
 	  " 
 
============================================================
--- site/common-glibc	72834411958b3142d8d1258723ece2ee96b5556c
+++ site/common-glibc	fada5eeddd50c0e3ddb01c39dcdadb17a5609dcc
@@ -46,5 +46,7 @@ ac_cv_epoll_works=${ac_cv_epoll_works=ye
 ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
 ac_cv_epoll_works=${ac_cv_epoll_works=yes}
 
+#git
+ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes}
 # pth
 ac_cv_check_sjlj=ssjlj


#
# mt diff -r90204f8950d2ea5d6cc182ba36902a2e41bdfc7e -r6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0
#
#
#
# patch "packages/cairo/cairo_1.6.4.bb"
#  from [5c8b74929cd8a22ad056fd120705fd256540f729]
#    to [cec2e4d8ea74876596992f62b4b60dc92110eb99]
# 
# patch "packages/gstreamer/gst-ffmpeg_0.10.4.bb"
#  from [9ad7b01ede614d0fc142a01b7546007b40441f34]
#    to [cfb4a0a4c02a3be5199bb35c440b276210c37a21]
# 
# patch "packages/xorg-lib/pixman_0.11.8.bb"
#  from [b3452a5bc331bb65d38d02983e574ad69bc5cbb7]
#    to [e6b5f49fa7a8d534a31ac6086683d05d6da68127]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.2.bb"
#  from [b2ad79cb8f03fec0ebecebdde76443a33a601362]
#    to [caaa6c6290239b9a702134c8c8c3b5b7f3208c61]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
#  from [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#    to [4390a6545e73aa1015da701f862ee96c21cca2b6]
#
============================================================
--- packages/cairo/cairo_1.6.4.bb	5c8b74929cd8a22ad056fd120705fd256540f729
+++ packages/cairo/cairo_1.6.4.bb	cec2e4d8ea74876596992f62b4b60dc92110eb99
@@ -5,5 +5,5 @@ SRC_URI = "http://cairographics.org/rele
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 "
 
-PR = "r1"
+PR = "r2"
 
============================================================
--- packages/gstreamer/gst-ffmpeg_0.10.4.bb	9ad7b01ede614d0fc142a01b7546007b40441f34
+++ packages/gstreamer/gst-ffmpeg_0.10.4.bb	cfb4a0a4c02a3be5199bb35c440b276210c37a21
@@ -6,11 +6,6 @@ PR = "r4"
 DEPENDS = "ffmpeg gstreamer zlib"
 PR = "r4"
 
-# This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_armv6 = "1"
-DEFAULT_PREFERENCE_armv7a = "1"
-
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
============================================================
--- packages/xorg-lib/pixman_0.11.8.bb	b3452a5bc331bb65d38d02983e574ad69bc5cbb7
+++ packages/xorg-lib/pixman_0.11.8.bb	e6b5f49fa7a8d534a31ac6086683d05d6da68127
@@ -3,8 +3,6 @@ LICENSE = "X11"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \
            file://pixman-arm.patch;patch=1 \
 	  "
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.2.bb	b2ad79cb8f03fec0ebecebdde76443a33a601362
+++ packages/xorg-xserver/xserver-kdrive_1.4.2.bb	caaa6c6290239b9a702134c8c8c3b5b7f3208c61
@@ -3,6 +3,7 @@ PE = "1"
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
+PR = "r1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.2.bb	aa88c8fb589cdbefddf67d5801f17ec2980d02e9
+++ packages/xorg-xserver/xserver-xorg_1.4.2.bb	4390a6545e73aa1015da701f862ee96c21cca2b6
@@ -3,7 +3,7 @@ PE = "1"
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \