[oe-commits] org.oe.dev merge of '1adc26104e5b3839a7f67202324e1fa246a20443'

[koen commit]

merge of '1adc26104e5b3839a7f67202324e1fa246a20443'
     and '6113cd3aa82bcb47774f0a89d931aedfe73e26ac'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 95849379549ff4dd11d6dd203053b1bd43f8ab26
ViewMTN: http://monotone.openembedded.org/revision.psp?id=95849379549ff4dd11d6dd203053b1bd43f8ab26
Files:
1
packages/xserver-common/xserver-common_1.10.bb
packages/xserver-common/xserver-common_1.3.bb
packages/xserver-common/xserver-common_1.8.bb
packages/xserver-common/xserver-common_1.9.bb
packages/xserver-common/xserver-common_1.17.bb
packages/xserver-common/xserver-common_1.18.bb
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
conf/distro/angstrom-2007.1.conf
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi.inc
Diffs:

#
# mt diff -r1adc26104e5b3839a7f67202324e1fa246a20443 -r95849379549ff4dd11d6dd203053b1bd43f8ab26
#
# 
# 
# delete "packages/xserver-common/xserver-common_1.10.bb"
# 
# delete "packages/xserver-common/xserver-common_1.3.bb"
# 
# delete "packages/xserver-common/xserver-common_1.8.bb"
# 
# delete "packages/xserver-common/xserver-common_1.9.bb"
# 
# rename "packages/xserver-common/xserver-common_1.17.bb"
#     to "packages/xserver-common/xserver-common_1.18.bb"
# 
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
#  from [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
#    to [8b922bc76887bc8127d62d1af083f6868a493c90]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
#    to [d21eeca9a1bb496e84541d55957587838aaa33e9]
# 
============================================================
--- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch	fc88b8e91f46ae81818e65b7ee832fc7b3db915f
+++ packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch	8b922bc76887bc8127d62d1af083f6868a493c90
@@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles
 +	UILIBS = -lqt-mt
  else
 -	UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
-+	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
++	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
  endif
  
 -CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb	bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2
+++ packages/fbreader/fbreader_0.8.2a.bb	d21eeca9a1bb496e84541d55957587838aaa33e9
@@ -40,8 +40,6 @@ EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' 
 CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
 EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
 
-LDFLAGS_append = " -liconv"
-
 inherit pkgconfig
 
 do_configure() {


#
# mt diff -r6113cd3aa82bcb47774f0a89d931aedfe73e26ac -r95849379549ff4dd11d6dd203053b1bd43f8ab26
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [4d18aa56eca5e569ebbf0b616734cb7b5ca678fe]
#    to [854daa8fca5bd432a53da00b9cfe542bb9051a48]
# 
# patch "packages/avahi/avahi-python_0.6.21.bb"
#  from [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
#    to [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
# 
# patch "packages/avahi/avahi.inc"
#  from [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
#    to [caffb4223742bd86a6d49f717b86d9172d22e5e6]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	4d18aa56eca5e569ebbf0b616734cb7b5ca678fe
+++ conf/distro/angstrom-2007.1.conf	854daa8fca5bd432a53da00b9cfe542bb9051a48
@@ -220,8 +220,6 @@ RDEPENDS_kernel-base_htcuniversal = ""
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
-PREFERRED_VERSION_linux_at91sam9263ek               ?= "2.6.20"
-
 # Needed for crappy ipaqs with broken hostap in the kernel
 PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
 PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
@@ -249,6 +247,8 @@ PREFERRED_VERSION_osb-nrcore       = "0.
 PREFERRED_VERSION_osb-nrcit        = "0.5.2+svn${SRCDATE}"
 PREFERRED_VERSION_osb-nrcore       = "0.5.2+svn${SRCDATE}"
 
+PREFERRED_PROVIDER_avahi = "avahi"
+
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
============================================================
--- packages/avahi/avahi-python_0.6.21.bb	3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
+++ packages/avahi/avahi-python_0.6.21.bb	91ec6e3aec765ad2c28ed09baa8424126d0b5baa
@@ -11,4 +11,8 @@ S = "${WORKDIR}/avahi-${PV}"
             file://configure-check-pymod.patch;patch=1"
 S = "${WORKDIR}/avahi-${PV}"
 
+RDEPENDS_avahi-discover = "python-avahi python-pygtk"
+RDEPENDS_python-avahi = "python-dbus"
+PACKAGES =+ "python-avahi"
+
 AVAHI_PYTHON = "--enable-python"
============================================================
--- packages/avahi/avahi.inc	8b9c1e9f1c3c321d890f95dad3f772fd5e727b12
+++ packages/avahi/avahi.inc	caffb4223742bd86a6d49f717b86d9172d22e5e6
@@ -12,8 +12,6 @@ RDEPENDS_avahi-autoipd = "update-rc.d"
 RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
 RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
 RDEPENDS_avahi-autoipd = "update-rc.d"
-RDEPENDS_avahi-discover = "python-avahi python-pygtk"
-RDEPENDS_python-avahi = "python-dbus"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
 	   file://00avahi-autoipd file://99avahi-autoipd"
@@ -28,7 +26,7 @@ AVAHI_GTK = "--disable-gtk"
 AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
-PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi"
+PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"