[meta-oe][dylan][PATCH 00/60] Backports for deterministic dependencies

[meta-oe][dylan][PATCH 00/60] Backports for deterministic dependencies

[Martin Jansa]

The following changes since commit 13ae5105ee30410136beeae66ec41ee4a8a2e2b0:

  icon-slicer: fix native build by depending on gdk-pixbuf only (2013-05-28 09:58:04 +0200)

are available in the git repository at:

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

Martin Jansa (57):
  vsftpd: add missing dependency on openssl
  fbida: define -I when checking jpeg version
  xorg-sgml-doctools: add missing dependency on util-macros
  gypsy: add dependency on libxslt-native
  media-ctl: inherit pkgconfig
  rsyslog: inherit pkgconfig
  libspatialite: add missing dependency on sqlite3
  ruby: add missing dependency on ruby-native
  cpufrequtils: inherit gettext
  cryptsetup: add missing dependency on libgcrypt
  gsoap: add missing dependency on zlib
  wbxml2: add missing dependency on expat
  iso-codes: add missing dependency on gettext-native
  portaudio: explicitly disable oss, add PACKAGECONFIG for alsa and jack
  mysql5: prevent using bundled zlib at all costs
  portaudio: inherit pkgconfig
  f2fs-tools: add util-linux dependency
  lcdproc5: add PACKAGECONFIG for libftdi, libusb
  openldap: convert to PACKAGECONFIGs, explicitly disable openssl
  samba: use more specific LICENSE
  samba: add dependency on zlib popt, PACKAGECONFIG for pam
  jack: add dependency on libsaplerate0 and readline
  glog: add dependency on libunwind
  lvm2: add PACKAGECONFIG for readline
  libunwind: add PACKAGECONFIG for lzma
  ntp: add PACKAGECONFIG for libcap and readline
  vim: add PACKAGECONFIG for acl
  mkvtoolnix: inherit gettext and export RUBYLIB
  rrdtool: add PACKAGECONFIG for dbi
  loudmouth: add dependency on libidn
  cifs-utils: add PACKAGECONFIG for libcap
  atftp: add PACKAGECONFIG for pcre, readline, tcp-wrapper
  fbida: add dependency on curl libungif tiff
  mbuffer: add PACKAGECONFIG for md5
  inetutils: add PACKAGECONFIG for ftp and uucpd
  jasper: add PACKAGECONFIG for jpeg
  joe: add PACKAGECONFIG for joe
  krb5: add PACKAGECONFIG for openssl and libedit
  libass: add PACKAGECONFIG for harfbuzz
  links: add PACKAGECONFIG for bzip2, lzma
  quagga: add PACKAGECONFIG for capabilities
  sox: add PACKAGECONFIG for magic and wavpack
  usbmuxd: add PACKAGECONFIG for plist
  usbmuxd: fix unpackaged files
  libav: add PACKAGECONFIG for bzip2 and jack
  libnice: add PACKAGECONFIG for gupnp
  farsight2: add PACKAGECONFIG for gupnp
  x264: explicitly disable swscale
  libftdi: add PACKAGECONFIG for cpp-wrapper
  ntfs-3g-ntfsprogs: add packageconfig for uuid
  openldap: add dependency on util-linux
  smbnetfs: add packageconfig for gnome-keyring
  libgphoto2: add configure option for gd and add PACKAGECONFIG
  libgphoto2: add PACKAGECONFIG for serial
  samba: add packageconfig for fam
  ruby: add dependency on db gdbm readline
  cifs-utils: inherit pkgconfig

Mihai Prica (1):
  python-feedparser: Changed from distutils to setuptools

Paul Barker (1):
  fluidsynth: added dependency on glib

Roy.Li (1):
  cyrus-sasl: Avoid to call AC_TRY_RUN

 .../recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb     |   8 +-
 .../fluidsynth/fluidsynth_1.1.1.bb                 |   2 +-
 .../recipes-multimedia/sox/sox_14.4.0.bb           |   3 +
 .../inetutils/inetutils_1.9.1.bb                   |   5 +
 meta-networking/recipes-daemons/atftp/atftp_git.bb |   5 +
 .../cyrus-sasl/cyrus-sasl_2.1.26.bb                |   6 +-
 .../files/avoid-to-call-AC_TRY_RUN.patch           |  46 +++++++
 .../recipes-daemons/vsftpd/vsftpd_2.3.5.bb         |   2 +-
 .../recipes-protocols/quagga/quagga.inc            |   3 +
 .../recipes-support/cifs/cifs-utils_git.bb         |   5 +-
 meta-networking/recipes-support/ntp/ntp.inc        |   2 +
 meta-oe/recipes-connectivity/krb5/krb5_1.11.bb     |   4 +
 .../loudmouth/loudmouth_1.4.3.bb                   |   2 +-
 meta-oe/recipes-connectivity/samba/samba.inc       |  10 +-
 .../recipes-connectivity/smbnetfs/smbnetfs_git.bb  |   3 +
 .../recipes-connectivity/usbmuxd/usbmuxd_git.bb    |   5 +
 .../recipes-core/f2fs-tools/f2fs-tools_1.1.0.bb    |   3 +
 .../python/python-feedparser_5.1.3.bb              |   2 +-
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc      |   8 +-
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb  |   3 +
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |   2 +-
 meta-oe/recipes-graphics/fbida/fbida_2.09.bb       |   4 +-
 .../libgphoto2-2.4.11/allow.to.disable.gd.patch    |  33 +++++
 .../recipes-graphics/gphoto2/libgphoto2_2.4.11.bb  |   7 +-
 meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb  |   3 +
 .../xorg-doc/xorg-sgml-doctools_1.7.bb             |   2 +
 meta-oe/recipes-multimedia/jack/jack_0.121.0.bb    |   3 +-
 meta-oe/recipes-multimedia/libass/libass.inc       |   3 +
 meta-oe/recipes-multimedia/libav/libav.inc         |   4 +
 .../recipes-multimedia/v4l2apps/media-ctl_git.bb   |   2 +-
 meta-oe/recipes-multimedia/x264/x264_git.bb        |   1 +
 meta-oe/recipes-navigation/gypsy/gypsy.inc         |   2 +-
 .../libspatialite/libspatialite.inc                |   2 +-
 .../cpufrequtils/cpufrequtils_008.bb               |   2 +
 .../recipes-support/cryptsetup/cryptsetup_1.6.1.bb |   2 +-
 .../recipes-support/farsight/farsight2_0.0.22.bb   |   3 +
 meta-oe/recipes-support/farsight/libnice_0.0.13.bb |   3 +
 meta-oe/recipes-support/glog/glog.inc              |   2 +
 meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb      |   2 +-
 meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb |   4 +
 meta-oe/recipes-support/joe/joe_3.1.bb             |   4 +-
 meta-oe/recipes-support/libftdi/libftdi_0.19.bb    |   3 +
 meta-oe/recipes-support/libunwind/libunwind.inc    |   3 +
 meta-oe/recipes-support/links/links.inc            |   4 +
 meta-oe/recipes-support/lvm2/lvm2.inc              |   3 +
 .../recipes-support/mbuffer/mbuffer_20091227.bb    |   3 +
 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc    |   2 +-
 .../ntfs-3g-ntfsprogs_2011.4.12.bb                 |   3 +
 .../recipes-support/openldap/openldap_2.4.23.bb    | 138 +++++++--------------
 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb  |   2 +
 .../recipes-support/portaudio/portaudio-v19_svn.bb |  12 +-
 meta-oe/recipes-support/vim/vim.inc                |   1 +
 meta-ruby/recipes-devtools/ruby/ruby.inc           |   4 +-
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb |   2 -
 54 files changed, 273 insertions(+), 124 deletions(-)
 create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/files/avoid-to-call-AC_TRY_RUN.patch
 create mode 100644 meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/allow.to.disable.gd.patch

-- 
1.8.3.2

[meta-oe][dylan][PATCH 01/60] vsftpd: add missing dependency on openssl

[Martin Jansa]

From: Martin Jansa <martin.jansa@gmail.com>

* Fails without openssl in sysroot:
  | i586-webos-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86 -o vsftpd main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o tunables.o ftpdataio.o secbuf.o ls.o postprivparent.o logging.o str.o netstr.o sysstr.o strlist.o banner.o filestr.o parseconf.o secutil.o ascii.o oneprocess.o twoprocess.o privops.o standalone.o hash.o tcpwrap.o ipaddrparse.o access.o features.o readwrite.o opts.o ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o  -lssl -lcrypto -lnsl -lresolv -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lcrypt -lcap
  | /OE/sysroots/x86_64-linux/usr/libexec/i586-webos-linux/gcc/i586-webos-linux/4.7.2/ld: cannot find -lssl
  | /OE/sysroots/x86_64-linux/usr/libexec/i586-webos-linux/gcc/i586-webos-linux/4.7.2/ld: cannot find -lcrypto
  | collect2: error: ld returned 1 exit status

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
---
 meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
