[meta-oe][PATCH 01/29] rrdtool: add PACKAGECONFIG for dbi

[meta-oe][PATCH 01/29] 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][PATCH 02/29] 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][PATCH 03/29] 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 de2786a..07bf1b8 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -12,6 +12,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][PATCH 04/29] 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][PATCH 05/29] 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][PATCH 06/29] 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][PATCH 07/29] 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 c55851f..7c7343e 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -29,6 +29,11 @@ inherit autotools gettext update-alternatives
 
 SRC_URI += "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}"
 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][PATCH 08/29] 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][PATCH 09/29] 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][PATCH 10/29] 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][PATCH 11/29] 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][PATCH 12/29] 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][PATCH 13/29] 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 f9a32a9..f5489c6 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -30,6 +30,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][PATCH 14/29] 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][PATCH 15/29] 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][PATCH 16/29] 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][PATCH 17/29] 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 a2fbe6c..0155b4b 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][PATCH 18/29] 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][PATCH 19/29] 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][PATCH 20/29] 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][PATCH 21/29] 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][PATCH 22/29] 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][PATCH 23/29] 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][PATCH 24/29] 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][PATCH 00/29] autodetected dependencies

[Martin Jansa]

The following changes since commit 02adda55bbb151b540ae00d57618ae6ac2b348f7:

  qt-creator: upgrade to 2.8.0 (2013-07-24 14:36:05 +0200)

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 (29):
  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
  mkvtoolnix: inherit gettext and export RUBYLIB
  libftdi: add PACKAGECONFIG for cpp-wrapper
  libgphoto2: add PACKAGECONFIG for serial
  ntfs-3g-ntfsprogs: add packageconfig for uuid
  openldap: add dependency on util-linux
  samba: add packageconfig for fam
  smbnetfs: add packageconfig for gnome-keyring
  ruby: add dependency on db gdbm readline
  cifs-utils: inherit pkgconfig

 meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb        | 8 +++++++-
 meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb              | 3 +++
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb | 5 +++++
 meta-networking/recipes-daemons/atftp/atftp_git.bb                | 5 +++++
 meta-networking/recipes-protocols/quagga/quagga.inc               | 3 +++
 meta-networking/recipes-support/cifs/cifs-utils_git.bb            | 5 ++++-
 meta-oe/recipes-connectivity/krb5/krb5_1.11.bb                    | 4 ++++
 meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb         | 2 +-
 meta-oe/recipes-connectivity/samba/samba.inc                      | 1 +
 meta-oe/recipes-connectivity/smbnetfs/smbnetfs_git.bb             | 3 +++
 meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb               | 5 +++++
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb                 | 3 +++
 meta-oe/recipes-graphics/fbida/fbida_2.09.bb                      | 2 +-
 meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb             | 1 +
 meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb                 | 3 +++
 meta-oe/recipes-multimedia/libass/libass.inc                      | 3 +++
 meta-oe/recipes-multimedia/libav/libav.inc                        | 4 ++++
 meta-oe/recipes-multimedia/x264/x264_git.bb                       | 1 +
 meta-oe/recipes-support/farsight/farsight2_0.0.22.bb              | 3 +++
 meta-oe/recipes-support/farsight/libnice_0.0.13.bb                | 3 +++
 meta-oe/recipes-support/joe/joe_3.1.bb                            | 4 +++-
 meta-oe/recipes-support/libftdi/libftdi_0.19.bb                   | 3 +++
 meta-oe/recipes-support/links/links.inc                           | 4 ++++
 meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb               | 3 +++
 .../ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb              | 3 +++
 meta-oe/recipes-support/openldap/openldap_2.4.23.bb               | 2 ++
 meta-ruby/recipes-devtools/ruby/ruby.inc                          | 4 ++--
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb                | 2 --
 28 files changed, 83 insertions(+), 9 deletions(-)

-- 
1.8.3.2

[meta-oe][PATCH 25/29] 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 1121008..a565e89 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][PATCH 26/29] 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][PATCH 27/29] 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][PATCH 28/29] 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-p429.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 18fcb9c..837e52b 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=3ce1fae39fe573b818c0af162bce6579 \
 "
 
-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-p429.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
index 868d0ff..de51f2f 100644
--- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
+++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.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][PATCH 29/29] 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 07bf1b8..fc7a4d3 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -15,7 +15,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