[WIP][PATCH 00/66] Deterministic dependencies II

[WIP][PATCH 00/66] Deterministic dependencies II

[Martin Jansa]

WIP because verification build is still running and I must admit that I'm mostly
testing that all dependencies are correctly "disabled" and in the end deterministic.

I'm not testing if every possible combination of PACKAGECONFIG options provide sufficient
dependency tree.

The following changes since commit 72e23c12296fbc77193898c38426add58d0c2d71:

  mysql5: replace with mariadb 5.1.67 and tweak (2013-08-27 16:39:31 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib jansa/deps
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/deps

Martin Jansa (66):
  gvfs: Add PACKAGECONFIG for fuse and disable it by default
  libmikmod: upgrade to 3.2.0
  gnome-desktop: Add startup-notification dependency
  gnome-control-center: Add libxscrnsaver dependency
  gnome-settings-daemon: add PACKAGECONFIG for pulseaudio
  libgsf: Add PACKAGECONFIG for gdk-pixbuf
  imagemagick: Add PACKAGECONFIG for jp2
  libxklavier: Add libxi dependency
  claws-mail: Add PACKAGECONFIG for enchant, dbus, ldap and
    startup-notification
  abiword: Add PACKAGECONFIG for collab-backends and spell
  mkvtoolnix: Add PACKAGECONFIG for flac
  uhd: Add PACKAGECONFIG for orc
  entrance: Add PACKAGECONFIG for consolekit
  expedite: Add PACKAGECONFIG for sdl
  metacity: Add dependency on libgtop
  libgtop: Add dependency on libxau
  wv: Add PACKAGECONFIG for png
  libetpan: Add dependency on curl
  gnuradio: Add PACKAGECONFIG for jack and portaudio
  fluidsynth: Add PACKAGECONFIG for sndfile, jack, pulseaudio, portaudio
    and readline
  vlc: Add PACKAGECONFIG for undeterministic dependencies
  tracker: Add PACKAGECONFIG for undeterministic dependencies
  mpd: Add PACKAGECONFIG for undeterministic dependencies
  cherokee: Add PACKAGECONFIG for ffmpeg and ldap
  collectd: Add PACKAGECONFIG for undeterministic dependencies
  xchat: Add PACKAGECONFIG for dbus and openssl
  xterm: Add fontconfig dependency
  libwnck(3): Add dependency on libxres
  e-wm: Add PACKAGECONFIG for pam
  sox: Add PACKAGECONFIG for mad, id3tag and lame
  gvfs: Add PACKAGECONFIG for archive, obexftp, cdda
  upower: Add PACKAGECONFIG for idevice
  udisks: Add PACKAGECONFIG for parted
  imlib2: Add PACKAGECONFIG for gif, tiff, id3 and bzip2
  openmotif: Add PACKAGECONFIG for jpeg and png
  opencv: Add PACKAGECONFIG for jasper
  gammu: Add dependency on glib-2.0
  openbox: Add PACKAGECONFIG for imlib2, xrandr, xinerama, xcursor,
    startup-notification
  v4l-utils: Add libx11 dependency
  epiphany: Add PACKAGECONFIG for zeroconf
  libungif: Add dependency on libx11
  libmemcached: Add PACKAGECONFIG for sasl
  networkmanager: Add PACKAGECONFIG for concheck
  proftpd: Add PACKAGECONFIG for curses
  gnuplot: Add PACKAGECONFIG for cairo
  gnome-mplayer: Add PACKAGECONFIG for gtk3
  gimp: Add PACKAGECONFIG for bzip2, libxpm, libjasper and gudev
  gegl: Add PACKAGECONFIG for jasper, avformat
  edb: Add PACKAGECONFIG for ncurses
  gnome-vfs: Add PACKAGECONFIG for fam
  lightmediascanner: Add PACKAGECONFIG for ogg
  mplayer2: Add PACKAGECONFIG for mpg123 and xss
  maliit-framework: Add dependency on gtk+3
  packagekit: Add PACKAGECONFIG for service-packs
  orage: Add PACKAGECONFIG for notify and dependency on popt
  thunar: Add PACKAGECONFIG for pcre
  thunar-volman: Add PACKAGECONFIG for notify
  tumbler: Add PACKAGECONFIG for gstreamer
  xfce4-clipman-plugin: Add PACKAGECONFIG for unique
  xfce4-places-plugin: Add PACKAGECONFIG for notify
  xfce4-settings: Add PACKAGECONFIG for notify
  xfdesktop: Add PACKAGECONFIG for notify
  webkit-efl: Add dependency on gst-plugins-base
  qt-creator: Add patch to resolve missing cpuid.h in ARM builds
  xbmc: Add libmad dependency
  qcanobserver: Move to nonworking

 meta-efl/recipes-efl/e17/e-wm.inc                  |   3 +
 meta-efl/recipes-efl/efl/edb_svn.bb                |   3 +
 meta-efl/recipes-efl/efl/entrance_svn.bb           |   3 +
 meta-efl/recipes-efl/efl/expedite.inc              |   3 +
 meta-efl/recipes-efl/efl/imlib2_svn.bb             |   6 +
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   2 +-
 .../lightmediascanner/lightmediascanner_0.4.4.bb   |   3 +
 .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |   3 +
 meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb  |  15 +-
 .../recipes-gnome/epiphany/epiphany_2.30.6.bb      |   3 +
 .../gnome-control-center_2.32.1.bb                 |   2 +-
 .../gnome-desktop/gnome-desktop3_3.0.2.bb          |   2 +-
 .../gnome-desktop/gnome-desktop_2.32.1.bb          |   2 +-
 .../gnome-settings-daemon_2.32.1.bb                |   3 +
 .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |   1 +
 meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb       |   7 +-
 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb  |   3 +
 meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb |   2 +-
 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   2 +-
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   2 +-
 .../recipes-gnome/libxklavier/libxklavier_5.0.bb   |   2 +-
 .../recipes-gnome/metacity/metacity_2.34.13.bb     |   2 +-
 meta-gnome/recipes-gnome/wv/wv_1.2.0.bb            |   3 +
 .../recipes-mediacentre/xbmc/xbmc_git.bb           |   2 +-
 .../recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb     |   3 +
 .../fluidsynth/fluidsynth_1.1.1.bb                 |   7 +
 .../recipes-multimedia/musicpd/mpd_0.17.1.bb       |   8 +
 .../recipes-multimedia/sox/sox_14.4.0.bb           |   3 +
 meta-multimedia/recipes-multimedia/vlc/vlc.inc     |  20 +-
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   3 +
 .../recipes-support/libmemcached/libmemcached.inc  |   3 +
 meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb |   2 +-
 ...n-t-add-usr-include-and-usr-lib-to-config.patch |  58 ----
 .../gnuradio/allow-to-disable-jack-portaudio.patch |  34 ++
 .../recipes-connectivity/gnuradio/gnuradio_git.bb  |   4 +
 .../networkmanager/networkmanager_0.9.8.0.bb       |   1 +
 meta-oe/recipes-connectivity/uhd/uhd.inc           |   3 +
 .../packagekit/packagekit_0.5.6.bb                 |   3 +
 .../recipes-extended/collectd/collectd_5.2.2.bb    |   7 +
 meta-oe/recipes-extended/gnuplot/gnuplot.inc       |   5 +-
 .../recipes-extended/libungif/libungif_4.1.3.bb    |   2 +
 meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb        |   4 +
 meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb        |   6 +
 meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb  |   7 +
 meta-oe/recipes-graphics/xorg-app/xterm_293.bb     |   2 +-
 .../mikmod/libmikmod/CVE-2010-2971.patch           |  24 --
 .../mikmod/libmikmod/ldflags.patch                 |   4 +-
 .../{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb}    |   7 +-
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |   2 +
 .../recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb |   2 +-
 .../qcanobserver/qcanobserver-socketcan_svn.bb     |   0
 ...erinterface.cpp-add-sys-socket.h-as-inclu.patch |   0
 .../0002-qconsole-writethread-gcc-4.5-fixes.patch  |   0
 .../qcanobserver/qcanobserver/candemo.xml          |   0
 .../qcanobserver/qcanobserver_svn.bb               |   0
 .../qt-creator/fix.missing.cpuid.h.patch           | 384 +++++++++++++++++++++
 meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb  |   4 +-
 .../recipes-sato/claws-mail/claws-mail_3.9.0.bb    |   6 +
 .../imagemagick/imagemagick_6.8.6.bb               |   3 +
 meta-oe/recipes-support/libetpan/libetpan_0.57.bb  |   2 +-
 .../recipes-support/maliit/maliit-framework_git.bb |   1 +
 meta-oe/recipes-support/opencv/opencv_2.4.3.bb     |   3 +
 .../recipes-support/openmotif/openmotif_2.3.3.bb   |   4 +
 meta-oe/recipes-support/tracker/tracker_0.14.2.bb  |  12 +-
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   3 +
 meta-oe/recipes-support/upower/upower_0.9.14.bb    |   3 +
 meta-oe/recipes-support/xchat/xchat_2.8.8.bb       |   4 +
 .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |   4 +
 meta-xfce/recipes-apps/orage/orage_4.8.4.bb        |   5 +-
 .../clipman/xfce4-clipman-plugin_1.2.3.bb          |   3 +
 .../places/xfce4-places-plugin_1.5.0.bb            |   3 +
 .../thunar-volman/thunar-volman_0.8.0.bb           |   3 +
 meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb      |   3 +
 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb   |   3 +
 .../xfce4-settings/xfce4-settings_4.11.0.bb        |   3 +
 .../recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb     |   3 +
 76 files changed, 648 insertions(+), 114 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
 create mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
 rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb} (73%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver-socketcan_svn.bb (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/candemo.xml (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver_svn.bb (100%)
 create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch

-- 
1.8.3.2

[WIP][PATCH 01/66] gvfs: Add PACKAGECONFIG for fuse and disable it by default

[Martin Jansa]

* fuse was moved to meta-filesystems, so disable fuse by default

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
index cab0d34..d9a054b 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
@@ -1,6 +1,6 @@
 require gvfs.inc
 
-DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2"
+DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf libgphoto2"
 # optional: obexftp libcdio libimobiledevice 
 
 PR = "${INC_PR}.0"
@@ -26,3 +26,5 @@ PACKAGECONFIG ?= "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba',
 
 PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \
                         --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba"
+# needs meta-filesystems
+PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse"
-- 
1.8.3.2

[WIP][PATCH 02/66] libmikmod: upgrade to 3.2.0

[Martin Jansa]

* 3.3 is only beta
* 3.1.12 was failing to build with texinfo-5, see
  http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../mikmod/libmikmod/CVE-2010-2971.patch           | 24 ----------------------
 .../mikmod/libmikmod/ldflags.patch                 |  4 ++--
 .../{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb}    |  7 +++----
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
 rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb} (73%)

diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
deleted file mode 100644
index 94ea8f5..0000000
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
+++ /dev/null
@@ -1,24 +0,0 @@
----
- loaders/load_it.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- libmikmod-3.1.12.orig/loaders/load_it.c
-+++ libmikmod-3.1.12/loaders/load_it.c
-@@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious)
- #define IT_LoadEnvelope(name,type) 										\
-				ih. name##flg   =_mm_read_UBYTE(modreader);				\
-				ih. name##pts   =_mm_read_UBYTE(modreader);				\
-+				if (ih. name##pts > ITENVCNT)							\
-+					ih. name##pts = ITENVCNT;							\
-				ih. name##beg   =_mm_read_UBYTE(modreader);				\
-				ih. name##end   =_mm_read_UBYTE(modreader);				\
-				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
-@@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious)
- #define IT_LoadEnvelope(name,type) 										\
-				ih. name/**/flg   =_mm_read_UBYTE(modreader);			\
-				ih. name/**/pts   =_mm_read_UBYTE(modreader);			\
-+				if (ih. name/**/pts > ITENVCNT)							\
-+					ih. name/**/pts = ITENVCNT;							\
-				ih. name/**/beg   =_mm_read_UBYTE(modreader);			\
-				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
-				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
index 4261379..de31139 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
@@ -5,8 +5,8 @@ diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod
  	rm -f Makefile
  
  $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
+-	$(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
  
  dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
  			$(top_srcdir)/dlapi/dlfcn.h
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
similarity index 73%
rename from meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
rename to meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
index e6bdcbe..b1ebf97 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
@@ -6,16 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b"
 DEPENDS = "alsa-lib texinfo"
 
 SRC_URI = "\
-    ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
+    http://mikmod.shlomifish.org/files/${P}.tar.gz \
     file://m4.patch \
     file://autofoo.patch \
     file://ldflags.patch \
-    file://CVE-2010-2971.patch \
     file://obsolete_automake_macros.patch \
 "
 
-SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16"
-SRC_URI[sha256sum] = "891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32"
+SRC_URI[md5sum] = "96e9820d72a41fe27ff304071739696c"
+SRC_URI[sha256sum] = "734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e"
 
 inherit autotools binconfig lib_package
 
-- 
1.8.3.2

[WIP][PATCH 03/66] gnome-desktop: Add startup-notification dependency

[Martin Jansa]

* configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.0.2.bb | 2 +-
 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.0.2.bb
index 4aacd5f..96f3d14 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.0.2.bb
@@ -12,7 +12,7 @@ inherit gnome pkgconfig
 SRC_URI[archive.md5sum] = "e2fd9d545d4d7ff66525f10364ab671e"
 SRC_URI[archive.sha256sum] = "0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3"
 
-DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common"
+DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification"
 
 EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
 
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
index 333f8cb..4c01d46 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
@@ -11,7 +11,7 @@ inherit gnome pkgconfig
 SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67"
 SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d"
 
-DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
+DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
 
 EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
 
-- 
1.8.3.2

[WIP][PATCH 04/66] gnome-control-center: Add libxscrnsaver dependency

[Martin Jansa]

* configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
index 85b3386..e85314b 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME control center"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra libgtop"
+DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra libgtop libxscrnsaver"
 
 PR = "r1"
 
-- 
1.8.3.2

[WIP][PATCH 05/66] gnome-settings-daemon: add PACKAGECONFIG for pulseaudio

[Martin Jansa]

* libcanberra is autodetected and dependency on it wasn't deterministic

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
index 47baea6..a178185 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
@@ -13,6 +13,9 @@ SRCREV = "0160f6725cfb872e017f3958f108792c3b882872"
 
 S = "${WORKDIR}/git"
 
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra"
+
 EXTRA_OECONF = "--disable-esd \
                 --x-includes=${STAGING_INCDIR} \
                 --x-libraries=${STAGING_LIBDIR} \
-- 
1.8.3.2

[WIP][PATCH 06/66] libgsf: Add PACKAGECONFIG for gdk-pixbuf

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb
index 5dcd730..b9a9877 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb
@@ -14,6 +14,9 @@ SRC_URI[archive.sha256sum] = "8919e725aadd785380350c8dec7427d82cf33164bc9a9a549d
 
 GNOME_COMPRESS_TYPE = "xz"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf"
+
 EXTRA_OECONF = "\
     --without-python \
     --without-gnome-vfs \
-- 
1.8.3.2

[WIP][PATCH 07/66] imagemagick: Add PACKAGECONFIG for jp2

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
index 4ebcde5..9963990 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
@@ -20,6 +20,9 @@ inherit autotools binconfig pkgconfig
 # if someone needs xml support then fix it first
 EXTRA_OECONF = "--program-prefix= --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper"
+
 FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
                 ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
                 ${libdir}/ImageMagick-${PV}/modules-Q16/filters \
-- 
1.8.3.2

[WIP][PATCH 08/66] libxklavier: Add libxi dependency

[Martin Jansa]

* libxi is autodetected and configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb
index a769a55..c81d21b 100644
--- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb
+++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Helper lib for keyboard management"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
 
-DEPENDS = "xkbcomp gtk+ iso-codes "
+DEPENDS = "xkbcomp gtk+ iso-codes libxi"
 
 inherit gnome
 
-- 
1.8.3.2

[WIP][PATCH 09/66] claws-mail: Add PACKAGECONFIG for enchant, dbus, ldap and startup-notification

[Martin Jansa]

* enable dbus and startup-notification by default

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb b/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb
index 122e130..15824bb 100644
--- a/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb
+++ b/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb
@@ -17,6 +17,12 @@ do_configure_append() {
     cd po ; for PO in *.po ; do MO=`echo $PO | sed s/\\.po//`.gmo ; if ! test -f $MO ; then msgfmt $PO -o $MO ; fi ; done
 }
 
+PACKAGECONFIG ??= "startup-notification dbus"
+PACKAGECONFIG[enchant] = "--enable-enchant,--disable-enchant,enchant"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
+PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap"
+
 # FIXME: maemo builds may want --enable-maemo
 # FIXME: some platforms may want --enable-generic-umpc
 EXTRA_OECONF = " \
-- 
1.8.3.2

[WIP][PATCH 10/66] abiword: Add PACKAGECONFIG for collab-backends and spell

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index 1aa88cb..11565e3 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2 \
-               librsvg loudmouth libwmf-native gtkmathview asio"
+DEPENDS     = "perl-native wv libglade libfribidi jpeg libpng \
+               librsvg libwmf-native gtkmathview asio"
 RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
 RCONFLICTS_${PN} = "${PN}-embedded"
@@ -31,12 +31,17 @@ inherit autotools pkgconfig
 
 PARALLEL_MAKE = ""
 
+PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service"
+PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
+PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth gtk+"
+PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"
+PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls"
+PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control"
+PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib"
+
 EXTRA_OECONF = " --disable-static  \
                  --enable-plugins \
                  --without-gnomevfs \
-                 --enable-collab-backend-xmpp \
-                 --enable-collab-backend-tcp \
-                 --enable-collab-backend-service \
                  --with-libwmf-config=${STAGING_DIR} \
 "
 
-- 
1.8.3.2

[WIP][PATCH 11/66] mkvtoolnix: Add PACKAGECONFIG for flac

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
index 0106594..3b8eb32 100644
--- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
+++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
@@ -18,6 +18,9 @@ inherit autotools gettext
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac"
+
 EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
 "
 
-- 
1.8.3.2

[WIP][PATCH 12/66] uhd: Add PACKAGECONFIG for orc

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/uhd/uhd.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc
index 476b763..da1fbd8 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd.inc
@@ -27,6 +27,9 @@ FILES_${PN}-examples = "${datadir}/uhd/examples/*"
 OECMAKE_BUILDPATH = "${S}/build"
 OECMAKE_SOURCEPATH = "${S}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[orc] = "-DENABLE_ORC=ON,-DENABLE_ORC=OFF,orc"
+
 EXTRA_OECMAKE = "-DENABLE_E100=TRUE"
 
 EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
-- 
1.8.3.2

[WIP][PATCH 13/66] entrance: Add PACKAGECONFIG for consolekit

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/entrance_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index 9a85f7b..36f78e1 100644
--- a/meta-efl/recipes-efl/efl/entrance_svn.bb
+++ b/meta-efl/recipes-efl/efl/entrance_svn.bb
@@ -11,6 +11,9 @@ SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[consolekit] = "--enable-consolekit,--disable-consolekit,consolekit"
+
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
 
 PR = "r4"
-- 
1.8.3.2

[WIP][PATCH 14/66] expedite: Add PACKAGECONFIG for sdl

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/expedite.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/expedite.inc b/meta-efl/recipes-efl/efl/expedite.inc
index 89500bf..6a83be1 100644
--- a/meta-efl/recipes-efl/efl/expedite.inc
+++ b/meta-efl/recipes-efl/efl/expedite.inc
@@ -7,6 +7,9 @@ INC_PR = "r0"
 
 inherit e
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sdl] = "--enable-opengl-sdl,--disable-opengl-sdl,libsdl"
+
 EXTRA_OECONF = "\
     --x-includes=${STAGING_INCDIR}/X11 \
     --x-libraries=${STAGING_LIBDIR} \
-- 
1.8.3.2

[WIP][PATCH 15/66] metacity: Add dependency on libgtop

[Martin Jansa]

* gtop is autodetected from sysroot and configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
index e14394a..dbd31b8 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
 
-DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
+DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils libgtop"
 PR = "r1"
 
 inherit gnome update-alternatives
-- 
1.8.3.2

[WIP][PATCH 16/66] libgtop: Add dependency on libxau

[Martin Jansa]

* libxau is included in libgtop_common-2.0.la

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
index b6a8869..8f0c89f 100644
--- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
+++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
@@ -6,4 +6,4 @@ inherit gnome lib_package
 SRC_URI[archive.md5sum] = "ed44d736efd97d062b77621de6aff439"
 SRC_URI[archive.sha256sum] = "49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d"
 
-DEPENDS = "glib-2.0 intltool-native"
+DEPENDS = "glib-2.0 intltool-native libxau"
-- 
1.8.3.2

[WIP][PATCH 17/66] wv: Add PACKAGECONFIG for png

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/wv/wv_1.2.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
index 3ac40aa..453513e 100644
--- a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
+++ b/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
@@ -15,4 +15,7 @@ inherit autotools pkgconfig
 
 S = "${WORKDIR}/${PN}-${PV}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[png] = "--with-png,--without-png,libpng"
+
 EXTRA_OECONF = ""
-- 
1.8.3.2

[WIP][PATCH 18/66] libetpan: Add dependency on curl

[Martin Jansa]

* configure doesn't allow to disable it explicitly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/libetpan/libetpan_0.57.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/libetpan/libetpan_0.57.bb b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb
index e9a755e..0dbd782 100644
--- a/meta-oe/recipes-support/libetpan/libetpan_0.57.bb
+++ b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libetpan is a library for communicating with mail and news server
 It supports the protocols SMTP, POP3, IMAP and NNTP."
 HOMEPAGE = "http://www.etpan.org"
 SECTION = "libs"
-DEPENDS = "gnutls liblockfile"
+DEPENDS = "gnutls liblockfile curl"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f18ebe7e452708c26f83954f81062ba7"
 
-- 
1.8.3.2

[WIP][PATCH 19/66] gnuradio: Add PACKAGECONFIG for jack and portaudio

[Martin Jansa]

* remove unused
  0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...n-t-add-usr-include-and-usr-lib-to-config.patch | 58 ----------------------
 .../gnuradio/allow-to-disable-jack-portaudio.patch | 34 +++++++++++++
 .../recipes-connectivity/gnuradio/gnuradio_git.bb  |  4 ++
 3 files changed, 38 insertions(+), 58 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
 create mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch

diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
deleted file mode 100644
index 7caaf51..0000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a130153ae84d8bb5914879cef94df09f06825c10 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 11:25:36 +0200
-Subject: [PATCH] buildsys: don't add /usr/include and /usr/lib to configure tests for libusb
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- config/usrp_libusb.m4 |   13 -------------
- 1 files changed, 0 insertions(+), 13 deletions(-)
-
-diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
-index cc3410f..b421820 100644
---- a/config/usrp_libusb.m4
-+++ b/config/usrp_libusb.m4
-@@ -117,10 +117,6 @@ AC_DEFUN([USRP_LIBUSB], [
-       dnl configured to find this header.
-       AC_LANG_PUSH(C)
-       save_CPPFLAGS="$CPPFLAGS"
--      if test x$USB_INCLUDEDIR != x; then
--        USB_INCLUDES="-I$USB_INCLUDEDIR"
--        CPPFLAGS="$USB_INCLUDES"
--      fi
-       AC_MSG_CHECKING([$libusb_name for header $usb_header])
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-         #include "$usb_header"
-@@ -172,9 +168,6 @@ AC_DEFUN([USRP_LIBUSB], [
-             *)
-               AC_LANG_PUSH(C)
-               save_CPPFLAGS="$CPPFLAGS"
--              if test x$USB_INCLUDEDIR != x; then
--                CPPFLAGS="$USB_INCLUDES"
--              fi
-               save_LIBS="$LIBS"
-               LIBS="$USB_LIBS"
-               AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name])
-@@ -217,9 +210,6 @@ AC_DEFUN([USRP_LIBUSB], [
-     dnl final error checking, mostly to create #define's
-     AC_LANG_PUSH(C)
-     save_CPPFLAGS="$CPPFLAGS"
--    if test x$USB_INCLUDEDIR != x; then
--      CPPFLAGS="$USB_INCLUDES"
--    fi
-     dnl Check for the header.
-     AC_CHECK_HEADERS([$usb_header], [], [libusbok=no])
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -231,9 +221,6 @@ AC_DEFUN([USRP_LIBUSB], [
-       dnl check for the library (again)
-       AC_LANG_PUSH(C)
-       save_CPPFLAGS="$CPPFLAGS"
--      if test x$USB_INCLUDEDIR != x; then
--        CPPFLAGS="$USB_INCLUDES"
--      fi
-       save_LIBS="$LIBS"
-       LIBS="$USB_LIBS"
-       AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [
--- 
-1.6.6.1
-
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
new file mode 100644
index 0000000..58c4485
--- /dev/null
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
@@ -0,0 +1,34 @@
+--- ./gr-audio/lib/CMakeLists.txt.orig	2013-08-25 21:30:42.279818436 +0200
++++ ./gr-audio/lib/CMakeLists.txt	2013-08-25 21:30:27.263817898 +0200
+@@ -75,6 +75,7 @@
+ ########################################################################
+ ## Jack Support
+ ########################################################################
++if(ENABLE_JACK)
+ find_package(Jack)
+ 
+ if(JACK_FOUND)
+@@ -90,6 +91,7 @@
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/jack/gr-audio-jack.conf)
+ 
+ endif(JACK_FOUND)
++endif(ENABLE_JACK)
+ 
+ ########################################################################
+ ## OSX Support
+@@ -117,6 +119,7 @@
+ ########################################################################
+ ## PortAudio Support
+ ########################################################################
++IF(ENABLE_PORTAUDIO)
+ find_package(Portaudio)
+ 
+ if(PORTAUDIO_FOUND)
+@@ -132,6 +135,7 @@
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/gr-audio-portaudio.conf)
+ 
+ endif(PORTAUDIO_FOUND)
++endif(ENABLE_PORTAUDIO)
+ 
+ ########################################################################
+ ## Windows Support
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
index b0fc630..6cec02b 100644
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
@@ -15,6 +15,9 @@ PACKAGECONFIG[grc] = "-DENABLE_GRC=ON,-DENABLE_GRC=OFF,python-pygtk python-cheet
 
 PACKAGECONFIG[qtgui] = "-DENABLE_GR_QTGUI=ON,-DENABLE_GR_QTGUI=OFF,qt4-x11-free qwt, "
 
+PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF,portaudio-v19, "
+PACKAGECONFIG[jack] = "-DENABLE_JACK=ON,-DENABLE_JACK=OFF,jack, "
+
 
 inherit distutils-base cmake pkgconfig
 
@@ -72,6 +75,7 @@ GIT_BRANCH = "master"
 
 SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
            file://0001-gr-trellis-Kill-docs-hard.patch \
+           file://allow-to-disable-jack-portaudio.patch \
 "
 
 S="${WORKDIR}/git"
-- 
1.8.3.2

[WIP][PATCH 20/66] fluidsynth: Add PACKAGECONFIG for sndfile, jack, pulseaudio, portaudio and readline

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
index 80b2de9..9f6c351 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
@@ -11,3 +11,10 @@ SRC_URI[md5sum] = "0db3da78028d255026230809c6e21b44"
 SRC_URI[sha256sum] = "55638cb04f39f4df76c081e22ca7feeea58ddd20ebf779a7db2d38b1ff374cd6"
 
 inherit autotools pkgconfig lib_package
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
+PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1"
+PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio"
+PACKAGECONFIG[portaudio] = "--enable-portaudio-support,--disable-portaudio-support,portaudio"
+PACKAGECONFIG[readline] = "--with-readline,--without-readline-support,readline"
-- 
1.8.3.2

[WIP][PATCH 21/66] vlc: Add PACKAGECONFIG for undeterministic dependencies

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index f3d8a03..db303be 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPLv2"
 SECTION = "multimedia"
 
-DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
+DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
 
@@ -56,7 +56,6 @@ EXTRA_OECONF = "\
     --enable-png \
     --enable-live555 --enable-tremor \
     --enable-v4l2 --enable-v4l --disable-aa --disable-faad \
-    --enable-dbus \
     --without-contrib \
     --without-kde-solid \
     --disable-opengl --disable-glx \
@@ -66,10 +65,27 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
+# keep libv4l enabled by default, otherwise v4l2 enabled in EXTRA_OECONF fails with:
+# | v4l2.c:521:18: error: 'V4L2_CID_HCENTER' undeclared here (not in a function)
+PACKAGECONFIG ??= "libv4l"
+
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
+PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs,gnome-vfs"
+PACKAGECONFIG[portaudio] = "--enable-portaudio,--disable-portaudio,portaudio-v19"
+PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
+PACKAGECONFIG[libv4l] = "--enable-libv4l,--disable-libv4l,libv4l"
+PACKAGECONFIG[mtp] = "--enable-mtp,--disable-mtp,libmtp"
+PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska"
+PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,samba"
+PACKAGECONFIG[libsdl-image] = "--enable-libsdl-image,--disable-libsdl-image,libsdl-image"
+PACKAGECONFIG[ncurses] = "--enable-ncurses,--disable-ncurses,ncurses"
+PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib"
+PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
 
 do_configure() {
     cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
-- 
1.8.3.2

[WIP][PATCH 22/66] tracker: Add PACKAGECONFIG for undeterministic dependencies

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/tracker/tracker_0.14.2.bb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb
index 5838c2d..910833a 100644
--- a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb
+++ b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb
@@ -13,7 +13,7 @@ VER_DIR = "${@gnome_verdir("${PV}")}"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \
            file://0005-Fix-missing-gobject-introspection-checks.patch \
            file://enable-sqlite-crosscompile.patch \
-	   file://fix-removable-media-detection.patch \
+           file://fix-removable-media-detection.patch \
            file://90tracker \
            file://tracker-store.service \
            file://tracker-miner-fs.service \
@@ -23,6 +23,16 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${P
 SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service "
 SYSTEMD_AUTO_ENABLE = "disable"
 
+PACKAGECONFIG ??= "gstreamer"
+PACKAGECONFIG[enca] = "--enable-enca,--disable-enca,enca"
+PACKAGECONFIG[libgif] = "--enable-libgif,--disable-libgif,giflib"
+PACKAGECONFIG[gstreamer] = "--enable-generic-media-extractor=gstreamer,--enable-generic-media-extractor=external,gstreamer gst-plugins-good"
+PACKAGECONFIG[libgsf] = "--enable-libgsf,--disable-libgsf,libgsf"
+PACKAGECONFIG[poppler] = "--enable-poppler,--disable-poppler,poppler"
+PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
+PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower"
+
+
 EXTRA_OECONF += " tracker_cv_have_ioprio=yes --disable-introspection"
 
 # Disable the desktop-centric miners
-- 
1.8.3.2

[WIP][PATCH 23/66] mpd: Add PACKAGECONFIG for undeterministic dependencies

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
index 6f2a912..1e93928 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
@@ -23,6 +23,14 @@ EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemds
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag"
 PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame"
+PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile"
+PACKAGECONFIG[cdio] = "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
+PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms"
+PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
+PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4"
+PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
+PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
 
 do_install_append() {
     install -d ${D}/${localstatedir}/lib/mpd/music
-- 
1.8.3.2

[WIP][PATCH 24/66] cherokee: Add PACKAGECONFIG for ffmpeg and ldap

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
index 265e24e..0cc0104 100644
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
@@ -18,6 +18,10 @@ SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a
 
 inherit autotools pkgconfig binconfig update-rc.d systemd
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
+PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
+
 EXTRA_OECONF = "--disable-static \
                 --disable-nls \
                ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
-- 
1.8.3.2

[WIP][PATCH 25/66] collectd: Add PACKAGECONFIG for undeterministic dependencies

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
index 20df494..25be1c4 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
@@ -21,6 +21,13 @@ FPLAYOUT ?= "--with-fp-layout=nothing"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
+PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
+PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"
+PACKAGECONFIG[postgresql] = "--enable-postgresql,--disable-postgresql,postgresql"
+PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi"
+PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
+PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"
+PACKAGECONFIG[sensors] = "--enable-sensors,--disable-sensors,lmsensors"
 
 EXTRA_OECONF = " \
                 ${FPLAYOUT} \
-- 
1.8.3.2

[WIP][PATCH 26/66] xchat: Add PACKAGECONFIG for dbus and openssl

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/xchat/xchat_2.8.8.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
index d0a868e..4e8fe71 100644
--- a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
+++ b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
@@ -14,6 +14,10 @@ SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
 
 inherit autotools gettext
 
+PACKAGECONFIG ??= "dbus"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
+PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
+
 EXTRA_OECONF = "\
     --disable-perl \
     --disable-python \
-- 
1.8.3.2

[WIP][PATCH 27/66] xterm: Add fontconfig dependency

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xorg-app/xterm_293.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_293.bb b/meta-oe/recipes-graphics/xorg-app/xterm_293.bb
index 20e88f1..9eb12fe 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_293.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_293.bb
@@ -1,6 +1,6 @@
 require recipes-graphics/xorg-app/xorg-app-common.inc
 DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
-DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses"
+DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses fontconfig"
 
 LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=33;md5=3aaef904421576f75ce2ee32af88c375"
 
-- 
1.8.3.2

[WIP][PATCH 28/66] libwnck(3): Add dependency on libxres

[Martin Jansa]

* it's autodetected from sysroot and configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb | 2 +-
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
index 5171576..51a6ab7 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 BPN = "libwnck"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres"
 
 PR = "r1"
 
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
index 661bc42..6d23e27 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 PR = "r2"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native libxres"
 
 PACKAGECONFIG ??= "startup-notification"
 PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
-- 
1.8.3.2

[WIP][PATCH 29/66] e-wm: Add PACKAGECONFIG for pam

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/e-wm.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc
index 723bd33..659ad6a 100644
--- a/meta-efl/recipes-efl/e17/e-wm.inc
+++ b/meta-efl/recipes-efl/e17/e-wm.inc
@@ -7,6 +7,9 @@ SRCNAME = "e"
 inherit e update-alternatives gettext
 S = "${WORKDIR}/${SRCNAME}"
 
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
+
 EXTRA_OECONF = "\
     --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
     --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
-- 
1.8.3.2

[WIP][PATCH 30/66] sox: Add PACKAGECONFIG for mad, id3tag and lame

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
index 25b3d5f..cebad44 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -16,6 +16,9 @@ PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaud
 PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib,"
 PACKAGECONFIG[wavpack] = "--with-wavpack=dyn,--with-wavpack=no,wavpack,"
 PACKAGECONFIG[magic] = "--with-magic,--without-magic,file,"
+PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad,"
+PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag,"
+PACKAGECONFIG[lame] = "--with-lame,--without-lame,lame,"
 
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \
-- 
1.8.3.2

[WIP][PATCH 31/66] gvfs: Add PACKAGECONFIG for archive, obexftp, cdda

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
index d9a054b..d637399 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
@@ -28,3 +28,6 @@ PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \
                         --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba"
 # needs meta-filesystems
 PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse"
+PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive"
+PACKAGECONFIG[obexftp] = "--enable-obexftp, --disable-obexftp, bluez4 expat"
+PACKAGECONFIG[cdda] = "--enable-cdda, --disable-cdda, libcdio"
-- 
1.8.3.2

[WIP][PATCH 32/66] upower: Add PACKAGECONFIG for idevice

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/upower/upower_0.9.14.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb
index 902a983..0aa9ec9 100644
--- a/meta-oe/recipes-support/upower/upower_0.9.14.bb
+++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb
@@ -12,6 +12,9 @@ SRC_URI[sha256sum] = "81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf8
 
 inherit autotools pkgconfig gettext
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist"
+
 EXTRA_OECONF = " --with-backend=linux"
 
 do_configure_prepend() {
-- 
1.8.3.2

[WIP][PATCH 33/66] udisks: Add PACKAGECONFIG for parted

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
index fc5d95b..32f0c11 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -19,6 +19,9 @@ PR = "r9"
 
 inherit autotools systemd
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted"
+
 EXTRA_OECONF = "--disable-man-pages"
 
 FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
-- 
1.8.3.2

[WIP][PATCH 34/66] imlib2: Add PACKAGECONFIG for gif, tiff, id3 and bzip2

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/imlib2_svn.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_svn.bb
index a83216d..f263e2a 100644
--- a/meta-efl/recipes-efl/efl/imlib2_svn.bb
+++ b/meta-efl/recipes-efl/efl/imlib2_svn.bb
@@ -11,6 +11,12 @@ inherit efl binconfig
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
+PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff"
+PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
+PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag"
+
 EXTRA_OECONF = "--with-x \
                 --x-includes=${STAGING_INCDIR} \
                 --x-libraries=${STAGING_LIBDIR} "
-- 
1.8.3.2

[WIP][PATCH 35/66] openmotif: Add PACKAGECONFIG for jpeg and png

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
index ef92b33..1f01215 100644
--- a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
+++ b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
@@ -15,6 +15,10 @@ SRC_URI[sha256sum] = "c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc1
 
 inherit autotools
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
+
 EXTRA_OECONF = "X_CFLAGS=-I${STAGING_INCDIR} --disable-printing"
 
 PACKAGES += "${PN}-bin"
-- 
1.8.3.2

[WIP][PATCH 36/66] opencv: Add PACKAGECONFIG for jasper

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_2.4.3.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb
index 39b608a..161e7fd 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb
@@ -24,6 +24,9 @@ S = "${WORKDIR}/OpenCV-${PV}"
 OECMAKE_SOURCEPATH = "${S}"
 OECMAKE_BUILDPATH = "${WORKDIR}/build-${TARGET_ARCH}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[jasper] = "-DBUILD_JASPER=ON,-DBUILD_JASPER=OFF,jasper"
+
 EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \
                  -DBUILD_PYTHON_SUPPORT=ON \
                  -DWITH_FFMPEG=ON \
-- 
1.8.3.2

[WIP][PATCH 37/66] gammu: Add dependency on glib-2.0

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb
index 095a77c..071b105 100644
--- a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb
+++ b/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU All Mobile Managment Utilities"
 SECTION = "console/network"
-DEPENDS = "cmake-native virtual/libiconv libdbi mysql5"
+DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 HOMEPAGE = "http://www.gammu.org/"
-- 
1.8.3.2

[WIP][PATCH 38/66] openbox: Add PACKAGECONFIG for imlib2, xrandr, xinerama, xcursor, startup-notification

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
index 1fe2e17..9480388 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
@@ -17,6 +17,13 @@ ALTERNATIVE_${PN}-core = "x-window-manager"
 ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox"
 ALTERNATIVE_PRIORITY[x-window-manager] = "10"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+PACKAGECONFIG[xrandr] = "--enable-xrandr,--disable-xrandr,libxrandr"
+PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
+PACKAGECONFIG[xcursor] = "--enable-xcursor,--disable-xcursor,libxcursor"
+
 EXTRA_OECONF += "--with-plugins=none"
 
 PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome ${PN}-config"
-- 
1.8.3.2

[WIP][PATCH 39/66] v4l-utils: Add libx11 dependency

[Martin Jansa]

* configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
index c00f119..e2884a6 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
 
 PR = "r2"
 
-DEPENDS = "jpeg"
+DEPENDS = "jpeg virtual/libx11"
 
 inherit autotools gettext
 
-- 
1.8.3.2

[WIP][PATCH 40/66] epiphany: Add PACKAGECONFIG for zeroconf

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb b/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb
index 00d51f9..ccccad9 100644
--- a/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb
+++ b/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb
@@ -8,6 +8,9 @@ inherit gnome
 SRC_URI[archive.md5sum] = "0c566b3ffd428d2135e3c8cb65352d64"
 SRC_URI[archive.sha256sum] = "278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc"
 
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)}"
+PACKAGECONFIG[zeroconf] = "--enable-zeroconf,--disable-zeroconf,avahi"
+
 EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO} --without-ca-file"
 
 do_configure_prepend() {
-- 
1.8.3.2

[WIP][PATCH 41/66] libungif: Add dependency on libx11

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/libungif/libungif_4.1.3.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb b/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb
index 3e4b78b..6a0fd51 100644
--- a/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb
+++ b/meta-oe/recipes-extended/libungif/libungif_4.1.3.bb
@@ -3,6 +3,8 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
 
+DEPENDS = "virtual/libx11"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
 SRC_URI[md5sum] = "8c198831cc0495596c78134b8849e9ad"
 SRC_URI[sha256sum] = "59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36"
-- 
1.8.3.2

[WIP][PATCH 42/66] libmemcached: Add PACKAGECONFIG for sasl

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-support/libmemcached/libmemcached.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc
index 448a15d..50ef4d6 100644
--- a/meta-networking/recipes-support/libmemcached/libmemcached.inc
+++ b/meta-networking/recipes-support/libmemcached/libmemcached.inc
@@ -7,4 +7,7 @@ SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${
 
 TARGET_LDFLAGS += "-luuid"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
+
 inherit autotools gettext pkgconfig
-- 
1.8.3.2

[WIP][PATCH 43/66] networkmanager: Add PACKAGECONFIG for concheck

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
index 70bda27..f190dfd 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
@@ -40,6 +40,7 @@ PACKAGECONFIG[systemd] = " \
 "
 # consolekit is not picked by shlibs, so add it to RDEPENDS too
 PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
+PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,libsoup-2.4"
 
 # Work around dbus permission problems since we lack a proper at_console
 do_install_prepend() {
-- 
1.8.3.2

[WIP][PATCH 44/66] proftpd: Add PACKAGECONFIG for curses

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index 3c48422..6571b9c 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -19,6 +19,9 @@ SRC_URI[sha256sum] = "9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436
 
 inherit autotools useradd update-rc.d
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses,--disable-curses --disable-ncurses,ncurses"
+
 EXTRA_OECONF = "--disable-cap \
                 --disable-auth-pam \
 "
-- 
1.8.3.2

[WIP][PATCH 45/66] gnuplot: Add PACKAGECONFIG for cairo

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/gnuplot/gnuplot.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
index b72bbd7..96d6ee2 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
@@ -4,12 +4,15 @@ HOMEPAGE = "http://www.gnuplot.info/"
 SECTION = "console/scientific"
 LICENSE = "BSD-4"
 LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
-DEPENDS = "virtual/libx11 gd cairo readline"
+DEPENDS = "virtual/libx11 gd readline"
 
 inherit autotools
 
 acpaths = ""
 
+PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
+
 EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
                 --without-lisp-files \
                 --without-tutorial \
-- 
1.8.3.2

[WIP][PATCH 46/66] gnome-mplayer: Add PACKAGECONFIG for gtk3

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
index d7d2314..4cbe303 100644
--- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
+++ b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
@@ -13,6 +13,9 @@ SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.gz"
 SRC_URI[md5sum] = "1d3ab24c5501b5528e357931ca4dc6da"
 SRC_URI[sha256sum] = "ac3c179345baecb4ca5237782aa33e83253a87bf8b42ce6eb3a9207a340f61b2"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
+
 EXTRA_OECONF = "--with-gio --with-alsa --with-dbus --with-libnotify"
 
 FILES_${PN} += "${datadir}/gnome-control-center/default-apps/${PN}.xml"
-- 
1.8.3.2

[WIP][PATCH 47/66] gimp: Add PACKAGECONFIG for bzip2, libxpm, libjasper and gudev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
index e9bbdcf..38b6f48 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
@@ -12,6 +12,12 @@ SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2"
 SRC_URI[md5sum] = "b542138820ca3a41cbd63fc331907955"
 SRC_URI[sha256sum] = "0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
+PACKAGECONFIG[libxpm] = "--with-libxpm,--without-libxpm,libxpm"
+PACKAGECONFIG[libjasper] = "--with-libjasper,--without-libjasper,jasper"
+PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev"
+
 EXTRA_OECONF = "--disable-python \
                 --without-wmf"
 
-- 
1.8.3.2

[WIP][PATCH 48/66] gegl: Add PACKAGECONFIG for jasper, avformat

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb b/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
index a68dc20..e5fc066 100644
--- a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
+++ b/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
@@ -7,6 +7,10 @@ inherit gnome
 
 EXTRA_OECONF = "--disable-docs "
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
+PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav"
+
 SRC_URI = "ftp://ftp.gimp.org/pub/${PN}/0.2/${PN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "32b00002f1f1e316115c4ed922e1dec8"
 SRC_URI[sha256sum] = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"
-- 
1.8.3.2

[WIP][PATCH 49/66] edb: Add PACKAGECONFIG for ncurses

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/edb_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/edb_svn.bb b/meta-efl/recipes-efl/efl/edb_svn.bb
index aade344..9fe6760 100644
--- a/meta-efl/recipes-efl/efl/edb_svn.bb
+++ b/meta-efl/recipes-efl/efl/edb_svn.bb
@@ -9,5 +9,8 @@ SRCREV = "${EFL_SRCREV}"
 
 inherit efl
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[ncurses] = "--enable-ncurses,--disable-ncurses,ncurses"
+
 SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};protocol=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
-- 
1.8.3.2

[WIP][PATCH 50/66] gnome-vfs: Add PACKAGECONFIG for fam

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 535006b..78110b5 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -31,6 +31,7 @@ SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
 PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
+PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
 
 EXTRA_OECONF = " --disable-hal \
                  --disable-openssl \
-- 
1.8.3.2

[WIP][PATCH 51/66] lightmediascanner: Add PACKAGECONFIG for ogg

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb
index a3ff5d2..f17a443 100644
--- a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb
+++ b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb
@@ -15,6 +15,9 @@ SRC_URI[sha256sum] = "302a7f6cc355467cd20332f4e02c8b87ba6c0c7a6818a6a987e007aace
 
 S = "${WORKDIR}/release_${PV}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis"
+
 inherit autotools pkgconfig
 
 do_install_append() {
-- 
1.8.3.2

[WIP][PATCH 52/66] mplayer2: Add PACKAGECONFIG for mpg123 and xss

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 7c1357b..590cc2d 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -134,6 +134,8 @@ EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52"
 PACKAGECONFIG[lame] = ",,lame"
+PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscreensaver"
+PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
-- 
1.8.3.2

[WIP][PATCH 53/66] maliit-framework: Add dependency on gtk+3

[Martin Jansa]

* it's autodetected and configure doesn't allow to explicitly disable it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/maliit/maliit-framework_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/maliit/maliit-framework_git.bb b/meta-oe/recipes-support/maliit/maliit-framework_git.bb
index 15719f4..ae20fa3 100644
--- a/meta-oe/recipes-support/maliit/maliit-framework_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-framework_git.bb
@@ -23,6 +23,7 @@ PR = "r1"
 PACKAGES =+ "${PN}-gtk"
 GTKIMMODULES_PACKAGES = "${PN}-gtk"
 
+DEPENDS = "gtk+3"
 RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4"
 
 RRECOMMENDS_${PN} = "maliit-plugins"
-- 
1.8.3.2

[WIP][PATCH 54/66] packagekit: Add PACKAGECONFIG for service-packs

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
index c8de9d8..7d9c2bf 100644
--- a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
+++ b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
@@ -18,6 +18,9 @@ SRC_URI[archive.sha256sum] = "0eafd1be5516a41ebc0f0c3acff0b0763da105a4178b5eee0f
 
 S = "${WORKDIR}/PackageKit-${PV}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[service-packs] = "--enable-service-packs,--disable-service-packs,libarchive"
+
 EXTRA_OECONF = "--with-security-framework=dummy \
                 --with-default-backend=opkg \
                 --enable-opkg \
-- 
1.8.3.2

[WIP][PATCH 55/66] orage: Add PACKAGECONFIG for notify and dependency on popt

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-apps/orage/orage_4.8.4.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-apps/orage/orage_4.8.4.bb b/meta-xfce/recipes-apps/orage/orage_4.8.4.bb
index 9905987..69211cc 100644
--- a/meta-xfce/recipes-apps/orage/orage_4.8.4.bb
+++ b/meta-xfce/recipes-apps/orage/orage_4.8.4.bb
@@ -2,13 +2,16 @@ DESCRIPTION = "Xfce Calender"
 SECTION = "x11/application"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
-DEPENDS = "gtk+ xfce4-panel libical"
+DEPENDS = "gtk+ xfce4-panel libical popt"
 
 inherit xfce-app
 
 SRC_URI[md5sum] = "d5105981a9d77ed22be42615d70f3cc0"
 SRC_URI[sha256sum] = "b19df727da9da48b979e238ac7113c803976de80bd1e2dadf6d84b864956dfd5"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
+
 PACKAGES =+ "xfce4-orageclock-plugin"
 FILES_${PN} += "${datadir}/dbus-1"
 FILES_${PN}-dbg += "${libdir}/orage/xfce4/panel-plugins/.debug"
-- 
1.8.3.2

[WIP][PATCH 56/66] thunar: Add PACKAGECONFIG for pcre

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb
index fc80dc9..1a92a9c 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb
@@ -12,6 +12,9 @@ SRC_URI = "http://archive.xfce.org/src/xfce/${PN}/${@'${PV}'[0:3]}/Thunar-${PV}.
 
 S = "${WORKDIR}/Thunar-${PV}/"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
+
 FILES_${PN} += "${libdir}/thunarx-2/* \
                 ${libdir}/xfce4/panel/plugins/* \
                 ${libdir}/Thunar/[Tt]hunar* \
-- 
1.8.3.2

[WIP][PATCH 57/66] thunar-volman: Add PACKAGECONFIG for notify

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb
index 4444820..28f9597 100644
--- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb
+++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb
@@ -9,4 +9,7 @@ inherit xfce
 SRC_URI[md5sum] = "250af757ea629c7c27f554d17119080c"
 SRC_URI[sha256sum] = "ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
+
 RDEPENDS_${PN} = "eject"
-- 
1.8.3.2

[WIP][PATCH 58/66] tumbler: Add PACKAGECONFIG for gstreamer

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb
index 3860716..a4fe817 100644
--- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb
+++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb
@@ -16,6 +16,9 @@ do_install_append() {
     ln -sf ${libdir}/tumbler-1/plugins/cache/tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so
 }
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gstreamer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0"
+
 FILES_${PN} += "${datadir}/dbus-1/services \
                 ${libdir}/tumbler-1/tumblerd \
                 ${libdir}/tumbler-1/plugins/*.so \
-- 
1.8.3.2

[WIP][PATCH 59/66] xfce4-clipman-plugin: Add PACKAGECONFIG for unique

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb
index d3c7138..80792cf 100644
--- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb
+++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.3.bb
@@ -10,3 +10,6 @@ DEPENDS += "xfconf xproto libxtst"
 
 SRC_URI[md5sum] = "61f3be97efa379cb358980c94e14692a"
 SRC_URI[sha256sum] = "4424447067cb2c3972c375330d2e1d19f12e59c41bd03e111c2e6e9e174a5067"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[unique] = "--enable-unique,--disable-unique,libunique"
-- 
1.8.3.2

[WIP][PATCH 60/66] xfce4-places-plugin: Add PACKAGECONFIG for notify

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb
index 2e0b810..f68365c 100644
--- a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb
+++ b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb
@@ -7,3 +7,6 @@ inherit xfce-panel-plugin
 
 SRC_URI[md5sum] = "84c39fb123e07e1c7caaf006d9383656"
 SRC_URI[sha256sum] = "6996051669a13d4791a5a453747801dc2f7f6fa5546785622d80b34966283d44"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
-- 
1.8.3.2

[WIP][PATCH 61/66] xfce4-settings: Add PACKAGECONFIG for notify

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
index d633fa6..4aac5a3 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
@@ -20,6 +20,9 @@ SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
 SRC_URI[md5sum] = "3bf42281b64b10b2691008cd693f7dbd"
 SRC_URI[sha256sum] = "4a4f1e79a58b524f3a6dd030b6fc687671b35566f847e6f516c6f84211191698"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
+
 FILES_${PN} += "${libdir}/xfce4"
 
 do_install_prepend() {
-- 
1.8.3.2

[WIP][PATCH 62/66] xfdesktop: Add PACKAGECONFIG for notify

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb
index a36f1c6..11aab8a 100644
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb
@@ -9,4 +9,7 @@ inherit xfce
 SRC_URI[md5sum] = "54a84ce63046c279fc3ec3f436d2f1b0"
 SRC_URI[sha256sum] = "49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
+
 FILES_${PN} += "${datadir}/backgrounds"
-- 
1.8.3.2

[WIP][PATCH 63/66] webkit-efl: Add dependency on gst-plugins-base

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 2a047b8..a45717e 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8ba
 
 DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
            libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
-           libxml2 pango eina ecore evas edje edbus gstreamer"
+           libxml2 pango eina ecore evas edje edbus gstreamer gst-plugins-base"
 
 # 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
 SRCREV = "120144"
-- 
1.8.3.2

[WIP][PATCH 64/66] qt-creator: Add patch to resolve missing cpuid.h in ARM builds

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../qt-creator/fix.missing.cpuid.h.patch           | 384 +++++++++++++++++++++
 meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb  |   4 +-
 2 files changed, 387 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch

diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch b/meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch
new file mode 100644
index 0000000..363bee3
--- /dev/null
+++ b/meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch
@@ -0,0 +1,384 @@
+From 8be071bbca6a9b8e06a7466d848a2b4b6dbcbc1f Mon Sep 17 00:00:00 2001
+From: Christian Kandeler <christian.kandeler@digia.com>
+Date: Fri, 19 Jul 2013 13:40:30 +0200
+Subject: [PATCH] WIP: Remove x86 assembler code from botan sources.
+
+Taken from
+https://bugreports.qt-project.org/browse/QTCREATORBUG-8107
+
+Upstream-Status: Submitted
+
+Change-Id: I3780aa4551f563c5f43833ec822e3c1add7012f2
+---
+ src/libs/3rdparty/botan/botan.cpp | 297 +++-----------------------------------
+ src/libs/3rdparty/botan/botan.h   |   4 +-
+ 2 files changed, 18 insertions(+), 283 deletions(-)
+
+diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
+index 917c385..c515750 100644
+--- a/src/libs/3rdparty/botan/botan.cpp
++++ b/src/libs/3rdparty/botan/botan.cpp
+@@ -1098,35 +1098,31 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
+ 
+ }
+ 
+-
+-#if (BOTAN_MP_WORD_BITS != 32)
+-   #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
++#if (BOTAN_MP_WORD_BITS == 8)
++typedef Botan::u16bit dword;
++#elif (BOTAN_MP_WORD_BITS == 16)
++typedef Botan::u32bit dword;
++#elif (BOTAN_MP_WORD_BITS == 32)
++typedef Botan::u64bit dword;
++#elif (BOTAN_MP_WORD_BITS == 64)
++#error BOTAN_MP_WORD_BITS can be 64 only with assembly support
++#else
++#error BOTAN_MP_WORD_BITS must be 8, 16, 32, or 64
+ #endif
+ 
+-#ifdef Q_OS_UNIX
++
+ namespace Botan {
+ 
+ extern "C" {
+ 
+ /*
+-* Helper Macros for x86 Assembly
+-*/
+-#define ASM(x) x "\n\t"
+-
+-/*
+ * Word Multiply
+ */
+ inline word word_madd2(word a, word b, word* c)
+    {
+-   asm(
+-      ASM("mull %[b]")
+-      ASM("addl %[c],%[a]")
+-      ASM("adcl $0,%[carry]")
+-
+-      : [a]"=a"(a), [b]"=rm"(b), [carry]"=&d"(*c)
+-      : "0"(a), "1"(b), [c]"g"(*c) : "cc");
+-
+-   return a;
++    dword z = (dword)a * b + *c;
++    *c = (word)(z >> BOTAN_MP_WORD_BITS);
++    return (word)z;
+    }
+ 
+ /*
+@@ -1134,25 +1130,12 @@ inline word word_madd2(word a, word b, word* c)
+ */
+ inline word word_madd3(word a, word b, word c, word* d)
+    {
+-   asm(
+-      ASM("mull %[b]")
+-
+-      ASM("addl %[c],%[a]")
+-      ASM("adcl $0,%[carry]")
+-
+-      ASM("addl %[d],%[a]")
+-      ASM("adcl $0,%[carry]")
+-
+-      : [a]"=a"(a), [b]"=rm"(b), [carry]"=&d"(*d)
+-      : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc");
+-
+-   return a;
++    dword z = (dword)a * b + c + *d;
++    *d = (word)(z >> BOTAN_MP_WORD_BITS);
++    return (word)z;
+    }
+-
+ }
+-
+ }
+-#endif
+ 
+ 
+ 
+@@ -1704,30 +1687,6 @@ void unlock_mem(void* addr, size_t length);
+ 
+ namespace Botan {
+ 
+-extern "C" {
+-
+-/*
+-* Word Multiply/Add
+-*/
+-inline word word_madd2(word a, word b, word* c)
+-   {
+-   dword z = (dword)a * b + *c;
+-   *c = (word)(z >> BOTAN_MP_WORD_BITS);
+-   return (word)z;
+-   }
+-
+-/*
+-* Word Multiply/Add
+-*/
+-inline word word_madd3(word a, word b, word c, word* d)
+-   {
+-   dword z = (dword)a * b + c + *d;
+-   *d = (word)(z >> BOTAN_MP_WORD_BITS);
+-   return (word)z;
+-   }
+-
+-}
+-
+ /**
+ * Win32 CAPI Entropy Source
+ */
+@@ -2315,225 +2274,6 @@ namespace Botan {
+ 
+ extern "C" {
+ 
+-#ifdef Q_OS_UNIX
+-/*
+-* Helper Macros for x86 Assembly
+-*/
+-#ifndef ASM
+-  #define ASM(x) x "\n\t"
+-#endif
+-
+-#define ADDSUB2_OP(OPERATION, INDEX)                     \
+-        ASM("movl 4*" #INDEX "(%[y]), %[carry]")         \
+-        ASM(OPERATION " %[carry], 4*" #INDEX "(%[x])")   \
+-
+-#define ADDSUB3_OP(OPERATION, INDEX)                     \
+-        ASM("movl 4*" #INDEX "(%[x]), %[carry]")         \
+-        ASM(OPERATION " 4*" #INDEX "(%[y]), %[carry]")   \
+-        ASM("movl %[carry], 4*" #INDEX "(%[z])")         \
+-
+-#define LINMUL_OP(WRITE_TO, INDEX)                       \
+-        ASM("movl 4*" #INDEX "(%[x]),%%eax")             \
+-        ASM("mull %[y]")                                 \
+-        ASM("addl %[carry],%%eax")                       \
+-        ASM("adcl $0,%%edx")                             \
+-        ASM("movl %%edx,%[carry]")                       \
+-        ASM("movl %%eax, 4*" #INDEX "(%[" WRITE_TO "])")
+-
+-#define MULADD_OP(IGNORED, INDEX)                        \
+-        ASM("movl 4*" #INDEX "(%[x]),%%eax")             \
+-        ASM("mull %[y]")                                 \
+-        ASM("addl %[carry],%%eax")                       \
+-        ASM("adcl $0,%%edx")                             \
+-        ASM("addl 4*" #INDEX "(%[z]),%%eax")             \
+-        ASM("adcl $0,%%edx")                             \
+-        ASM("movl %%edx,%[carry]")                       \
+-        ASM("movl %%eax, 4*" #INDEX " (%[z])")
+-
+-#define DO_8_TIMES(MACRO, ARG) \
+-        MACRO(ARG, 0) \
+-        MACRO(ARG, 1) \
+-        MACRO(ARG, 2) \
+-        MACRO(ARG, 3) \
+-        MACRO(ARG, 4) \
+-        MACRO(ARG, 5) \
+-        MACRO(ARG, 6) \
+-        MACRO(ARG, 7)
+-
+-#define ADD_OR_SUBTRACT(CORE_CODE)     \
+-        ASM("rorl %[carry]")           \
+-        CORE_CODE                      \
+-        ASM("sbbl %[carry],%[carry]")  \
+-        ASM("negl %[carry]")
+-
+-/*
+-* Word Addition
+-*/
+-inline word word_add(word x, word y, word* carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(ASM("adcl %[y],%[x]"))
+-      : [x]"=r"(x), [carry]"=r"(*carry)
+-      : "0"(x), [y]"rm"(y), "1"(*carry)
+-      : "cc");
+-   return x;
+-   }
+-
+-/*
+-* Eight Word Block Addition, Two Argument
+-*/
+-inline word word8_add2(word x[8], const word y[8], word carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB2_OP, "adcl"))
+-      : [carry]"=r"(carry)
+-      : [x]"r"(x), [y]"r"(y), "0"(carry)
+-      : "cc", "memory");
+-   return carry;
+-   }
+-
+-/*
+-* Eight Word Block Addition, Three Argument
+-*/
+-inline word word8_add3(word z[8], const word x[8], const word y[8], word carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "adcl"))
+-      : [carry]"=r"(carry)
+-      : [x]"r"(x), [y]"r"(y), [z]"r"(z), "0"(carry)
+-      : "cc", "memory");
+-   return carry;
+-   }
+-
+-/*
+-* Word Subtraction
+-*/
+-inline word word_sub(word x, word y, word* carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(ASM("sbbl %[y],%[x]"))
+-      : [x]"=r"(x), [carry]"=r"(*carry)
+-      : "0"(x), [y]"rm"(y), "1"(*carry)
+-      : "cc");
+-   return x;
+-   }
+-
+-/*
+-* Eight Word Block Subtraction, Two Argument
+-*/
+-inline word word8_sub2(word x[8], const word y[8], word carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB2_OP, "sbbl"))
+-      : [carry]"=r"(carry)
+-      : [x]"r"(x), [y]"r"(y), "0"(carry)
+-      : "cc", "memory");
+-   return carry;
+-   }
+-
+-/*
+-* Eight Word Block Subtraction, Two Argument
+-*/
+-inline word word8_sub2_rev(word x[8], const word y[8], word carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "sbbl"))
+-      : [carry]"=r"(carry)
+-      : [x]"r"(y), [y]"r"(x), [z]"r"(x), "0"(carry)
+-      : "cc", "memory");
+-   return carry;
+-   }
+-
+-/*
+-* Eight Word Block Subtraction, Three Argument
+-*/
+-inline word word8_sub3(word z[8], const word x[8], const word y[8], word carry)
+-   {
+-   asm(
+-      ADD_OR_SUBTRACT(DO_8_TIMES(ADDSUB3_OP, "sbbl"))
+-      : [carry]"=r"(carry)
+-      : [x]"r"(x), [y]"r"(y), [z]"r"(z), "0"(carry)
+-      : "cc", "memory");
+-   return carry;
+-   }
+-
+-/*
+-* Eight Word Block Linear Multiplication
+-*/
+-inline word word8_linmul2(word x[8], word y, word carry)
+-   {
+-   asm(
+-      DO_8_TIMES(LINMUL_OP, "x")
+-      : [carry]"=r"(carry)
+-      : [x]"r"(x), [y]"rm"(y), "0"(carry)
+-      : "cc", "%eax", "%edx");
+-   return carry;
+-   }
+-
+-/*
+-* Eight Word Block Linear Multiplication
+-*/
+-inline word word8_linmul3(word z[8], const word x[8], word y, word carry)
+-   {
+-   asm(
+-      DO_8_TIMES(LINMUL_OP, "z")
+-      : [carry]"=r"(carry)
+-      : [z]"r"(z), [x]"r"(x), [y]"rm"(y), "0"(carry)
+-      : "cc", "%eax", "%edx");
+-   return carry;
+-   }
+-
+-/*
+-* Eight Word Block Multiply/Add
+-*/
+-inline word word8_madd3(word z[8], const word x[8], word y, word carry)
+-   {
+-   asm(
+-      DO_8_TIMES(MULADD_OP, "")
+-      : [carry]"=r"(carry)
+-      : [z]"r"(z), [x]"r"(x), [y]"rm"(y), "0"(carry)
+-      : "cc", "%eax", "%edx");
+-   return carry;
+-   }
+-
+-/*
+-* Multiply-Add Accumulator
+-*/
+-inline void word3_muladd(word* w2, word* w1, word* w0, word x, word y)
+-   {
+-   asm(
+-      ASM("mull %[y]")
+-
+-      ASM("addl %[x],%[w0]")
+-      ASM("adcl %[y],%[w1]")
+-      ASM("adcl $0,%[w2]")
+-
+-      : [w0]"=r"(*w0), [w1]"=r"(*w1), [w2]"=r"(*w2)
+-      : [x]"a"(x), [y]"d"(y), "0"(*w0), "1"(*w1), "2"(*w2)
+-      : "cc");
+-   }
+-
+-/*
+-* Multiply-Add Accumulator
+-*/
+-inline void word3_muladd_2(word* w2, word* w1, word* w0, word x, word y)
+-   {
+-   asm(
+-      ASM("mull %[y]")
+-
+-      ASM("addl %[x],%[w0]")
+-      ASM("adcl %[y],%[w1]")
+-      ASM("adcl $0,%[w2]")
+-
+-      ASM("addl %[x],%[w0]")
+-      ASM("adcl %[y],%[w1]")
+-      ASM("adcl $0,%[w2]")
+-
+-      : [w0]"=r"(*w0), [w1]"=r"(*w1), [w2]"=r"(*w2)
+-      : [x]"a"(x), [y]"d"(y), "0"(*w0), "1"(*w1), "2"(*w2)
+-      : "cc");
+-   }
+-#else
+ /*
+ * Word Addition
+ */
+@@ -2718,9 +2458,6 @@ inline void word3_muladd_2(word* w2, word* w1, word* w0, word a, word b)
+    *w1 = word_add(*w1, b, &carry);
+    *w2 = word_add(*w2, top, &carry);
+    }
+-
+-#endif
+-
+ }
+ 
+ }
+diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
+index 6a9cbe0..3a66a14 100644
+--- a/src/libs/3rdparty/botan/botan.h
++++ b/src/libs/3rdparty/botan/botan.h
+@@ -80,9 +80,7 @@
+   #define BOTAN_GCC_VERSION 0
+ #endif
+ 
+-#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
+-#define BOTAN_TARGET_CPU_IS_X86_FAMILY
+-#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
++#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 0
+ 
+ #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
+     defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN)
+-- 
+1.8.3.2
+
diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb
index a95ad5a..4f93d85 100644
--- a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb
+++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LGPL_EXCEPTION.TXT;md5=eb6c371255e1262c55ae9b652a90b5
                     file://LICENSE.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
 SECTION = "qt/app"
 
-SRC_URI = "http://download.qt-project.org/official_releases/qtcreator/2.8/${PV}/${BP}-src.tar.gz"
+SRC_URI = "http://download.qt-project.org/official_releases/qtcreator/2.8/${PV}/${BP}-src.tar.gz \
+    file://fix.missing.cpuid.h.patch \
+"
 SRC_URI[md5sum] = "5aacdad4491b7dda9758a81384d8da79"
 SRC_URI[sha256sum] = "7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2"
 
-- 
1.8.3.2

[WIP][PATCH 65/66] xbmc: Add libmad dependency

[Martin Jansa]

* fails without it:
  | checking mad.h usability... no
  | checking mad.h presence... no
  | checking for mad.h... no
  | configure: error: Could not find a required library. Please see the README for your platform.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 0b4d696..0bb09b1 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "XBMC Media Center"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
 
-DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib libtinyxml"
+DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib libtinyxml libmad"
 #require recipes/egl/egl.inc
 
 
-- 
1.8.3.2

[WIP][PATCH 66/66] qcanobserver: Move to nonworking

[Martin Jansa]

* depends on qwt-5 APIs, I've tried to update it to support qwt-6 which
  is used in meta-oe, but it looks more complicated then what I've
  expected, my WIP patch is here:
  http://git.openembedded.org/meta-openembedded-contrib/log/?h=jansa/qcanobserver
  if you want to finish it and move qcanobserver back to recipes-qt
* qwt-5 was removed more then 1 year ago:
  commit 5ad3d0d042dcd3f3bf54d44144b731cd0607b2e3
  Author: Eric BENARD <eric@eukrea.com>
  Date:   Thu Apr 12 15:09:48 2012 +0000

    qwt: add 6.0.1 version

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../{ => nonworking}/qcanobserver/qcanobserver-socketcan_svn.bb           | 0
 .../0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch       | 0
 .../qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch            | 0
 meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/candemo.xml | 0
 meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver_svn.bb      | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver-socketcan_svn.bb (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/candemo.xml (100%)
 rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver_svn.bb (100%)

diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb
similarity index 100%
rename from meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb
rename to meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
similarity index 100%
rename from meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
rename to meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch
similarity index 100%
rename from meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch
rename to meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml
similarity index 100%
rename from meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml
rename to meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb
similarity index 100%
rename from meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb
rename to meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb
-- 
1.8.3.2

Re: [WIP][PATCH 00/66] Deterministic dependencies II

[Chris Larson]

On Thu, Aug 29, 2013 at 8:50 AM, Martin Jansa <martin.jansa@gmail.com>wrote:

> WIP because verification build is still running and I must admit that I'm
> mostly
> testing that all dependencies are correctly "disabled" and in the end
> deterministic.
>
> I'm not testing if every possible combination of PACKAGECONFIG options
> provide sufficient
> dependency tree.
>
> The following changes since commit
> 72e23c12296fbc77193898c38426add58d0c2d71:
>
>   mysql5: replace with mariadb 5.1.67 and tweak (2013-08-27 16:39:31 +0100)
>
> are available in the git repository at:
>
>   git://git.openembedded.org/meta-openembedded-contrib jansa/deps
>
> http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/deps
>

Haven't reviewed all the patches, but just wanted to say, this is an
impressive amount of work on this task, nicely done.
-- 
Christopher Larson

Re: [WIP][PATCH 02/66] libmikmod: upgrade to 3.2.0

[Marko Lindqvist]

On 29 August 2013 18:50, Martin Jansa <martin.jansa@gmail.com> wrote:
> * 3.3 is only beta
> * 3.1.12 was failing to build with texinfo-5, see
>   http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/

 As libSDL-mixer dependency, and thus recursive dependency for many
recipes in meta-games, this is important for me. In my local tree I've
solved the build issue by simply patching doc building part away. Let
me know if you want that patch (say, to go in to stable branch instead
of full version upgrade)


 - ML

Re: [WIP][PATCH 02/66] libmikmod: upgrade to 3.2.0

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

On Thu, Aug 29, 2013 at 07:27:54PM +0300, Marko Lindqvist wrote:
> On 29 August 2013 18:50, Martin Jansa <martin.jansa@gmail.com> wrote:
> > * 3.3 is only beta
> > * 3.1.12 was failing to build with texinfo-5, see
> >   http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/
> 
>  As libSDL-mixer dependency, and thus recursive dependency for many
> recipes in meta-games, this is important for me. In my local tree I've
> solved the build issue by simply patching doc building part away. Let
> me know if you want that patch (say, to go in to stable branch instead
> of full version upgrade)

I was thinking about it, but if you confirm that 3.2.0 doesn't break any
of your games I'm fine with it.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

State of bitbake world Was: [WIP][PATCH 00/66] Deterministic dependencies II

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 20655 bytes --]

On Thu, Aug 29, 2013 at 05:50:53PM +0200, Martin Jansa wrote:
> WIP because verification build is still running and I must admit that I'm mostly
> testing that all dependencies are correctly "disabled" and in the end deterministic.
> 
> I'm not testing if every possible combination of PACKAGECONFIG options provide sufficient
> dependency tree.

Logs from world build with this patchset (and corresponding one in
oe-core) is here:
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130830_054414.log/

Some of these issues were supposed to be fixed by patches I've sent, so I'll first
concentrate on fixing those, other issues are still free for volunteers :).

cmake is broken by one meta-qt5 change, so many recipe issues are "hidden" by that.

Summary: 8 tasks failed:
  meta-openembedded/meta-oe/recipes-connectivity/daq/daq_2.0.0.bb, do_fetch
  meta-openembedded/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb, do_compile
  meta-openembedded/meta-oe/recipes-navigation/monav/monav_0.3.bb, do_compile
  openembedded-core/meta/recipes-devtools/cmake/cmake_2.8.11.2.bb, do_configure
  meta-openembedded/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb, do_fetch
  meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb, do_compile
  meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb, do_compile
  meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile

Found differences: 
WARN: packages/armv5te-oe-linux-gnueabi/consolekit/consolekit/latest lost dependency on  polkit
WARN: packages/armv5te-oe-linux-gnueabi/epiphany/epiphany/latest lost dependency on  libnotify
WARN: packages/armv5te-oe-linux-gnueabi/expedite/expedite/latest lost dependency on  libsdl
WARN: packages/armv5te-oe-linux-gnueabi/fbida/fbida/latest lost dependency on  libx11 libxext libxpm libxt openmotif
WARN: packages/armv5te-oe-linux-gnueabi/gammu/gammu/latest lost dependency on  libgudev-1.0
WARN: packages/armv5te-oe-linux-gnueabi/gimp/gimp/latest lost dependency on  libxmu
WARN: packages/armv5te-oe-linux-gnueabi/glade3/glade3/latest lost dependency on  dbus-glib dbus-lib gconf gnome-vfs libart-lgpl libavahi-client libavahi-common libavahi-glib libbonobo libbonoboui libcanberra libcap libgcrypt libgnome libgnome-keyring libgnomecanvas libgnomeui libgpg-error libice libltdl libogg libsm libvorbis libxcomposite libxcursor libxdamage libxfixes libxrandr orbit2 popt util-linux-libuuid
WARN: packages/armv5te-oe-linux-gnueabi/gmtk/gmtk/latest lost dependency on  cairo-gobject dbus-lib gtk+3 libcap libice libjson libpulse libpulse-mainloop-glib libpulsecommon libsm libsndfile1 libx11-xcb libxi libxtst util-linux-libuuid
WARN: packages/armv5te-oe-linux-gnueabi/gnome-mplayer/gnome-mplayer-nautilus-extension/latest lost dependency on  eglibc glib-2.0 gtk+
WARN: packages/armv5te-oe-linux-gnueabi/gnome-panel/gnome-panel/latest lost dependency on  dbus-lib
WARN: packages/armv5te-oe-linux-gnueabi/gnome-panel3/gnome-panel3/latest lost dependency on  telepathy-glib
WARN: packages/armv5te-oe-linux-gnueabi/gnuradio/gnuradio/latest lost dependency on  libpython3
WARN: packages/armv5te-oe-linux-gnueabi/guile/guile/latest lost dependency on  ncurses-libncurses readline
WARN: packages/armv5te-oe-linux-gnueabi/libmatchbox/libmatchbox/latest lost dependency on  libpng12
WARN: packages/armv5te-oe-linux-gnueabi/libungif/libungif/latest lost dependency on  libice libsm util-linux-libuuid
WARN: packages/armv5te-oe-linux-gnueabi/maliit-framework/maliit-framework-gtk/latest lost dependency on  gtk+
WARN: packages/armv5te-oe-linux-gnueabi/midori/midori/latest lost dependency on  libxscrnsaver
WARN: packages/armv5te-oe-linux-gnueabi/mpd/mpd/latest lost dependency on  yajl
WARN: packages/armv5te-oe-linux-gnueabi/mpeg2dec/mpeg2dec/latest lost dependency on  libx11 libxext libxv
WARN: packages/armv5te-oe-linux-gnueabi/mpg123/mpg123/latest lost dependency on  audiofile esound libjack libsdl openal-soft portaudio-v19 tslib
WARN: packages/armv5te-oe-linux-gnueabi/mplayer2/mplayer2/latest lost dependency on  libxxf86dga
WARN: packages/armv5te-oe-linux-gnueabi/navit/navit/latest lost dependency on  fribidi
WARN: packages/armv5te-oe-linux-gnueabi/navit/navit-graphics-gtk/latest lost dependency on  imlib2
WARN: packages/armv5te-oe-linux-gnueabi/navit/navit-graphics-sdl/latest lost dependency on  eglibc freetype libjpeg-turbo liblzma libpng libsdl libsdl-image tiff tslib zlib
WARN: packages/armv5te-oe-linux-gnueabi/network-manager-applet/network-manager-applet/latest lost dependency on  libnotify3
WARN: packages/armv5te-oe-linux-gnueabi/opencv/libopencv-highgui/latest lost dependency on  jasper
WARN: packages/armv5te-oe-linux-gnueabi/qemu/qemu/latest lost dependency on  cairo gdk-pixbuf gnutls gtk+ libvte
WARN: packages/armv5te-oe-linux-gnueabi/synergy/synergy/latest lost dependency on  libxinerama
WARN: packages/armv5te-oe-linux-gnueabi/thunar/thunar/latest lost dependency on  libnotify3
WARN: packages/armv5te-oe-linux-gnueabi/tracker/tracker/latest lost dependency on  dbus-glib enca gnome-panel3 gnutls libgee libgudev-1.0 liblzma libnmglib libnmutil libtasn1 libudev libunistring tiff
WARN: packages/armv5te-oe-linux-gnueabi/tracker/tracker-nautilus-extension/latest lost dependency on  libunistring
WARN: packages/armv5te-oe-linux-gnueabi/tumbler/tumbler/latest lost dependency on  libbz2 libgsf libxml2
WARN: packages/armv5te-oe-linux-gnueabi/weston/weston-examples/latest lost dependency on  libpoppler-glib
WARN: packages/armv5te-oe-linux-gnueabi/wv/wv/latest lost dependency on  libpng
WARN: packages/armv5te-oe-linux-gnueabi/x11vnc/x11vnc/latest lost dependency on  libxtst
WARN: packages/armv5te-oe-linux-gnueabi/xfce4-power-manager/xfce4-power-manager/latest lost dependency on  libnotify3
WARN: packages/armv5te-oe-linux-gnueabi/xterm/xterm/latest lost dependency on  fontconfig libxft

Found errors: 
ERROR: test-dependencies/1377841454/3_min/packages/armv5te-oe-linux-gnueabi/qemu/qemu-locale-de-de/latest doesn't exist
ERROR: test-dependencies/1377841454/3_min/packages/armv5te-oe-linux-gnueabi/qemu/qemu-locale-fr-fr/latest doesn't exist
ERROR: test-dependencies/1377841454/3_min/packages/armv5te-oe-linux-gnueabi/qemu/qemu-locale-it/latest doesn't exist
ERROR: test-dependencies/1377841454/3_min/packages/armv5te-oe-linux-gnueabi/qemu/qemu-locale-tr/latest doesn't exist

QA:
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libswscale/usr/lib/libswscale.so.2.1.0' has relocations in .text
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libpostproc/usr/lib/libpostproc.so.52.0.0' has relocations in .text
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libavutil/usr/lib/libavutil.so.51.22.1' has relocations in .text
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libavformat/usr/lib/libavformat.so.53.21.1' has relocations in .text
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libavfilter/usr/lib/libavfilter.so.2.15.0' has relocations in .text
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libavdevice/usr/lib/libavdevice.so.53.2.0' has relocations in .text
libav-0.8.8: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libav/0.8.8-r0/packages-split/libavcodec/usr/lib/libavcodec.so.53.35.0' has relocations in .text
qtwebkit-5.1.0: package qtwebkit contains bad RPATH /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwebkit/5.1.0-r0/build/lib in file /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwebkit/5.1.0-r0/packages-split/qtwebkit/usr/lib/qt5/libexec/QtWebPluginProcess
qtwebkit-5.1.0: package qtwebkit contains bad RPATH /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwebkit/5.1.0-r0/build/lib in file /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwebkit/5.1.0-r0/packages-split/qtwebkit/usr/lib/qt5/libexec/QtWebProcess
qwt-6.0.1: File '/usr/lib/libqwt.so.6.0.1' from qwt was already stripped, this will prevent future debugging!
qwt-6.0.1: File '/usr/lib/libqwtmathml.so.6.0.1' from qwt was already stripped, this will prevent future debugging!
qwt-6.0.1: File '/usr/lib/qt4/plugins/designer/libqwt_designer_plugin.so' from qwt was already stripped, this will prevent future debugging!
ed-1.9: The /usr/share/info/dir file is not meant to be shipped in a particular package.
oscam-1.10+7974: File '/usr/bin/oscam' from oscam was already stripped, this will prevent future debugging!
aurora-daemon-0.1+gitrAUTOINC+b65354ad6c: aurora-daemon: found library in wrong location: /usr/share/aurora/applications/settings/libaurora-app-settings.so
quagga-0.99.21: The /usr/share/info/dir file is not meant to be shipped in a particular package.
gstreamer1.0-libav-1.0.9: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gstreamer1.0-libav/1.0.9-r1/packages-split/gstreamer1.0-libav/usr/lib/gstreamer-1.0/libgstlibav.so' has relocations in .text
inetutils-1.9.1: inetutils: Files/directories were installed but not shipped
  /usr/lib
emacs-23.4: The /usr/share/info/dir file is not meant to be shipped in a particular package.
lzip-1.14: The /usr/share/info/dir file is not meant to be shipped in a particular package.
atftp-0.7.1+gitAUTOINC+be3291a18c: atftp: Files/directories were installed but not shipped
  /etc
tracker-0.14.2: tracker: Files/directories were installed but not shipped
  /usr/lib/tracker-0.14/writeback-modules/libwriteback-taglib.so
  /usr/lib/tracker-0.14/writeback-modules/libwriteback-taglib.la
libpostproc-0.0.0+gitAUTOINC+3b7053f46d: ELF binary '/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libpostproc/0.0.0+gitAUTOINC+3b7053f46d-r1/packages-split/libpostproc/usr/lib/libpostproc.so.52.0.100' has relocations in .text
tracker-0.14.2: tracker: Files/directories were installed but not shipped
  /usr/share/gnome-panel
  /usr/share/gnome-panel/4.0
  /usr/share/gnome-panel/4.0/applets
  /usr/share/gnome-panel/4.0/applets/org.gnome.panel.SearchBar.panel-applet
  /usr/lib/tracker-0.14/writeback-modules/libwriteback-taglib.so
  /usr/lib/tracker-0.14/writeback-modules/libwriteback-taglib.la
> 
> The following changes since commit 72e23c12296fbc77193898c38426add58d0c2d71:
> 
>   mysql5: replace with mariadb 5.1.67 and tweak (2013-08-27 16:39:31 +0100)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib jansa/deps
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/deps
> 
> Martin Jansa (66):
>   gvfs: Add PACKAGECONFIG for fuse and disable it by default
>   libmikmod: upgrade to 3.2.0
>   gnome-desktop: Add startup-notification dependency
>   gnome-control-center: Add libxscrnsaver dependency
>   gnome-settings-daemon: add PACKAGECONFIG for pulseaudio
>   libgsf: Add PACKAGECONFIG for gdk-pixbuf
>   imagemagick: Add PACKAGECONFIG for jp2
>   libxklavier: Add libxi dependency
>   claws-mail: Add PACKAGECONFIG for enchant, dbus, ldap and
>     startup-notification
>   abiword: Add PACKAGECONFIG for collab-backends and spell
>   mkvtoolnix: Add PACKAGECONFIG for flac
>   uhd: Add PACKAGECONFIG for orc
>   entrance: Add PACKAGECONFIG for consolekit
>   expedite: Add PACKAGECONFIG for sdl
>   metacity: Add dependency on libgtop
>   libgtop: Add dependency on libxau
>   wv: Add PACKAGECONFIG for png
>   libetpan: Add dependency on curl
>   gnuradio: Add PACKAGECONFIG for jack and portaudio
>   fluidsynth: Add PACKAGECONFIG for sndfile, jack, pulseaudio, portaudio
>     and readline
>   vlc: Add PACKAGECONFIG for undeterministic dependencies
>   tracker: Add PACKAGECONFIG for undeterministic dependencies
>   mpd: Add PACKAGECONFIG for undeterministic dependencies
>   cherokee: Add PACKAGECONFIG for ffmpeg and ldap
>   collectd: Add PACKAGECONFIG for undeterministic dependencies
>   xchat: Add PACKAGECONFIG for dbus and openssl
>   xterm: Add fontconfig dependency
>   libwnck(3): Add dependency on libxres
>   e-wm: Add PACKAGECONFIG for pam
>   sox: Add PACKAGECONFIG for mad, id3tag and lame
>   gvfs: Add PACKAGECONFIG for archive, obexftp, cdda
>   upower: Add PACKAGECONFIG for idevice
>   udisks: Add PACKAGECONFIG for parted
>   imlib2: Add PACKAGECONFIG for gif, tiff, id3 and bzip2
>   openmotif: Add PACKAGECONFIG for jpeg and png
>   opencv: Add PACKAGECONFIG for jasper
>   gammu: Add dependency on glib-2.0
>   openbox: Add PACKAGECONFIG for imlib2, xrandr, xinerama, xcursor,
>     startup-notification
>   v4l-utils: Add libx11 dependency
>   epiphany: Add PACKAGECONFIG for zeroconf
>   libungif: Add dependency on libx11
>   libmemcached: Add PACKAGECONFIG for sasl
>   networkmanager: Add PACKAGECONFIG for concheck
>   proftpd: Add PACKAGECONFIG for curses
>   gnuplot: Add PACKAGECONFIG for cairo
>   gnome-mplayer: Add PACKAGECONFIG for gtk3
>   gimp: Add PACKAGECONFIG for bzip2, libxpm, libjasper and gudev
>   gegl: Add PACKAGECONFIG for jasper, avformat
>   edb: Add PACKAGECONFIG for ncurses
>   gnome-vfs: Add PACKAGECONFIG for fam
>   lightmediascanner: Add PACKAGECONFIG for ogg
>   mplayer2: Add PACKAGECONFIG for mpg123 and xss
>   maliit-framework: Add dependency on gtk+3
>   packagekit: Add PACKAGECONFIG for service-packs
>   orage: Add PACKAGECONFIG for notify and dependency on popt
>   thunar: Add PACKAGECONFIG for pcre
>   thunar-volman: Add PACKAGECONFIG for notify
>   tumbler: Add PACKAGECONFIG for gstreamer
>   xfce4-clipman-plugin: Add PACKAGECONFIG for unique
>   xfce4-places-plugin: Add PACKAGECONFIG for notify
>   xfce4-settings: Add PACKAGECONFIG for notify
>   xfdesktop: Add PACKAGECONFIG for notify
>   webkit-efl: Add dependency on gst-plugins-base
>   qt-creator: Add patch to resolve missing cpuid.h in ARM builds
>   xbmc: Add libmad dependency
>   qcanobserver: Move to nonworking
> 
>  meta-efl/recipes-efl/e17/e-wm.inc                  |   3 +
>  meta-efl/recipes-efl/efl/edb_svn.bb                |   3 +
>  meta-efl/recipes-efl/efl/entrance_svn.bb           |   3 +
>  meta-efl/recipes-efl/efl/expedite.inc              |   3 +
>  meta-efl/recipes-efl/efl/imlib2_svn.bb             |   6 +
>  meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   2 +-
>  .../lightmediascanner/lightmediascanner_0.4.4.bb   |   3 +
>  .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |   3 +
>  meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb  |  15 +-
>  .../recipes-gnome/epiphany/epiphany_2.30.6.bb      |   3 +
>  .../gnome-control-center_2.32.1.bb                 |   2 +-
>  .../gnome-desktop/gnome-desktop3_3.0.2.bb          |   2 +-
>  .../gnome-desktop/gnome-desktop_2.32.1.bb          |   2 +-
>  .../gnome-settings-daemon_2.32.1.bb                |   3 +
>  .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |   1 +
>  meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb       |   7 +-
>  meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb  |   3 +
>  meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb |   2 +-
>  meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   2 +-
>  meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   2 +-
>  .../recipes-gnome/libxklavier/libxklavier_5.0.bb   |   2 +-
>  .../recipes-gnome/metacity/metacity_2.34.13.bb     |   2 +-
>  meta-gnome/recipes-gnome/wv/wv_1.2.0.bb            |   3 +
>  .../recipes-mediacentre/xbmc/xbmc_git.bb           |   2 +-
>  .../recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb     |   3 +
>  .../fluidsynth/fluidsynth_1.1.1.bb                 |   7 +
>  .../recipes-multimedia/musicpd/mpd_0.17.1.bb       |   8 +
>  .../recipes-multimedia/sox/sox_14.4.0.bb           |   3 +
>  meta-multimedia/recipes-multimedia/vlc/vlc.inc     |  20 +-
>  .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   3 +
>  .../recipes-support/libmemcached/libmemcached.inc  |   3 +
>  meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb |   2 +-
>  ...n-t-add-usr-include-and-usr-lib-to-config.patch |  58 ----
>  .../gnuradio/allow-to-disable-jack-portaudio.patch |  34 ++
>  .../recipes-connectivity/gnuradio/gnuradio_git.bb  |   4 +
>  .../networkmanager/networkmanager_0.9.8.0.bb       |   1 +
>  meta-oe/recipes-connectivity/uhd/uhd.inc           |   3 +
>  .../packagekit/packagekit_0.5.6.bb                 |   3 +
>  .../recipes-extended/collectd/collectd_5.2.2.bb    |   7 +
>  meta-oe/recipes-extended/gnuplot/gnuplot.inc       |   5 +-
>  .../recipes-extended/libungif/libungif_4.1.3.bb    |   2 +
>  meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb        |   4 +
>  meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb        |   6 +
>  meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb  |   7 +
>  meta-oe/recipes-graphics/xorg-app/xterm_293.bb     |   2 +-
>  .../mikmod/libmikmod/CVE-2010-2971.patch           |  24 --
>  .../mikmod/libmikmod/ldflags.patch                 |   4 +-
>  .../{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb}    |   7 +-
>  meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |   2 +
>  .../recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb |   2 +-
>  .../qcanobserver/qcanobserver-socketcan_svn.bb     |   0
>  ...erinterface.cpp-add-sys-socket.h-as-inclu.patch |   0
>  .../0002-qconsole-writethread-gcc-4.5-fixes.patch  |   0
>  .../qcanobserver/qcanobserver/candemo.xml          |   0
>  .../qcanobserver/qcanobserver_svn.bb               |   0
>  .../qt-creator/fix.missing.cpuid.h.patch           | 384 +++++++++++++++++++++
>  meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb  |   4 +-
>  .../recipes-sato/claws-mail/claws-mail_3.9.0.bb    |   6 +
>  .../imagemagick/imagemagick_6.8.6.bb               |   3 +
>  meta-oe/recipes-support/libetpan/libetpan_0.57.bb  |   2 +-
>  .../recipes-support/maliit/maliit-framework_git.bb |   1 +
>  meta-oe/recipes-support/opencv/opencv_2.4.3.bb     |   3 +
>  .../recipes-support/openmotif/openmotif_2.3.3.bb   |   4 +
>  meta-oe/recipes-support/tracker/tracker_0.14.2.bb  |  12 +-
>  meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   3 +
>  meta-oe/recipes-support/upower/upower_0.9.14.bb    |   3 +
>  meta-oe/recipes-support/xchat/xchat_2.8.8.bb       |   4 +
>  .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |   4 +
>  meta-xfce/recipes-apps/orage/orage_4.8.4.bb        |   5 +-
>  .../clipman/xfce4-clipman-plugin_1.2.3.bb          |   3 +
>  .../places/xfce4-places-plugin_1.5.0.bb            |   3 +
>  .../thunar-volman/thunar-volman_0.8.0.bb           |   3 +
>  meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb      |   3 +
>  meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb   |   3 +
>  .../xfce4-settings/xfce4-settings_4.11.0.bb        |   3 +
>  .../recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb     |   3 +
>  76 files changed, 648 insertions(+), 114 deletions(-)
>  delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
>  create mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
>  delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
>  rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb} (73%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver-socketcan_svn.bb (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/candemo.xml (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver_svn.bb (100%)
>  create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch
> 
> -- 
> 1.8.3.2
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [WIP][PATCH 02/66] libmikmod: upgrade to 3.2.0

[Marko Lindqvist]

On 29 August 2013 21:29, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Aug 29, 2013 at 07:27:54PM +0300, Marko Lindqvist wrote:
>> On 29 August 2013 18:50, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > * 3.3 is only beta
>> > * 3.1.12 was failing to build with texinfo-5, see
>> >   http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/
>>
>>  As libSDL-mixer dependency, and thus recursive dependency for many
>> recipes in meta-games, this is important for me. In my local tree I've
>> solved the build issue by simply patching doc building part away. Let
>> me know if you want that patch (say, to go in to stable branch instead
>> of full version upgrade)
>
> I was thinking about it, but if you confirm that 3.2.0 doesn't break any
> of your games I'm fine with it.

 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>


 - ML

Re: [WIP][PATCH 00/66] Deterministic dependencies II

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 11380 bytes --]

On Thu, Aug 29, 2013 at 05:50:53PM +0200, Martin Jansa wrote:
> WIP because verification build is still running and I must admit that I'm mostly
> testing that all dependencies are correctly "disabled" and in the end deterministic.
> 
> I'm not testing if every possible combination of PACKAGECONFIG options provide sufficient
> dependency tree.
> 
> The following changes since commit 72e23c12296fbc77193898c38426add58d0c2d71:
> 
>   mysql5: replace with mariadb 5.1.67 and tweak (2013-08-27 16:39:31 +0100)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib jansa/deps
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/deps
> 
> Martin Jansa (66):
>   gvfs: Add PACKAGECONFIG for fuse and disable it by default
>   libmikmod: upgrade to 3.2.0
>   gnome-desktop: Add startup-notification dependency
>   gnome-control-center: Add libxscrnsaver dependency
>   gnome-settings-daemon: add PACKAGECONFIG for pulseaudio
>   libgsf: Add PACKAGECONFIG for gdk-pixbuf
>   imagemagick: Add PACKAGECONFIG for jp2
>   libxklavier: Add libxi dependency
>   claws-mail: Add PACKAGECONFIG for enchant, dbus, ldap and
>     startup-notification
>   abiword: Add PACKAGECONFIG for collab-backends and spell
>   mkvtoolnix: Add PACKAGECONFIG for flac
>   uhd: Add PACKAGECONFIG for orc
>   entrance: Add PACKAGECONFIG for consolekit
>   expedite: Add PACKAGECONFIG for sdl
>   metacity: Add dependency on libgtop
>   libgtop: Add dependency on libxau
>   wv: Add PACKAGECONFIG for png
>   libetpan: Add dependency on curl
>   gnuradio: Add PACKAGECONFIG for jack and portaudio
>   fluidsynth: Add PACKAGECONFIG for sndfile, jack, pulseaudio, portaudio
>     and readline
>   vlc: Add PACKAGECONFIG for undeterministic dependencies
>   tracker: Add PACKAGECONFIG for undeterministic dependencies
>   mpd: Add PACKAGECONFIG for undeterministic dependencies
>   cherokee: Add PACKAGECONFIG for ffmpeg and ldap
>   collectd: Add PACKAGECONFIG for undeterministic dependencies
>   xchat: Add PACKAGECONFIG for dbus and openssl
>   xterm: Add fontconfig dependency
>   libwnck(3): Add dependency on libxres
>   e-wm: Add PACKAGECONFIG for pam
>   sox: Add PACKAGECONFIG for mad, id3tag and lame
>   gvfs: Add PACKAGECONFIG for archive, obexftp, cdda
>   upower: Add PACKAGECONFIG for idevice
>   udisks: Add PACKAGECONFIG for parted
>   imlib2: Add PACKAGECONFIG for gif, tiff, id3 and bzip2
>   openmotif: Add PACKAGECONFIG for jpeg and png
>   opencv: Add PACKAGECONFIG for jasper
>   gammu: Add dependency on glib-2.0
>   openbox: Add PACKAGECONFIG for imlib2, xrandr, xinerama, xcursor,
>     startup-notification
>   v4l-utils: Add libx11 dependency
>   epiphany: Add PACKAGECONFIG for zeroconf
>   libungif: Add dependency on libx11
>   libmemcached: Add PACKAGECONFIG for sasl
>   networkmanager: Add PACKAGECONFIG for concheck
>   proftpd: Add PACKAGECONFIG for curses
>   gnuplot: Add PACKAGECONFIG for cairo
>   gnome-mplayer: Add PACKAGECONFIG for gtk3
>   gimp: Add PACKAGECONFIG for bzip2, libxpm, libjasper and gudev
>   gegl: Add PACKAGECONFIG for jasper, avformat
>   edb: Add PACKAGECONFIG for ncurses
>   gnome-vfs: Add PACKAGECONFIG for fam
>   lightmediascanner: Add PACKAGECONFIG for ogg
>   mplayer2: Add PACKAGECONFIG for mpg123 and xss
>   maliit-framework: Add dependency on gtk+3
>   packagekit: Add PACKAGECONFIG for service-packs
>   orage: Add PACKAGECONFIG for notify and dependency on popt
>   thunar: Add PACKAGECONFIG for pcre
>   thunar-volman: Add PACKAGECONFIG for notify
>   tumbler: Add PACKAGECONFIG for gstreamer
>   xfce4-clipman-plugin: Add PACKAGECONFIG for unique
>   xfce4-places-plugin: Add PACKAGECONFIG for notify
>   xfce4-settings: Add PACKAGECONFIG for notify
>   xfdesktop: Add PACKAGECONFIG for notify
>   webkit-efl: Add dependency on gst-plugins-base
>   qt-creator: Add patch to resolve missing cpuid.h in ARM builds
>   xbmc: Add libmad dependency
>   qcanobserver: Move to nonworking
> 
>  meta-efl/recipes-efl/e17/e-wm.inc                  |   3 +
>  meta-efl/recipes-efl/efl/edb_svn.bb                |   3 +
>  meta-efl/recipes-efl/efl/entrance_svn.bb           |   3 +
>  meta-efl/recipes-efl/efl/expedite.inc              |   3 +
>  meta-efl/recipes-efl/efl/imlib2_svn.bb             |   6 +
>  meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   2 +-
>  .../lightmediascanner/lightmediascanner_0.4.4.bb   |   3 +
>  .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |   3 +
>  meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb  |  15 +-
>  .../recipes-gnome/epiphany/epiphany_2.30.6.bb      |   3 +
>  .../gnome-control-center_2.32.1.bb                 |   2 +-
>  .../gnome-desktop/gnome-desktop3_3.0.2.bb          |   2 +-
>  .../gnome-desktop/gnome-desktop_2.32.1.bb          |   2 +-
>  .../gnome-settings-daemon_2.32.1.bb                |   3 +
>  .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |   1 +
>  meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb       |   7 +-
>  meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb  |   3 +
>  meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb |   2 +-
>  meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   2 +-
>  meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   2 +-
>  .../recipes-gnome/libxklavier/libxklavier_5.0.bb   |   2 +-
>  .../recipes-gnome/metacity/metacity_2.34.13.bb     |   2 +-
>  meta-gnome/recipes-gnome/wv/wv_1.2.0.bb            |   3 +
>  .../recipes-mediacentre/xbmc/xbmc_git.bb           |   2 +-
>  .../recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb     |   3 +
>  .../fluidsynth/fluidsynth_1.1.1.bb                 |   7 +
>  .../recipes-multimedia/musicpd/mpd_0.17.1.bb       |   8 +
>  .../recipes-multimedia/sox/sox_14.4.0.bb           |   3 +
>  meta-multimedia/recipes-multimedia/vlc/vlc.inc     |  20 +-
>  .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   3 +
>  .../recipes-support/libmemcached/libmemcached.inc  |   3 +
>  meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb |   2 +-
>  ...n-t-add-usr-include-and-usr-lib-to-config.patch |  58 ----
>  .../gnuradio/allow-to-disable-jack-portaudio.patch |  34 ++
>  .../recipes-connectivity/gnuradio/gnuradio_git.bb  |   4 +
>  .../networkmanager/networkmanager_0.9.8.0.bb       |   1 +
>  meta-oe/recipes-connectivity/uhd/uhd.inc           |   3 +
>  .../packagekit/packagekit_0.5.6.bb                 |   3 +
>  .../recipes-extended/collectd/collectd_5.2.2.bb    |   7 +
>  meta-oe/recipes-extended/gnuplot/gnuplot.inc       |   5 +-
>  .../recipes-extended/libungif/libungif_4.1.3.bb    |   2 +
>  meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb        |   4 +
>  meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb        |   6 +
>  meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb  |   7 +
>  meta-oe/recipes-graphics/xorg-app/xterm_293.bb     |   2 +-
>  .../mikmod/libmikmod/CVE-2010-2971.patch           |  24 --
>  .../mikmod/libmikmod/ldflags.patch                 |   4 +-
>  .../{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb}    |   7 +-
>  meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |   2 +
>  .../recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb |   2 +-
>  .../qcanobserver/qcanobserver-socketcan_svn.bb     |   0
>  ...erinterface.cpp-add-sys-socket.h-as-inclu.patch |   0
>  .../0002-qconsole-writethread-gcc-4.5-fixes.patch  |   0
>  .../qcanobserver/qcanobserver/candemo.xml          |   0
>  .../qcanobserver/qcanobserver_svn.bb               |   0
>  .../qt-creator/fix.missing.cpuid.h.patch           | 384 +++++++++++++++++++++
>  meta-oe/recipes-qt/qt-creator/qt-creator_2.8.0.bb  |   4 +-
>  .../recipes-sato/claws-mail/claws-mail_3.9.0.bb    |   6 +
>  .../imagemagick/imagemagick_6.8.6.bb               |   3 +
>  meta-oe/recipes-support/libetpan/libetpan_0.57.bb  |   2 +-
>  .../recipes-support/maliit/maliit-framework_git.bb |   1 +
>  meta-oe/recipes-support/opencv/opencv_2.4.3.bb     |   3 +
>  .../recipes-support/openmotif/openmotif_2.3.3.bb   |   4 +
>  meta-oe/recipes-support/tracker/tracker_0.14.2.bb  |  12 +-
>  meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   3 +
>  meta-oe/recipes-support/upower/upower_0.9.14.bb    |   3 +
>  meta-oe/recipes-support/xchat/xchat_2.8.8.bb       |   4 +
>  .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |   4 +
>  meta-xfce/recipes-apps/orage/orage_4.8.4.bb        |   5 +-
>  .../clipman/xfce4-clipman-plugin_1.2.3.bb          |   3 +
>  .../places/xfce4-places-plugin_1.5.0.bb            |   3 +
>  .../thunar-volman/thunar-volman_0.8.0.bb           |   3 +
>  meta-xfce/recipes-xfce/thunar/thunar_1.6.3.bb      |   3 +
>  meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb   |   3 +
>  .../xfce4-settings/xfce4-settings_4.11.0.bb        |   3 +
>  .../recipes-xfce/xfdesktop/xfdesktop_4.10.2.bb     |   3 +
>  76 files changed, 648 insertions(+), 114 deletions(-)
>  delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
>  create mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
>  delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
>  rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb} (73%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver-socketcan_svn.bb (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver/candemo.xml (100%)
>  rename meta-oe/recipes-qt/{ => nonworking}/qcanobserver/qcanobserver_svn.bb (100%)
>  create mode 100644 meta-oe/recipes-qt/qt-creator/qt-creator/fix.missing.cpuid.h.patch

I'm going to merge safe parts of this patchset, keeping only

pick 5632297 epiphany: Add PACKAGECONFIG for zeroconf
pick f8b64a5 gammu: Add dependency on glib-2.0
pick d193506 gimp: Add PACKAGECONFIG for bzip2, libxpm, libjasper and gudev
pick 2ab9b3f gnome-mplayer: Add PACKAGECONFIG for gtk3
pick ff23a5f gnuradio: Add PACKAGECONFIG for jack and portaudio
pick 4871ab0 tracker: Add PACKAGECONFIG for undeterministic dependencies
pick 8518b86 libungif: Add dependency on libx11
pick e8f1480 libungif: update to upstream version 4.1.4
pick b6c5b5a maliit-framework: Add dependency on gtk+3
pick 08fe2ae mpd: Add PACKAGECONFIG for undeterministic dependencies
pick 732895b mplayer2: Add PACKAGECONFIG for mpg123 and xss
pick 7e092a9 opencv: Add PACKAGECONFIG for jasper
pick 5ec16a8 thunar: Add PACKAGECONFIG for pcre
pick f98ad91 thunar-volman: Add PACKAGECONFIG for notify
pick 3cbef57 tk: Add fontconfig dependency
pick e4020db tumbler: Add PACKAGECONFIG for gstreamer
pick b2f59f5 vlc: Add PACKAGECONFIG for undeterministic dependencies
pick 57e14dc wv: Add PACKAGECONFIG for png
pick 8a39b4c xterm: Add fontconfig dependency

because in these recipes there are still autodetected dependencies, so
the change didn't work or didn't fix it completely.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [WIP][PATCH 39/66] v4l-utils: Add libx11 dependency

[Otavio Salvador]

On Thu, Aug 29, 2013 at 12:51 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * configure doesn't allow to explicitly disable it
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
...
> +DEPENDS = "jpeg virtual/libx11"
...

This should be done depending on DISTRO_FEATURES setting.

This broke non-X11 builds here :-(

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750