index c02ee9c..f146910 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
@@ -4,7 +4,7 @@ SECTION = "network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
 
-DEPENDS = "libcap"
+DEPENDS = "libcap openssl"
 
 SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \
            file://makefile-destdir.patch \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 02/60] cyrus-sasl: Avoid to call AC_TRY_RUN

[Martin Jansa]

From: "Roy.Li" <rongqing.li@windriver.com>

If the gssapi libraries are compiled before cyrus-sasl, configure will call
AC_TRY_RUN to check if gssapi libraries support SPNEGO, but calling AC_TRY_RUN
will fail on cross-compile environment.

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
---
 .../cyrus-sasl/cyrus-sasl_2.1.26.bb                |  6 ++-
 .../files/avoid-to-call-AC_TRY_RUN.patch           | 46 ++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/files/avoid-to-call-AC_TRY_RUN.patch

diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
index 0113025..6793e85 100644
--- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
@@ -4,7 +4,8 @@ DEPENDS = "openssl virtual/db"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396"
 
-SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz "
+SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \
+	   file://avoid-to-call-AC_TRY_RUN.patch"
 
 inherit autotools pkgconfig
 
@@ -14,6 +15,9 @@ EXTRA_OECONF += "--with-dblib=berkeley \
                  --without-pam --without-opie --without-des \
                  andrew_cv_runpath_switch=none"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5,"
+
 do_configure_prepend () {
     rm -f acinclude.m4 config/libtool.m4
 }
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/files/avoid-to-call-AC_TRY_RUN.patch b/meta-networking/recipes-daemons/cyrus-sasl/files/avoid-to-call-AC_TRY_RUN.patch
new file mode 100644
index 0000000..6407721
--- /dev/null
+++ b/meta-networking/recipes-daemons/cyrus-sasl/files/avoid-to-call-AC_TRY_RUN.patch
@@ -0,0 +1,46 @@
+Avoid to call AC_TRY_RUN
+
+Upstream-Status: Inappropriate [configuration]
+
+Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO
+on cross-compile environment by definition AC_ARG_ENABLE enable-spnego
+
+Signed-off-by: Roy.Li <rongqing.li@windriver.com>
+---
+ cmulocal/sasl2.m4 |   13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4
+index 3c2841a..a5ecf81 100644
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
+@@ -281,6 +281,17 @@ if test "$gssapi" != no; then
+ 
+   cmu_save_LIBS="$LIBS"
+   LIBS="$LIBS $GSSAPIBASE_LIBS"
++  AC_ARG_ENABLE([spnego],
++              [AC_HELP_STRING([--enable-spnego=<DIR>],
++                              [enable SPNEGO support in GSSAPI libraries [no]])],
++              [spnego=$enableval],
++              [spnego=no])
++
++  if test "$spnego" = no; then
++       echo "no"
++  elif test "$spnego" = yes; then
++       AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
++  else
+   AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])
+   AC_TRY_RUN([
+ #ifdef HAVE_GSSAPI_H
+@@ -308,7 +319,7 @@ int main(void)
+ 	AC_MSG_RESULT(yes) ],
+ 	AC_MSG_RESULT(no))
+   LIBS="$cmu_save_LIBS"
+-
++   fi
+ else
+   AC_MSG_RESULT([disabled])
+ fi
+-- 
+1.7.10.4
+
-- 
1.8.3.2

[meta-oe][dylan][PATCH 03/60] python-feedparser: Changed from distutils to setuptools

[Martin Jansa]

From: Mihai Prica <mihai.prica@intel.com>

This package uses setuptools not distutils.

Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/python/python-feedparser_5.1.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/python/python-feedparser_5.1.3.bb b/meta-oe/recipes-devtools/python/python-feedparser_5.1.3.bb
index 38cd53f..92d5568 100644
--- a/meta-oe/recipes-devtools/python/python-feedparser_5.1.3.bb
+++ b/meta-oe/recipes-devtools/python/python-feedparser_5.1.3.bb
@@ -10,5 +10,5 @@ SRC_URI[sha256sum] = "7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b95
 
 S = "${WORKDIR}/feedparser-${PV}"
 
-inherit distutils
+inherit setuptools
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 04/60] fluidsynth: added dependency on glib

[Martin Jansa]

From: Paul Barker <paul@paulbarker.me.uk>

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a989e76..a5e65c4 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
@@ -4,7 +4,7 @@ SECTION = "libs/multimedia"
 LICENSE = "LGPLv-2.0+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dda26baa823649da9a68947707650272"
 
-DEPENDS = "alsa-lib ncurses"
+DEPENDS = "alsa-lib ncurses glib-2.0"
 
 SRC_URI = "http://savannah.nongnu.org/download/fluid/${P}.tar.gz"
 SRC_URI[md5sum] = "0db3da78028d255026230809c6e21b44"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 05/60] fbida: define -I when checking jpeg version

[Martin Jansa]

* echo JPEG_LIB_VERSION | i586-starfish-linux-cpp -include jpeglib.h |
  tail -n 1

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

diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index 02ea57f..aa4c1ca 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "STRIP="
 
 do_compile() {
-    sed -i -e 's: cpp: ${TARGET_PREFIX}cpp:g' GNUmakefile
+    sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
     oe_runmake
 }
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 06/60] xorg-sgml-doctools: add missing dependency on util-macros

[Martin Jansa]

* fails without:
  | configure.ac:32: error: must install xorg-macros 1.8 or later before
  running autoconf/autogen

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
index 502723c..80f1f00 100644
--- a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
+++ b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
@@ -2,6 +2,8 @@ require xorg-doc-common.inc
 PE = "1"
 PR = "${INC_PR}.0"
 
+DEPENDS += "util-macros"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449"
 
 SRC_URI[md5sum] = "2588efb3f49f7fc6ecf41ce42e0b2e5e"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 07/60] gypsy: add dependency on libxslt-native

[Martin Jansa]

* it's incorrectly used in build (and just "o" is used instead of xslt
  command):
  | o gypsy-discovery.xml ../docs/tools/spec-strip-docs.xsl gypsy-discovery-full.xml
  | /bin/bash: o: command not found

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/gypsy/gypsy.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/gypsy/gypsy.inc b/meta-oe/recipes-navigation/gypsy/gypsy.inc
index 0c1735e..ba54356 100644
--- a/meta-oe/recipes-navigation/gypsy/gypsy.inc
+++ b/meta-oe/recipes-navigation/gypsy/gypsy.inc
@@ -6,7 +6,7 @@ client applications, passing the data as simple values for the clients \
 to use."
 LICENSE = "GPLv2.0 & LGPLv2.1"
 SECTION = "x11"
-DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
+DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt-native"
 
 inherit autotools pkgconfig gtk-doc
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 08/60] media-ctl: inherit pkgconfig

[Martin Jansa]

* without pkgconfig it's failing to expand PKG_CHECK_MODULES macro:
  | media-ctl/0.0.1-r3/git/configure:
    line 11700: syntax error near unexpected token `libudev,'
  | media-ctl/0.0.1-r3/git/configure:
    line 11700: `  PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)'

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

diff --git a/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb b/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb
index d96c1f9..8e24d5d 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb
@@ -9,7 +9,7 @@ PV = "0.0.1"
 PR = "r3"
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools pkgconfig
 
 # It needs some kernel definitions only for v4l2, so it isn't machine specific
 EXTRA_OECONF = "--with-kernel-headers=${STAGING_KERNEL_DIR}"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 09/60] rsyslog: inherit pkgconfig

[Martin Jansa]

* without pkgconfig it's failing to expand PKG_CHECK_MODULES macro:
  | rsyslog-5.8.0/configure: line 16111: syntax error near unexpected token `GNUTLS,'
  | rsyslog-5.8.0/configure: line 16111: `    PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0)'

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

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index 5cfd236..4b2935f 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -10,7 +10,7 @@ INC_PR = "r8"
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
            file://rsyslog.conf"
            
-inherit autotools systemd
+inherit autotools pkgconfig systemd
 
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 10/60] libspatialite: add missing dependency on sqlite3

[Martin Jansa]

* do_configure fails without:
  | checking for sqlite3.h... no
  | configure: error: cannot find sqlite3.h, bailing out

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/libspatialite/libspatialite.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite.inc b/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
index f51b3a5..c8d7ec1 100644
--- a/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities"
 HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/"
 SECTION = "libs"
-DEPENDS = "proj geos"
+DEPENDS = "proj geos sqlite3"
 
 INC_PR = "r0"
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 11/60] ruby: add missing dependency on ruby-native

[Martin Jansa]

* without ruby available on host it fails:
  | NOTE: make LIBRUBYARG=-lruby-static
  |       CC = i586-starfish-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86
  |       LD = i586-starfish-linux-ld --sysroot=/OE/sysroots/qemux86
  |       LDSHARED = i586-starfish-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86 -shared
  |       CFLAGS = -O2 -pipe -g -feliminate-unused-debug-types -fPIC
  |       XCFLAGS = -include ruby/config.h -include ruby/missing.h -fvisibility=hidden -DRUBY_EXPORT
  |       CPPFLAGS =   -I. -I.ext/include/i386-linux -I./include -I.
  |       DLDFLAGS = -Wl,-soname,libruby.so.1.9
  |       SOLIBS = -lpthread -lrt -ldl -lcrypt -lm
  | executable host ruby is required. use --with-baseruby option.
  | make: *** [.rbconfig.time] Error 1
---
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
index 6611ce1..bed678e 100644
--- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
+++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
@@ -1,7 +1,7 @@
 require ruby.inc
 PR = "${INC_PR}.0"
 
-DEPENDS += "libyaml"
+DEPENDS += "libyaml ruby-native"
 
 SRC_URI += "\
     file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 12/60] cpufrequtils: inherit gettext

[Martin Jansa]

* build without gettext-native fails with:
  | Building ccdv
  | /bin/sh: 1: xgettext: not found

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

diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb
index bd631af..e74fa44 100644
--- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb
+++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb
@@ -1,5 +1,7 @@
 DESCRIPTION = "To make access to the Linux kernel cpufreq subsystem easier for users and cpufreq userspace tools, a cpufrequtils package was created"
 
+inherit gettext
+
 DEPENDS = "libtool-cross"
 
 LICENSE = "GPLv2"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 13/60] cryptsetup: add missing dependency on libgcrypt

[Martin Jansa]

* there is PACKAGECONFIG for libgcrypt, but do_configure fails
  without macro staged by libgcrypt:
  configure.ac:122: error: possibly undefined macro: AM_PATH_LIBGCRYPT

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

diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb
index 17ac2ad..95f7e8d 100644
--- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb
+++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb
@@ -9,7 +9,7 @@ SECTION = "console"
 LICENSE = "GPL-2.0-with-OpenSSL-exception"
 LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
 
-DEPENDS = "util-linux lvm2 popt"
+DEPENDS = "util-linux lvm2 popt libgcrypt"
 
 SRC_URI = "http://cryptsetup.googlecode.com/files/cryptsetup-${PV}.tar.bz2"
 SRC_URI[md5sum] = "f374d11e3b0e7ca0f805756fd02e34ff"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 14/60] gsoap: add missing dependency on zlib

[Martin Jansa]

* do_compile fails without:
| i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86  -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -L. -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o wsdl2h wsdl2h-wsdl2h.o wsdl2h-wsdl.o wsdl2h-schema.o wsdl2h-types.o wsdl2h-service.o wsdl2h-soap.o wsdl2h-mime.o wsdl2h-wsp.o wsdl2h-wsdlC.o ../../gsoap/libgsoapssl++.a -lssl -lcrypto -lz
| /OE/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/4.7.2/ld: cannot find -lz
| collect2: error: ld returned 1 exit status

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

diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb
index ba8b619..b85db05 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb
@@ -1,6 +1,6 @@
 require gsoap_${PV}.inc
 
-DEPENDS = "gsoap-native openssl"
+DEPENDS = "gsoap-native openssl zlib"
 
 do_install_append() {
     install -d ${D}${libdir}
-- 
1.8.3.2

[meta-oe][dylan][PATCH 15/60] wbxml2: add missing dependency on expat

[Martin Jansa]

* do_configure fails without it:
  | -- Could NOT find Expat

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

diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
index c87e477..bca305f 100644
--- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
+++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
@@ -4,6 +4,8 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1"
 
+DEPENDS = "expat"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "f5031e9f730ffd9dc6a2d1ded585e1d1"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 16/60] iso-codes: add missing dependency on gettext-native

[Martin Jansa]

* msgfmt is called in do_install and both MSGFMT variables
  are empty without gettext-native detected in configure
  %.mo: %.po
        $(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<

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

diff --git a/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb b/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
index 9502923..ed89a12 100644
--- a/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
+++ b/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
@@ -8,6 +8,10 @@ SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}
 SRC_URI[md5sum] = "4073466e57df23d39721513219e4f7ae"
 SRC_URI[sha256sum] = "0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97"
 
+# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which
+# are inhibited by allarch
+DEPENDS = "gettext-native"
+
 inherit autotools allarch
 
 FILES_${PN} += "${datadir}/xml/"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 17/60] portaudio: explicitly disable oss, add PACKAGECONFIG for alsa and jack

[Martin Jansa]

* autoenabled dependencies on alsa-lib and jack are breaking espeak
  when it's built against portaudio in sysroot without them
  | ld: warning: libasound.so.2, needed by usr/lib/libportaudio.so, not found (try using -rpath or -rpath-link)
  | ld: warning: libjack.so.0, needed by usr/lib/libportaudio.so, not found (try using -rpath or -rpath-link)
  | usr/lib/libportaudio.so: undefined reference to `snd_pcm_sw_params_sizeof@ALSA_0.9'
  | usr/lib/libportaudio.so: undefined reference to `snd_pcm_hw_params_test_period_size@ALSA_0.9'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb
index b35d1d8..a2b25cc 100644
--- a/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb
+++ b/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb
@@ -2,15 +2,22 @@ DESCRIPTION = "A portable audio library"
 SECTION = "libs/multimedia"
 LICENSE = "PortAudio"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df"
-SRCREV = "1387"
+
 PV = "v19+svnr${SRCPV}"
 PR = "r0"
 
+SRCREV = "1387"
 SRC_URI = "svn://subversion.assembla.com/svn/portaudio/portaudio;module=trunk;protocol=http"
 S = "${WORKDIR}/trunk"
 
 inherit autotools
 
+PACKAGECONFIG ??= "alsa jack"
+PACKAGECONFIG[alsa] = "--with-alsa, --without-alsa, alsa-lib,"
+PACKAGECONFIG[jack] = "--with-jack, --without-jack, jack,"
+
+EXTRA_OECONF = "--without-oss"
+
 TESTS = "  pa_devs patest1      patest_hang patest_many                   patest_prime patest_sine patest_stop     patest_write_sine        \
 pa_fuzz    patest_buffer        patest_in_overflow  patest_maxsines       patest_read_record  patest_sine8         patest_sync              \
 pa_minlat  patest_callbackstop  patest_latency      patest_multi_sine     patest_record       patest_sine_formats  patest_toomanysines      \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 18/60] mysql5: prevent using bundled zlib at all costs

[Martin Jansa]

* in some seldom cases mysql's m4 macro decides that system
  zlib (from DEPENDS) is not worthy and decides to use own
  bundled version which prefers stuff like static libz.a and
  stages libz.la again:
  mysql-5.1.40/config/ac-macros/zlib.m4
  NOTE: recipe mysql5-5.1.40-r11: task do_package_setscene: Started
  NOTE: recipe zlib-1.2.7-r0: task do_packagedata_setscene: Succeeded
  WARNING: The recipe zlib is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
  sysroots/om-gta04/usr/lib/libz.a
  Matched in manifest-om-gta04-mysql5
  Please verify which package should provide the above files.
  NOTE: recipe zlib-1.2.7-r0: task do_populate_sysroot_setscene: Succeeded

* this libz.la + libz.a is breaking many packages which are now trying to
  link shared libs against libz.a from mysql which was built without fPIC
  breaking libxml2, glib-2.0, gnutls, libpng, ...
  | ld: sysroots/om-gta04/usr/lib/libz.a(crc32.o): relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC
  | sysroots/om-gta04/usr/lib/libz.a: could not read symbols: Bad value
  | collect2: ld returned 1 exit status

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
index 3d79e19..21bf8b0 100644
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
@@ -32,7 +32,7 @@ export ac_cv_path_PS="/bin/ps"
 export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null"
 PARALLEL_MAKE = " "
 EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
-EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
+EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb --with-zlib-dir=${STAGING_EXECPREFIXDIR}"
 
 do_configure_append() {
     sed -i /comp_err/d ${S}/sql/share/Makefile
-- 
1.8.3.2

[meta-oe][dylan][PATCH 19/60] portaudio: inherit pkgconfig

[Martin Jansa]

* without pkgconfig it's failing to expand PKG_CHECK_MODULES macro:
  | portaudio-v19/v19+svnr1387-r0/trunk/configure:
    line 11721: syntax error near unexpected token `JACK,'
  | portaudio-v19/v19+svnr1387-r0/trunk/configure:
    line 11721: `PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)'
  | Configure failed. The contents of all config.log files follows to aid debugging

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

diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb
index a2b25cc..454bd34 100644
--- a/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb
+++ b/meta-oe/recipes-support/portaudio/portaudio-v19_svn.bb
@@ -4,13 +4,12 @@ LICENSE = "PortAudio"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df"
 
 PV = "v19+svnr${SRCPV}"
-PR = "r0"
 
 SRCREV = "1387"
 SRC_URI = "svn://subversion.assembla.com/svn/portaudio/portaudio;module=trunk;protocol=http"
 S = "${WORKDIR}/trunk"
 
-inherit autotools
+inherit autotools pkgconfig
 
 PACKAGECONFIG ??= "alsa jack"
 PACKAGECONFIG[alsa] = "--with-alsa, --without-alsa, alsa-lib,"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 20/60] f2fs-tools: add util-linux dependency

[Martin Jansa]

---
 meta-oe/recipes-core/f2fs-tools/f2fs-tools_1.1.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-core/f2fs-tools/f2fs-tools_1.1.0.bb b/meta-oe/recipes-core/f2fs-tools/f2fs-tools_1.1.0.bb
index e5b5439..7755a7f 100644
--- a/meta-oe/recipes-core/f2fs-tools/f2fs-tools_1.1.0.bb
+++ b/meta-oe/recipes-core/f2fs-tools/f2fs-tools_1.1.0.bb
@@ -4,6 +4,9 @@ HOMEPAGE = "http://sourceforge.net/projects/f2fs-tools/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=15667d9b3cb737b57471c148b7c50734"
 
+# to provide libuuid
+DEPENDS = "util-linux"
+
 SRCREV = "da59f6146c37e727bb83ae4922ca56d42958e61c"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;protocol=git"
 S = "${WORKDIR}/git"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 21/60] lcdproc5: add PACKAGECONFIG for libftdi, libusb

[Martin Jansa]

* drivers for lis, ula200 and i2500vfd weren't deterministicly enabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
index f5a1f3c..d1a45ca 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -4,7 +4,7 @@ SUMMARY = "Drivers for character-based LCD displays"
 HOMEPAGE = "http://lcdproc.org"
 SECTION = "utils"
 LICENSE = "GPLv2+"
-DEPENDS = "virtual/libusb0 ncurses"
+DEPENDS = "ncurses"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
                     file://README;beginline=60;md5=637e042cdd3671ba00e78b58ede45d3b"
@@ -16,7 +16,11 @@ inherit autotools update-rc.d
 LCD_DRIVERS ?= "all"
 LCD_DEFAULT_DRIVER ?= "curses"
 
-EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS} --enable-libusb"
+PACKAGECONFIG ??= "usb"
+PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0"
+PACKAGECONFIG[ftdi] = "--enable-libftdi,--disable-libftdi,libftdi"
+
+EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS}"
 
 do_install () {
     # binaries
-- 
1.8.3.2

[meta-oe][dylan][PATCH 22/60] openldap: convert to PACKAGECONFIGs, explicitly disable openssl

[Martin Jansa]

* some options like ldbm weren't supported by current version
* when gnutls and openssl were both available it was picking openssl
  because default --with-tls is auto

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-support/openldap/openldap_2.4.23.bb    | 136 +++++++--------------
 1 file changed, 43 insertions(+), 93 deletions(-)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
index 9a7c118..55b0d06 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
@@ -28,16 +28,6 @@ SRC_URI += "file://install-strip.patch"
 
 inherit autotools
 
-# OPTIONS
-# The following two variables can be set in a distro or local.conf
-# to switch features on.  Each feature foo defines OPENLDAP_OPTION_foo
-# and OPENLDAP_DEPENDS_foo in this file - to include feature foo add
-# the two variables into the setting of the options below (please use
-# += because that means this can be done in *both* distro.conf and
-# local.conf!
-OPENLDAP_OPTIONS ?= ""
-OPENLDAP_DEPENDS ?= ""
-
 # CV SETTINGS
 # Required to work round AC_FUNC_MEMCMP which gets the wrong answer
 # when cross compiling (should be in site?)
@@ -50,33 +40,21 @@ EXTRA_OECONF += "ac_cv_func_memcmp_working=yes"
 EXTRA_OECONF += "--with-yielding-select=yes"
 # Shared libraries are nice...
 EXTRA_OECONF += "--enable-dynamic"
-#
-# Disable TLS to remove the need for openssl/libcrypto
-OPENLDAP_OPTION_tls  ?= "--with-tls"
-# set the following to "openssl" to build tls support
-OPENLDAP_DEPENDS_tls ?= "gnutls"
-EXTRA_OECONF += "${OPENLDAP_OPTION_tls}"
-DEPENDS += "${OPENLDAP_DEPENDS_tls}"
-#
-# Disable Cyrus SASL, which may or may not be working at present...
-OPENLDAP_OPTION_sasl  ?= "--without-cyrus-sasl"
-# set the following to "cyrus-sasl" to build SASL support
-OPENLDAP_DEPENDS_sasl ?= ""
-EXTRA_OECONF += "${OPENLDAP_OPTION_sasl}"
-DEPENDS += "${OPENLDAP_DEPENDS_sasl}"
+
+PACKAGECONFIG ??= "gnutls modules \
+                   ldap meta monitor null passwd shell proxycache dnssrv \
+"
+#--with-tls              with TLS/SSL support auto|openssl|gnutls [auto]
+PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls"
+PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl"
+
+PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl"
+PACKAGECONFIG[modules] = "lt_cv_dlopen_self=yes --enable-modules,--disable-modules,libtool"
 
 # SLAPD options
 #
 # UNIX crypt(3) passwd support:
 EXTRA_OECONF += "--enable-crypt"
-#
-# Enable dynamic module loading.  If this is *disabled* the
-# dependency on libtool is removed (to disable set the following
-# to variables to "" in a .conf file).
-OPENLDAP_OPTION_modules += "lt_cv_dlopen_self=yes --enable-modules"
-OPENLDAP_DEPENDS_modules += "libtool"
-EXTRA_OECONF += " ${OPENLDAP_OPTION_modules}"
-DEPENDS += "${OPENLDAP_DEPENDS_modules}"
 
 # SLAPD BACKEND
 #
@@ -99,92 +77,64 @@ md = "${libexecdir}/openldap"
 #--enable-bdb          enable Berkeley DB backend no|yes|mod yes
 # The Berkely DB is the standard choice.  This version of OpenLDAP requires
 # the version 4 implementation or better.
-# To disable this set all three of the following variables to <empty> in
-# a .conf file (this will allow ldbm to be build with gdbm).
-#OPENLDAP_OPTION_bdb   ?= "--enable-bdb=mod"
-OPENLDAP_DEPENDS_bdb  ?= "db"
-EXTRA_OECONF += "${OPENLDAP_OPTION_bdb}"
-DEPENDS += "${OPENLDAP_DEPENDS_bdb}"
-#
+PACKAGECONFIG[bdb] = "--enable-bdb=mod,--enable-bdb=no,db"
+
 #--enable-dnssrv       enable dnssrv backend no|yes|mod no
-# This has no dependencies.
-EXTRA_OECONF += "--enable-dnssrv=mod"
-#
+PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no"
+
 #--enable-hdb          enable Hierarchical DB backend no|yes|mod no
 # This forces ldbm to use Berkeley too, remove to use gdbm
-#OPENLDAP_OPTION_hdb   ?= "--enable-hdb=mod"
-OPENLDAP_DEPENDS_hdb  ?= "db"
-OPENLDAP_PACKAGE_hdb  ?= "${PN}-backend-hdb"
-EXTRA_OECONF += "${OPENLDAP_OPTION_hdb}"
-DEPENDS += "${OPENLDAP_DEPENDS_hdb}"
-#
+PACKAGECONFIG[hdb] = "--enable-hdb=mod,--enable-hdb=no,db"
+
 #--enable-ldap         enable ldap backend no|yes|mod no
-# This has no dependencies
-EXTRA_OECONF += "--enable-ldap=mod"
-#
+PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no,"
+
 #--enable-ldbm         enable ldbm backend no|yes|mod no
 # ldbm requires further specification of the underlying database API, because
 # bdb is enabled above this must be set to berkeley, however the config
 # defaults this correctly so --with-ldbm-api is *not* set.  The build will
-# fail if bdb is removed (above) but not database is built to provide the
-# support for ldbm (because the 'DEPENDS_ldbm' is empty below.)
-#
-# So to use gdbm set:
-OPENLDAP_OPTION_ldbm = "--enable-ldbm=mod --with-ldbm-api=gdbm"
-OPENLDAP_DEPENDS_ldbm = "gdbm"
-# And clear the bdb and hdb settings.
-OPENLDAP_OPTION_ldbm ?= "--enable-ldbm=mod"
-OPENLDAP_DEPENDS_ldbm ?= ""
-EXTRA_OECONF += "${OPENLDAP_OPTION_ldbm}"
-DEPENDS += "${OPENLDAP_DEPENDS_ldbm}"
-#
+# fail if bdb is removed, but no database is built to provide the
+# support for ldbm
+# guide.html:<P>back-ldbm was both slow and unreliable. Its byzantine indexing code was prone to spontaneous corruption, as were the underlying database libraries that were commonly used (e.g. GDBM or NDBM). back-bdb and back-hdb are superior in every aspect, with simplified indexing to avoid index corruption, fine-grained locking for greater concurrency, hierarchical caching for greater performance, streamlined on-disk format for greater efficiency and portability, and full transaction support for greater reliability.</P>
+# configure: WARNING: unrecognized options: --disable-silent-rules, --enable-ldbm, --with-ldbm-api
+#PACKAGECONFIG[ldbm] = "--enable-ldbm=mod --with-ldbm-api=gdbm,--enable-ldbm-no,gdbm"
+
 #--enable-meta         enable metadirectory backend no|yes|mod no
-# No dependencies
-EXTRA_OECONF += "--enable-meta=mod"
-#
+PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no,"
+
 #--enable-monitor      enable monitor backend no|yes|mod yes
-EXTRA_OECONF += "--enable-monitor=mod"
-#
+PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no,"
+
 #--enable-null         enable null backend no|yes|mod no
-EXTRA_OECONF += "--enable-null=mod"
-#
+PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no,"
+
 #--enable-passwd       enable passwd backend no|yes|mod no
-EXTRA_OECONF += " --enable-passwd=mod"
-#
+PACKAGECONFIG[passwd] = "--enable-passwd=mod,--enable-passwd=no,"
+
 #--enable-perl         enable perl backend no|yes|mod no
 #  This requires a loadable perl dynamic library, if enabled without
 #  doing something appropriate (building perl?) the build will pick
-#  up the build machine perl - not good.
-OPENLDAP_OPTION_perl ?= "--enable-perl=mod"
-OPENLDAP_DEPENDS_perl ?= "perl"
-#EXTRA_OECONF += "${OPENLDAP_OPTION_perl}"
-#DEPENDS += "${OPENLDAP_DEPENDS_perl}"
-#
+#  up the build machine perl - not good (inherit perlnative?)
+PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl"
+
 #--enable-shell        enable shell backend no|yes|mod no
-EXTRA_OECONF += "--enable-shell=mod"
-#
+# configure: WARNING: Use of --without-threads is recommended with back-shell
+PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no,"
+
 #--enable-sql          enable sql backend no|yes|mod no
 # sql requires some sql backend which provides sql.h, sqlite* provides
 # sqlite.h (which may be compatible but hasn't been tried.)
-OPENLDAP_OPTION_sql ?= "--enable-sql=mod"
-OPENLDAP_DEPENDS_sql ?= "sql"
-#EXTRA_OECONF += "${OPENLDAP_OPTION_sql}"
-#DEPENDS += "${OPENLDAP_DEPENDS_sql}"
-#
+PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3"
+
 #--enable-dyngroup     Dynamic Group overlay no|yes|mod no
 #  This is a demo, Proxy Cache defines init_module which conflicts with the
 #  same symbol in dyngroup
-#EXTRA_OECONF += "--enable-dyngroup=mod"
-#
+PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no,"
+
 #--enable-proxycache   Proxy Cache overlay no|yes|mod no
-EXTRA_OECONF += "--enable-proxycache=mod"
+PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no,"
 FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*"
 PACKAGES += "${PN}-overlay-proxycache"
-#
-# LOCAL OPTION OVERRIDES
-# The distro/lcoal options must be added in *last*
-EXTRA_OECONF += "${OPENLDAP_OPTIONS}"
-DEPENDS      += "${OPENLDAP_DEPENDS}"
 
 CPPFLAGS_append = " -D_GNU_SOURCE"
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 23/60] samba: use more specific LICENSE

[Martin Jansa]

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

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index 6092226..e7defaa 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -1,5 +1,5 @@
 SECTION = "console/network"
-LICENSE = "GPL"
+LICENSE = "GPL-3.0"
 DEPENDS = "readline virtual/libiconv talloc"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 24/60] samba: add dependency on zlib popt, PACKAGECONFIG for pam

[Martin Jansa]

* zlib, popt are autodetected or used in bundled versions
* pam is autodetected if available

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

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index e7defaa..df8ed68 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 LICENSE = "GPL-3.0"
-DEPENDS = "readline virtual/libiconv talloc"
+DEPENDS = "readline virtual/libiconv talloc zlib popt"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
            file://volatiles.03_samba \
@@ -33,12 +33,17 @@ EXTRA_OECONF='--disable-cups \
               --with-mandir=${mandir} \
               --with-swatdir=${datadir}/swat \
               --with-aio-support \
+              --with-winbind \
+              --with-wbclient \
               --without-libtalloc \
               --without-acl-support \
               --disable-avahi \
               samba_cv_struct_timespec=yes \
               libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
 
+PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
+
 INITSCRIPT_PACKAGES = "samba winbind"
 INITSCRIPT_NAME_samba = "samba"
 INITSCRIPT_NAME_winbind = "winbind"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 25/60] jack: add dependency on libsaplerate0 and readline

[Martin Jansa]

* they are autodetected from sysroot and configure doesn't have option
  to explicitly disable them, so PACKAGECONFIG won't work without improving
  configure

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-multimedia/jack/jack_0.121.0.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb
index e3d5e7e..b255cef 100644
--- a/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb
@@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \
                     file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \
 "
 
-
-DEPENDS = "alsa-lib"
+DEPENDS = "alsa-lib libsamplerate0 readline"
 
 SVNPV = "${@'${PV}'.replace('.', '_')}"
 SRCREV = "4484"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 26/60] glog: add dependency on libunwind

[Martin Jansa]

* it's autodetected from sysroot and configure doesn't have parameter to explicitly
  disable it so PACKAGECONFIG won't work OOTB

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

diff --git a/meta-oe/recipes-support/glog/glog.inc b/meta-oe/recipes-support/glog/glog.inc
index 97f3728..8a1fb42 100644
--- a/meta-oe/recipes-support/glog/glog.inc
+++ b/meta-oe/recipes-support/glog/glog.inc
@@ -6,4 +6,6 @@ HOMEPAGE = "https://code.google.com/p/google-glog/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b"
 
+DEPENDS = "libunwind"
+
 inherit autotools pkgconfig
-- 
1.8.3.2

[meta-oe][dylan][PATCH 27/60] lvm2: add PACKAGECONFIG for readline

[Martin Jansa]

* it's autodetected from sysroot

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

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 157e11b..63c612e 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -11,6 +11,9 @@ S = "${WORKDIR}/LVM2.${PV}"
 SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
            file://lvm.conf"
 
+PACKAGECONFIG ??= "readline"
+PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
+
 # Unset user/group to unbreak install.
 EXTRA_OECONF = "--with-user= \
                 --with-group= \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 28/60] libunwind: add PACKAGECONFIG for lzma

[Martin Jansa]

* it's autodetected from sysroot

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

diff --git a/meta-oe/recipes-support/libunwind/libunwind.inc b/meta-oe/recipes-support/libunwind/libunwind.inc
index f028766..637e570 100644
--- a/meta-oe/recipes-support/libunwind/libunwind.inc
+++ b/meta-oe/recipes-support/libunwind/libunwind.inc
@@ -7,6 +7,9 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/${BPN}/${BPN}-${PV}.tar.
 
 inherit autotools
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,lzma"
+
 EXTRA_OECONF_arm = "--enable-debug-frame"
 
 BBCLASSEXTEND = "native"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 29/60] ntp: add PACKAGECONFIG for libcap and readline

[Martin Jansa]

* it's autodetected from sysroot

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

diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 79e7401..9367d41 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -37,6 +37,8 @@ PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \
                           --with-crypto, \
                           --without-openssl --without-crypto, \
                           openssl"
+PACKAGECONFIG[cap] = "--enable-linuxcaps,--disable-linuxcaps,libcap"
+PACKAGECONFIG[readline] = "--with-lineeditlibs,--without-lineeditlibs,readline"
 
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d
-- 
1.8.3.2

[meta-oe][dylan][PATCH 30/60] vim: add PACKAGECONFIG for acl

[Martin Jansa]

* it's autodetected from sysroot

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

diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
index 12e8c1e..d7336c2 100644
--- a/meta-oe/recipes-support/vim/vim.inc
+++ b/meta-oe/recipes-support/vim/vim.inc
@@ -32,6 +32,7 @@ do_configure () {
 PACKAGECONFIG ??= ""
 
 PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+,"
+PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
 PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
 PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 31/60] mkvtoolnix: inherit gettext and export RUBYLIB

[Martin Jansa]

* fails to call msgfmt in do_compile:
  MSGFMT po/cs.po
  ERROR: Function failed: do_compile (see mkvtoolnix/5.9.0-r0/temp/log.do_compile.3794 for further information)
* fails to find rubygems.rb:
  <internal:gem_prelude>:1:in `require': cannot load such file rubygems.rb (LoadError)

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

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 13edaa9..0106594 100644
--- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
+++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
@@ -10,7 +10,13 @@ SRC_URI = "http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-${PV}.
 SRC_URI[md5sum] = "033621461ef8eb922fc1366e0a9a6f16"
 SRC_URI[sha256sum] = "d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4efcbde1"
 
-inherit autotools
+inherit autotools gettext
+
+# make sure rb files are used from sysroot, not from host
+# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+# we need to replace it too (a bit longer version without importing re)
+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}"
 
 EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
 "
-- 
1.8.3.2

[meta-oe][dylan][PATCH 32/60] rrdtool: add PACKAGECONFIG for dbi

[Martin Jansa]

* dbi was autodetected from sysroot causing undeterministic builds and failures
  in lmsensors builds:
  ld: warning: libdbi.so.1, needed by sysroots/qemux86/usr/lib/librrd.so,
  not found (try using -rpath or -rpath-link)
  sysroots/qemux86/usr/lib/librrd.so: undefined reference to `dbi_result_get_string_idx'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
index b92fe2f..dc43163 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
@@ -19,6 +19,9 @@ inherit autotools gettext
 
 EXTRA_AUTORECONF = "-I m4"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[dbi] = "--enable-libdbi,--disable-libdbi,libdbi"
+
 EXTRA_OECONF = " \
     --enable-shared \
     --enable-local-libpng \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 33/60] loudmouth: add dependency on libidn

[Martin Jansa]

* it's autodetected from sysroot and configure doesn't allow
  to disable it explicitly
* feel free to add configure option and PACKAGECONFIG if this
  extra dependency bothers you

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

diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
index 8375386..c864276 100644
--- a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
+++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.loudmouth-project.org/"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c4f38aef94828f6b280e00d1173be689"
 
-DEPENDS = "glib-2.0 libcheck openssl"
+DEPENDS = "glib-2.0 libcheck openssl libidn"
 
 inherit gnomebase
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 34/60] cifs-utils: add PACKAGECONFIG for libcap

[Martin Jansa]

* libcap is autodetected from sysroot

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

diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
index 19b60ad..dde1cc7 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -11,6 +11,9 @@ SRC_URI = "git://git.samba.org/cifs-utils.git"
 
 S = "${WORKDIR}/git"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap"
+
 inherit autotools
 
 do_install_append() {
-- 
1.8.3.2

[meta-oe][dylan][PATCH 35/60] atftp: add PACKAGECONFIG for pcre, readline, tcp-wrapper

[Martin Jansa]

* it's autodetected from sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-daemons/atftp/atftp_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-daemons/atftp/atftp_git.bb b/meta-networking/recipes-daemons/atftp/atftp_git.bb
index 09451bc..4b9ff05 100644
--- a/meta-networking/recipes-daemons/atftp/atftp_git.bb
+++ b/meta-networking/recipes-daemons/atftp/atftp_git.bb
@@ -18,6 +18,11 @@ S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d useradd systemd
 
+PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG[pcre] = "--enable-libpcre,--disable-libpcre,libpcre"
+PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
+PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline"
+
 INITSCRIPT_PACKAGES = "${PN}d"
 INITSCRIPT_NAME_${PN}d = "atftpd"
 INITSCRIPT_PARAMS_${PN}d = "defaults 80"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 36/60] fbida: add dependency on curl libungif tiff

[Martin Jansa]

* it's autodetected from sysroot
* GNUMakefile doesn't allow to use PACKAGECONFIG to explicitly disable them

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

diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index aa4c1ca..24100ee 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -6,7 +6,7 @@ SECTION = "utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-DEPENDS = "virtual/libiconv libpng jpeg fontconfig freetype libexif"
+DEPENDS = "virtual/libiconv libpng jpeg fontconfig freetype libexif curl libungif tiff"
 
 SRC_URI = "git://git.kraxel.org/fbida"
 SRCREV = "cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 37/60] mbuffer: add PACKAGECONFIG for md5

[Martin Jansa]

* openssl is autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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

diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb
index dcd8a47..bd80c84 100644
--- a/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb
+++ b/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb
@@ -11,6 +11,9 @@ SRC_URI[sha256sum] = "e708b66f6cec9ba090877e8eb38e5627ac69aea9ebd9bca1360a29c739
 
 inherit autotools
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[md5] = "--enable-md5,--disable-md5,openssl"
+
 do_configure() {
     gnu-configize
     oe_runconf
-- 
1.8.3.2

[meta-oe][dylan][PATCH 38/60] inetutils: add PACKAGECONFIG for ftp and uucpd

[Martin Jansa]

* readline support is autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
index 603bf01..d77dab8 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -24,6 +24,11 @@ SRC_URI[sha256sum] = "02a9ebde8a198cb85f87545b9d88fb103a183958139864a85fe9e027ad
 inherit autotools gettext
 
 noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}"
+
+PACKAGECONFIG ??= "ftp uucpd"
+PACKAGECONFIG[ftp] = "--enable-ftp,--disable-ftp,readline"
+PACKAGECONFIG[uucpd] = "--enable-uucpd,--disable-uucpd,readline"
+
 EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \
         --with-path-procnet-dev=/proc/net/dev \
         ${noipv6} \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 39/60] jasper: add PACKAGECONFIG for jpeg

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb b/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
index ef9ca6f..a454501 100644
--- a/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
+++ b/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
@@ -8,6 +8,9 @@ SRC_URI = "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip"
 
 inherit autotools lib_package
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg"
+
 EXTRA_OECONF = "--enable-shared"
 
 SRC_URI[md5sum] = "a342b2b4495b3e1394e161eb5d85d754"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 40/60] joe: add PACKAGECONFIG for joe

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic
* ncurses-libtinfo dependency is added only when ncurses is built before joe

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

diff --git a/meta-oe/recipes-support/joe/joe_3.1.bb b/meta-oe/recipes-support/joe/joe_3.1.bb
index 6c9190f..7c5922d 100644
--- a/meta-oe/recipes-support/joe/joe_3.1.bb
+++ b/meta-oe/recipes-support/joe/joe_3.1.bb
@@ -3,10 +3,12 @@ DESCRIPTION = "Console text editor with good functionality, good choice for vi-h
 HOMEPAGE = "http://joe-editor.sourceforge.net/"
 LICENSE = "GPLv1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6"
-RDEPENDS_${PN} = "ncurses-terminfo"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
 
+PACKAGECONFIG ??= "curses"
+PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo"
+
 inherit autotools
 
 SRC_URI[md5sum] = "2a6ef018870fca9b7df85401994fb0e0"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 41/60] krb5: add PACKAGECONFIG for openssl and libedit

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/krb5/krb5_1.11.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
index 31fe463..a68e85d 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
@@ -15,6 +15,10 @@ SRC_URI[sha256sum] = "fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456
 
 S = "${WORKDIR}/${P}/src/"
 
+PACKAGECONFIG ??= "openssl"
+PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
+PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl"
+
 EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath"
 CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \
                   ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 42/60] libass: add PACKAGECONFIG for harfbuzz

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic
* runtime dependencies for glib-2.0 harfbuzz libffi libicudata libicule libicuuc libstdc++ are added
  only when harfbuzz is detected

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

diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc
index 4dd5181..a0dc564 100644
--- a/meta-oe/recipes-multimedia/libass/libass.inc
+++ b/meta-oe/recipes-multimedia/libass/libass.inc
@@ -13,6 +13,9 @@ SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 inherit autotools pkgconfig
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz"
+
 EXTRA_OECONF = " \
     --enable-enca \
     --enable-fontconfig \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 43/60] links: add PACKAGECONFIG for bzip2, lzma

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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

diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc
index e77e2c4..78d7ec7 100644
--- a/meta-oe/recipes-support/links/links.inc
+++ b/meta-oe/recipes-support/links/links.inc
@@ -10,4 +10,8 @@ SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
            file://ac-prog-cxx.patch \
 "
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
+PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,lzma"
+
 inherit autotools
-- 
1.8.3.2

[meta-oe][dylan][PATCH 44/60] quagga: add PACKAGECONFIG for capabilities

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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

diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 160c458..d66eed3 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -29,6 +29,9 @@ SRC_URI = "http://download.savannah.gnu.org/releases/quagga${QUAGGASUBDIR}/quagg
            file://watchquagga.default \
            file://volatiles.03_quagga"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap"
+
 inherit autotools update-rc.d useradd
 
 EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 45/60] sox: add PACKAGECONFIG for magic and wavpack

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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 715860b..25b3d5f 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -10,9 +10,12 @@ PR = "r1"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+                   magic \
 "
 PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio,"
 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,"
 
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 46/60] usbmuxd: add PACKAGECONFIG for plist

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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

diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
index bb92941..595582a 100644
--- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
+++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
@@ -17,3 +17,5 @@ S = "${WORKDIR}/git"
 
 FILES_${PN} += "${base_libdir}/udev/rules.d/"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 47/60] usbmuxd: fix unpackaged files

[Martin Jansa]

* WARNING: QA Issue: usbmuxd: Files/directories were installed but not shipped
  /usr/lib64
  /usr/lib64/libusbmuxd.so.1.0.8
  /usr/lib64/libusbmuxd.so.2
  /usr/lib64/libusbmuxd.so
  /usr/lib64/.debug
  /usr/lib64/pkgconfig
  /usr/lib64/.debug/libusbmuxd.so.1.0.8
  /usr/lib64/pkgconfig/libusbmuxd.pc

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

diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
index 595582a..52bf811 100644
--- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
+++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
@@ -17,5 +17,8 @@ S = "${WORKDIR}/git"
 
 FILES_${PN} += "${base_libdir}/udev/rules.d/"
 
+# fix usbmuxd installing files to /usr/lib64 on 64bit hosts:
+EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
+
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 48/60] libav: add PACKAGECONFIG for bzip2 and jack

[Martin Jansa]

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

diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc
index 6e91061..898ecfb 100644
--- a/meta-oe/recipes-multimedia/libav/libav.inc
+++ b/meta-oe/recipes-multimedia/libav/libav.inc
@@ -28,6 +28,10 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
 EXTRA_FFCONF ?= ""
 
+PACKAGECONFIG ??= "bzip2"
+PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
+PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
+
 EXTRA_OECONF = " \
     --enable-shared \
     --enable-pthreads \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 49/60] libnice: add PACKAGECONFIG for gupnp

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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

diff --git a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb
index 94ec9a2..3205aaf 100644
--- a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb
+++ b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb
@@ -13,6 +13,9 @@ PR = "r4"
 
 DEPENDS = "glib-2.0 gstreamer"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd"
+
 inherit autotools
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 50/60] farsight2: add PACKAGECONFIG for gupnp

[Martin Jansa]

* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

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

diff --git a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
index 5abf1d7..a1029b3 100644
--- a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
+++ b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
@@ -11,6 +11,9 @@ DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
 
 inherit autotools
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd"
+
 EXTRA_OECONF = " \
     --disable-debug \
     --disable-gtk-doc \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 51/60] x264: explicitly disable swscale

[Martin Jansa]

* it's creating circular dependency on libav when explicitly enabled
* and sometimes it's autodetected when x264 is rebuilt after building libav

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

diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-oe/recipes-multimedia/x264/x264_git.bb
index 5222d1d..c767ffd 100644
--- a/meta-oe/recipes-multimedia/x264/x264_git.bb
+++ b/meta-oe/recipes-multimedia/x264/x264_git.bb
@@ -30,6 +30,7 @@ EXTRA_OECONF = '--prefix=${prefix} \
                 --enable-shared \
                 --enable-static \
                 --disable-lavf \
+                --disable-swscale \
                 ${X264_DISABLE_ASM} \
                '
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 52/60] libftdi: add PACKAGECONFIG for cpp-wrapper

[Martin Jansa]

* also fixes
  WARNING: QA Issue: libftdi: The compile log indicates that host include and/or library paths were used.
           Please check the log '/OE/oe-core/tmp-eglibc/work/x86_64-oe-linux/libftdi/0.19-r1/temp/log.do_compile' for more information.

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

diff --git a/meta-oe/recipes-support/libftdi/libftdi_0.19.bb b/meta-oe/recipes-support/libftdi/libftdi_0.19.bb
index 2b8068b..a62236f 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_0.19.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_0.19.bb
@@ -20,6 +20,9 @@ SRC_URI = "http://www.intra2net.com/en/developer/libftdi/download/libftdi-${PV}.
 SRC_URI[md5sum] = "e6e25f33b4327b1b7aa1156947da45f3"
 SRC_URI[sha256sum] = "567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[cpp-wrapper] = "--enable-libftdipp,--disable-libftdipp,boost"
+
 inherit autotools binconfig pkgconfig
 
 BBCLASSEXTEND = "native"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 53/60] ntfs-3g-ntfsprogs: add packageconfig for uuid

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb b/meta-oe/recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb
index db5686e..42f7ca5 100644
--- a/meta-oe/recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb
+++ b/meta-oe/recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb
@@ -15,6 +15,9 @@ SRC_URI[sha256sum] = "aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248
 
 inherit autotools
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[uuid] = "--with-uuid,--without-uuid,util-linux"
+
 # required or it calls ldconfig at install step
 EXTRA_OEMAKE = "LDCONFIG=echo"
 
-- 
1.8.3.2

[meta-oe][dylan][PATCH 54/60] openldap: add dependency on util-linux

[Martin Jansa]

* openldap-slapd was sometime depending on util-linux-libuuid
  add dependency to explicitly enable it

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

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
index 55b0d06..06896d2 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
@@ -20,6 +20,8 @@ SRC_URI += "file://initscript"
 SRC_URI[md5sum] = "90150b8c0d0192e10b30157e68844ddf"
 SRC_URI[sha256sum] = "5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3"
 
+DEPENDS = "util-linux"
+
 PR = "r1"
 # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
 # installing .so and executables, this fails in cross compilation
-- 
1.8.3.2

[meta-oe][dylan][PATCH 55/60] smbnetfs: add packageconfig for gnome-keyring

[Martin Jansa]

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

diff --git a/meta-oe/recipes-connectivity/smbnetfs/smbnetfs_git.bb b/meta-oe/recipes-connectivity/smbnetfs/smbnetfs_git.bb
index 3bb1c6d..2141137 100644
--- a/meta-oe/recipes-connectivity/smbnetfs/smbnetfs_git.bb
+++ b/meta-oe/recipes-connectivity/smbnetfs/smbnetfs_git.bb
@@ -13,4 +13,7 @@ SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464"
 
 SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;protocol=git;branch=master"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring"
+
 S = "${WORKDIR}/git"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 56/60] libgphoto2: add configure option for gd and add PACKAGECONFIG

[Martin Jansa]

* it's autodetected and pulls couple of other dependencies
  freetype gd libpng lockdev zlib

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libgphoto2-2.4.11/allow.to.disable.gd.patch    | 33 ++++++++++++++++++++++
 .../recipes-graphics/gphoto2/libgphoto2_2.4.11.bb  |  6 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/allow.to.disable.gd.patch

diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/allow.to.disable.gd.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/allow.to.disable.gd.patch
new file mode 100644
index 0000000..aa1a124
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/allow.to.disable.gd.patch
@@ -0,0 +1,33 @@
+--- libgphoto2-2.4.11.orig/configure.ac	2013-07-19 21:59:10.857223729 +0200
++++ libgphoto2-2.4.11/configure.ac	2013-07-19 22:06:13.873233928 +0200
+@@ -270,15 +270,21 @@
+ dnl ---------------------------------------------------------------------------
+ dnl check for libgd
+ dnl ---------------------------------------------------------------------------
+-LIBGD=""
+-libgd_msg="no"
+-AC_SUBST(LIBGD)
+-AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
+-	AC_CHECK_HEADER(gd.h,[
+-		AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
+-		LIBGD="-lgd"
+-		libgd_msg="yes"
+-	])
++AC_ARG_ENABLE([gd],
++[AS_HELP_STRING([--enable-gd],
++                [enable gd support])],[
++        LIBGD=""
++        libgd_msg="no"
++        AC_SUBST(LIBGD)
++        if test "x$enableval" != "xno"; then
++                AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
++                        AC_CHECK_HEADER(gd.h,[
++                                AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
++                                LIBGD="-lgd"
++                                libgd_msg="yes"
++                        ])
++                ])
++        fi
+ ])
+ GP_CONFIG_MSG([GD conversion support],[${libgd_msg}])
+ 
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
index fd547d9..ae783b8 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
@@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2
            file://10-camera-libgphoto2.fdi \
            file://40-libgphoto2.rules \
            file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
+           file://allow.to.disable.gd.patch \
 "
 
 SRC_URI[libgphoto2.md5sum] = "16a22b9739e45a95980ed62705fe7333"
@@ -25,6 +26,9 @@ inherit autotools pkgconfig gettext lib_package
 
 EXTRA_OECONF = " --with-drivers=all udevscriptdir=/lib/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gd] = "--enable-gd,--disable-gd,gd"
+
 do_configure_append() {
     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
     cd ${S}/libgphoto2_port/
@@ -44,7 +48,7 @@ PACKAGES =+ "libgphotoport libgphoto2-camlibs"
 FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*"
 RRECOMMENDS_${PN} = "libgphoto2-camlibs"
 
-FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" 
+FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*"
 
 FILES_${PN} += "${base_libdir}/udev/* ${datadir}/hal"
 FILES_${PN}-dbg += "${libdir}/*/*/.debug"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 57/60] libgphoto2: add PACKAGECONFIG for serial

[Martin Jansa]

* fixes undeterministic dependency on lockdev

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
index ae783b8..ccca0c9 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
@@ -28,6 +28,7 @@ EXTRA_OECONF = " --with-drivers=all udevscriptdir=/lib/udev ac_cv_lib_ltdl_lt_dl
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[gd] = "--enable-gd,--disable-gd,gd"
+PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
 
 do_configure_append() {
     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
-- 
1.8.3.2

[meta-oe][dylan][PATCH 58/60] samba: add packageconfig for fam

[Martin Jansa]

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

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index df8ed68..7391bbf 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -43,6 +43,7 @@ EXTRA_OECONF='--disable-cups \
 
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
+PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
 
 INITSCRIPT_PACKAGES = "samba winbind"
 INITSCRIPT_NAME_samba = "samba"
-- 
1.8.3.2

[meta-oe][dylan][PATCH 59/60] ruby: add dependency on db gdbm readline

[Martin Jansa]

* to prevent using bunded versions

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-ruby/recipes-devtools/ruby/ruby.inc           | 4 ++--
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta-ruby/recipes-devtools/ruby/ruby.inc b/meta-ruby/recipes-devtools/ruby/ruby.inc
index becf64c..5ba1d2b 100644
--- a/meta-ruby/recipes-devtools/ruby/ruby.inc
+++ b/meta-ruby/recipes-devtools/ruby/ruby.inc
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "\
     file://LEGAL;md5=e88686821918c0b6d2b1b8328116cec5 \
 "
 
-DEPENDS = "ruby-native zlib openssl tcl"
-DEPENDS_virtclass-native = ""
+DEPENDS = "ruby-native zlib openssl tcl libyaml db gdbm readline"
+DEPENDS_class-native = ""
 
 INC_PR = "r1"
 
diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
index bed678e..8bb956a 100644
--- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
+++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
@@ -1,8 +1,6 @@
 require ruby.inc
 PR = "${INC_PR}.0"
 
-DEPENDS += "libyaml ruby-native"
-
 SRC_URI += "\
     file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch \
     file://ruby-1.9.3-always-use-i386.patch \
-- 
1.8.3.2

[meta-oe][dylan][PATCH 60/60] cifs-utils: inherit pkgconfig

[Martin Jansa]

* it fails in do_configure without it
  configure.ac:99: error: possibly undefined macro: AC_MSG_ERROR
       If this token and others are legitimate, please use m4_pattern_allow.
       See the Autoconf documentation.
  configure.ac:140: error: possibly undefined macro: AC_MSG_WARN
  autoreconf: sysroots/x86_64-linux/usr/bin/autoconf failed with exit status: 1

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

diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
index dde1cc7..3d15ff3 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap"
 
-inherit autotools
+inherit autotools pkgconfig
 
 do_install_append() {
     # Remove empty /usr/bin and /usr/sbin directories since the mount helper
-- 
1.8.3.2

Re: [meta-oe][dylan][PATCH 00/60] Backports for deterministic dependencies

[Eric Bénard]

Hi Martin,

Le Thu, 15 Aug 2013 09:18:40 +0200,
Martin Jansa <martin.jansa@gmail.com> a écrit :

> The following changes since commit 13ae5105ee30410136beeae66ec41ee4a8a2e2b0:
> 
>   icon-slicer: fix native build by depending on gdk-pixbuf only (2013-05-28 09:58:04 +0200)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib jansa/dylan-backports
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/dylan-backports
> 
> Martin Jansa (57):
>   vsftpd: add missing dependency on openssl
>   fbida: define -I when checking jpeg version
>   xorg-sgml-doctools: add missing dependency on util-macros
>   gypsy: add dependency on libxslt-native
>   media-ctl: inherit pkgconfig
>   rsyslog: inherit pkgconfig
>   libspatialite: add missing dependency on sqlite3
>   ruby: add missing dependency on ruby-native
>   cpufrequtils: inherit gettext
>   cryptsetup: add missing dependency on libgcrypt
>   gsoap: add missing dependency on zlib
>   wbxml2: add missing dependency on expat
>   iso-codes: add missing dependency on gettext-native
>   portaudio: explicitly disable oss, add PACKAGECONFIG for alsa and jack
>   mysql5: prevent using bundled zlib at all costs
>   portaudio: inherit pkgconfig
>   f2fs-tools: add util-linux dependency
>   lcdproc5: add PACKAGECONFIG for libftdi, libusb
>   openldap: convert to PACKAGECONFIGs, explicitly disable openssl
>   samba: use more specific LICENSE
>   samba: add dependency on zlib popt, PACKAGECONFIG for pam
>   jack: add dependency on libsaplerate0 and readline
>   glog: add dependency on libunwind
>   lvm2: add PACKAGECONFIG for readline
>   libunwind: add PACKAGECONFIG for lzma
>   ntp: add PACKAGECONFIG for libcap and readline
>   vim: add PACKAGECONFIG for acl
>   mkvtoolnix: inherit gettext and export RUBYLIB
>   rrdtool: add PACKAGECONFIG for dbi
>   loudmouth: add dependency on libidn
>   cifs-utils: add PACKAGECONFIG for libcap
>   atftp: add PACKAGECONFIG for pcre, readline, tcp-wrapper
>   fbida: add dependency on curl libungif tiff
>   mbuffer: add PACKAGECONFIG for md5
>   inetutils: add PACKAGECONFIG for ftp and uucpd
>   jasper: add PACKAGECONFIG for jpeg
>   joe: add PACKAGECONFIG for joe
>   krb5: add PACKAGECONFIG for openssl and libedit
>   libass: add PACKAGECONFIG for harfbuzz
>   links: add PACKAGECONFIG for bzip2, lzma
>   quagga: add PACKAGECONFIG for capabilities
>   sox: add PACKAGECONFIG for magic and wavpack
>   usbmuxd: add PACKAGECONFIG for plist
>   usbmuxd: fix unpackaged files
>   libav: add PACKAGECONFIG for bzip2 and jack
>   libnice: add PACKAGECONFIG for gupnp
>   farsight2: add PACKAGECONFIG for gupnp
>   x264: explicitly disable swscale
>   libftdi: add PACKAGECONFIG for cpp-wrapper
>   ntfs-3g-ntfsprogs: add packageconfig for uuid
>   openldap: add dependency on util-linux
>   smbnetfs: add packageconfig for gnome-keyring
>   libgphoto2: add configure option for gd and add PACKAGECONFIG
>   libgphoto2: add PACKAGECONFIG for serial
>   samba: add packageconfig for fam
>   ruby: add dependency on db gdbm readline
>   cifs-utils: inherit pkgconfig
> 
> Mihai Prica (1):
>   python-feedparser: Changed from distutils to setuptools
> 
> Paul Barker (1):
>   fluidsynth: added dependency on glib
> 
> Roy.Li (1):
>   cyrus-sasl: Avoid to call AC_TRY_RUN
> 
pushed to dylan-next

Thanks !

Eric