[meta-oe][PATCH 00/26] [meta-oe] Pending patches from patchwork

[meta-oe][PATCH 00/26] [meta-oe] Pending patches from patchwork

[Martin Jansa]

Consolidated pull request including some older patches from patchwork.
Modified patches have "MJ: foo" in commit message.

I'll merge this tomorrow unless someone shouts.

The following changes since commit 93f954c334777d542ee3a54634def14fe801f9d5:

  Merge remote-tracking branch 'meta-oe-contrib/jansa/pull' (2012-12-14 19:41:15 +0100)

are available in the git repository at:


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

Jan Luebbe (3):
  proj: add recipe
  geos: add recipe
  libspatialite: add recipe

Marcin Juszkiewicz (8):
  modemmanager: update to 0.6.0.0
  samba: added gnu-configize for AArch64 support
  dialog: added gnu-configize for AArch64 support
  xterm: added gnu-configize for AArch64 support
  florence: added gnome-doc-utils and libnotify to dependencies
  postgresql: disable spinlocks for AArch64
  libgcc: s/virtclass/class/ to make it up-to-date
  gcc-cross-canadian 4.6: fix dependencies to be nativesdk-* not
    *-nativesdk

Marko Lindqvist (5):
  gtk+3: add libxi dependency
  fakeroot: update to upstream version 1.18.4
  lua: update to upstream version 5.1.5
  libsdl-image: update to upstream version 1.2.12
  libsdl-mixer: update to upstream version 1.2.12

Martin Jansa (4):
  udev: remove from meta-oe
  wpa-supplicant, gcc-common-4.6, packagegroup-qte-toolchain-target: use
    correct PRINC form
  lvm2: upgrade to 2.02.97 which is compatible with newer udev
  cryptsetup: import from oe-classic

Paul Eggleton (3):
  meta-oe: Fix erroneous use of "startline" in LIC_FILES_CHKSUM
  meta-networking: Fix erroneous use of "startline" in LIC_FILES_CHKSUM
  libnl: remove

Ross Burton (1):
  python-numpy: add missing runtime dependencies

Ting Liu (1):
  samba: Fix build on Fedora 17

Yauhen Kharuzhy (1):
  krb5: import from OE-Classic

 meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb       |   2 +-
 .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb       |   4 +-
 meta-networking/recipes-support/mtr/mtr_0.82.bb    |   2 +-
 meta-networking/recipes-support/tunctl/tunctl.inc  |   2 +-
 .../dont-include-private-glib-headers.patch        |  94 ---------
 ...modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} |  16 +-
 meta-oe/recipes-connectivity/samba/samba.inc       |   7 +-
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |   3 +-
 ...-native_1.12.4.bb => fakeroot-native_1.18.4.bb} |   4 -
 .../fakeroot/fakeroot/configure-libtool.patch      |  20 --
 .../fakeroot/fakeroot/fix-prefix.patch             |  15 --
 .../{fakeroot_1.12.4.bb => fakeroot_1.18.4.bb}     |  21 +-
 ...-generation-it-depends-on-a-working-docto.patch |  45 ----
 meta-oe/recipes-core/udev/udev/cache               |  24 ---
 meta-oe/recipes-core/udev/udev/default             |   4 -
 meta-oe/recipes-core/udev/udev/gtk-doc.make        | 230 ---------------------
 meta-oe/recipes-core/udev/udev/init                |  73 -------
 meta-oe/recipes-core/udev/udev/modprobe.rules      |  17 --
 meta-oe/recipes-core/udev/udev/touchscreen.rules   |  18 --
 meta-oe/recipes-core/udev/udev_173.bb              | 116 -----------
 meta-oe/recipes-core/udev/udev_175.bb              |  91 --------
 meta-oe/recipes-core/udev/udev_182.bb              |  86 --------
 .../lua/lua5.1/bitwise_operators.patch             | 143 ++++++-------
 meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc      |   2 +-
 .../lua/{lua5.1_5.1.4.bb => lua5.1_5.1.5.bb}       |   9 +-
 .../recipes-devtools/python/python-numpy_1.4.1.bb  |   4 +-
 meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb |   2 +-
 meta-oe/recipes-extended/dialog/dialog.inc         |   1 +
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc      |   2 +-
 .../socketcan/libsocketcan_0.0.8.bb                |   2 +-
 meta-oe/recipes-extended/tmux/tmux_1.6.bb          |   2 +-
 meta-oe/recipes-graphics/xorg-app/xterm_277.bb     |   1 +
 ...bsdl-image_1.2.10.bb => libsdl-image_1.2.12.bb} |  11 +-
 .../libsdl-mixer/libsdl-mixer/configure.patch      |   9 +-
 .../libsdl-mixer/fix-flac-madness.diff             |  28 ---
 ...bsdl-mixer_1.2.11.bb => libsdl-mixer_1.2.12.bb} |  10 +-
 meta-oe/recipes-navigation/geos/geos.inc           |  19 ++
 meta-oe/recipes-navigation/geos/geos_3.3.2.bb      |   7 +
 .../libspatialite/libspatialite.inc                |  16 ++
 .../fix-the-configure-script-and-freexl.patch      | 200 ++++++++++++++++++
 .../libspatialite/libspatialite_3.0.1.bb           |   9 +
 meta-oe/recipes-navigation/proj/proj.inc           |  13 ++
 meta-oe/recipes-navigation/proj/proj_4.7.0.bb      |   7 +
 .../packagegroup-qte-toolchain-target.bbappend     |   2 +-
 .../recipes-support/cryptsetup/cryptsetup_1.1.3.bb |  18 ++
 meta-oe/recipes-support/florence/florence_0.5.1.bb |   2 +-
 meta-oe/recipes-support/libnl/libnl_3.2.9.bb       |  52 -----
 meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb       |   7 -
 meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb       |   6 +
 meta-oe/recipes-support/mini-iconv/mini-iconv.bb   |   2 +-
 meta-oe/recipes-support/postgresql/postgresql.inc  |   1 +
 .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |   2 +-
 meta/recipes-connectivity/krb5/krb5_1.8.5.bb       |  39 ++++
 .../recipes-devtools/gcc/gcc-common-4.6.inc        |   2 +-
 .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb |   4 +-
 toolchain-layer/recipes-devtools/gcc/libgcc_4.6.bb |   2 +-
 56 files changed, 466 insertions(+), 1064 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
 rename meta-oe/recipes-connectivity/networkmanager/{modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} (59%)
 rename meta-oe/recipes-core/fakeroot/{fakeroot-native_1.12.4.bb => fakeroot-native_1.18.4.bb} (67%)
 delete mode 100644 meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch
 delete mode 100644 meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch
 rename meta-oe/recipes-core/fakeroot/{fakeroot_1.12.4.bb => fakeroot_1.18.4.bb} (45%)
 delete mode 100644 meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch
 delete mode 100644 meta-oe/recipes-core/udev/udev/cache
 delete mode 100644 meta-oe/recipes-core/udev/udev/default
 delete mode 100644 meta-oe/recipes-core/udev/udev/gtk-doc.make
 delete mode 100644 meta-oe/recipes-core/udev/udev/init
 delete mode 100644 meta-oe/recipes-core/udev/udev/modprobe.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev/touchscreen.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev_173.bb
 delete mode 100644 meta-oe/recipes-core/udev/udev_175.bb
 delete mode 100644 meta-oe/recipes-core/udev/udev_182.bb
 rename meta-oe/recipes-devtools/lua/{lua5.1_5.1.4.bb => lua5.1_5.1.5.bb} (75%)
 rename meta-oe/recipes-multimedia/libsdl-image/{libsdl-image_1.2.10.bb => libsdl-image_1.2.12.bb} (75%)
 delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff
 rename meta-oe/recipes-multimedia/libsdl-mixer/{libsdl-mixer_1.2.11.bb => libsdl-mixer_1.2.12.bb} (78%)
 create mode 100644 meta-oe/recipes-navigation/geos/geos.inc
 create mode 100644 meta-oe/recipes-navigation/geos/geos_3.3.2.bb
 create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite.inc
 create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch
 create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb
 create mode 100644 meta-oe/recipes-navigation/proj/proj.inc
 create mode 100644 meta-oe/recipes-navigation/proj/proj_4.7.0.bb
 create mode 100644 meta-oe/recipes-support/cryptsetup/cryptsetup_1.1.3.bb
 delete mode 100644 meta-oe/recipes-support/libnl/libnl_3.2.9.bb
 delete mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb
 create mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb
 create mode 100644 meta/recipes-connectivity/krb5/krb5_1.8.5.bb

-- 
1.8.0.2

[meta-oe][PATCH 01/26] udev: remove from meta-oe

[Martin Jansa]

* udev-182 is now also in oe-core, there is quite big diff between meta-oe version and oe-core version
  but I guess that most of meta-oe users are now also using meta-systemd layer and udev provided by systemd recipe

* sending as RFC because I'm using udev provided by systemd recipe
  and cannot test this properly on my targets, please test and report

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...-generation-it-depends-on-a-working-docto.patch |  45 ----
 meta-oe/recipes-core/udev/udev/cache               |  24 ---
 meta-oe/recipes-core/udev/udev/default             |   4 -
 meta-oe/recipes-core/udev/udev/gtk-doc.make        | 230 ---------------------
 meta-oe/recipes-core/udev/udev/init                |  73 -------
 meta-oe/recipes-core/udev/udev/modprobe.rules      |  17 --
 meta-oe/recipes-core/udev/udev/touchscreen.rules   |  18 --
 meta-oe/recipes-core/udev/udev_173.bb              | 116 -----------
 meta-oe/recipes-core/udev/udev_175.bb              |  91 --------
 meta-oe/recipes-core/udev/udev_182.bb              |  86 --------
 10 files changed, 704 deletions(-)
 delete mode 100644 meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch
 delete mode 100644 meta-oe/recipes-core/udev/udev/cache
 delete mode 100644 meta-oe/recipes-core/udev/udev/default
 delete mode 100644 meta-oe/recipes-core/udev/udev/gtk-doc.make
 delete mode 100644 meta-oe/recipes-core/udev/udev/init
 delete mode 100644 meta-oe/recipes-core/udev/udev/modprobe.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev/touchscreen.rules
 delete mode 100644 meta-oe/recipes-core/udev/udev_173.bb
 delete mode 100644 meta-oe/recipes-core/udev/udev_175.bb
 delete mode 100644 meta-oe/recipes-core/udev/udev_182.bb

diff --git a/meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch b/meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch
deleted file mode 100644
index baf5acd..0000000
--- a/meta-oe/recipes-core/udev/udev/0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 85dcc3a22951d3586b05e3305d735f33b84ee3e5 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Mon, 16 May 2011 14:11:01 +0200
-Subject: [PATCH] rip put doc generation, it depends on a working doctools setup
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- Makefile.am |   21 +--------------------
- 1 files changed, 1 insertions(+), 20 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 651a154..69eb9d9 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -174,26 +174,7 @@ udev_udevadm_LDADD = libudev/libudev-private.la
- # ------------------------------------------------------------------------------
- # udev man pages
- # ------------------------------------------------------------------------------
--dist_man_MANS = \
--	udev/udev.7 \
--	udev/udevadm.8 \
--	udev/udevd.8
--
--dist_noinst_DATA = \
--	udev/udev.html \
--	udev/udevadm.html \
--	udev/udevd.html
--
--EXTRA_DIST += \
--	udev/udev.xml \
--	udev/udevadm.xml \
--	udev/udevd.xml
--
--udev/%.7 udev/%.8 : udev/%.xml
--	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
--
--udev/%.html : udev/%.xml
--	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
-+dist_man_MANS = 
- 
- # ------------------------------------------------------------------------------
- # udev tests
--- 
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/udev/udev/cache b/meta-oe/recipes-core/udev/udev/cache
deleted file mode 100644
index 6936170..0000000
--- a/meta-oe/recipes-core/udev/udev/cache
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-
-export TZ=/etc/localtime
-
-[ -f /etc/default/udev ] && . /etc/default/udev
-
-echo "Caching udev devnodes"
-
-if [ "$DEVCACHE" != "" ]; then
-	echo -n "Populating dev cache"
-	(cd /; tar cf $DEVCACHE dev)
-	mv /tmp/uname /etc/udev/saved.uname
-	mv /tmp/cmdline /etc/udev/saved.cmdline
-	mv /tmp/devices /etc/udev/saved.devices
-	mv /tmp/atags /etc/udev/saved.atags
-	echo
-else
-	rm -f /tmp/uname
-	rm -f /tmp/cmdline
-	rm -f /tmp/devices
-	rm -f /tmp/atags
-fi
-
-exit 0
diff --git a/meta-oe/recipes-core/udev/udev/default b/meta-oe/recipes-core/udev/udev/default
deleted file mode 100644
index 5c4937a..0000000
--- a/meta-oe/recipes-core/udev/udev/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-DEVCACHE="/etc/dev.tar"
diff --git a/meta-oe/recipes-core/udev/udev/gtk-doc.make b/meta-oe/recipes-core/udev/udev/gtk-doc.make
deleted file mode 100644
index 57fab98..0000000
--- a/meta-oe/recipes-core/udev/udev/gtk-doc.make
+++ /dev/null
@@ -1,230 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN =
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-REPORT_FILES = \
-	$(DOC_MODULE)-undocumented.txt \
-	$(DOC_MODULE)-undeclared.txt \
-	$(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-if GTK_DOC_BUILD_HTML
-HTML_BUILD_STAMP=html-build.stamp
-else
-HTML_BUILD_STAMP=
-endif
-if GTK_DOC_BUILD_PDF
-PDF_BUILD_STAMP=pdf-build.stamp
-else
-PDF_BUILD_STAMP=
-endif
-
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
-endif
-
-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-
-$(REPORT_FILES): sgml-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	@touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/html
-	@mkdir $(srcdir)/html
-	@mkhtml_options=""; \
-	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
-	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
-
-#### pdf ####
-
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
-	if test "x$(HTML_IMAGES)" != "x"; then \
-	  for img in $(HTML_IMAGES); do \
-	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-	    fi; \
-	  done; \
-	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
-
-install-data-local:
-	@installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  if test -n "$(DOC_MODULE_VERSION)"; then \
-	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-	  else \
-	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
-	  fi; \
-	  $(mkinstalldirs) $${installdir} ; \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $${installdir}; \
-	  done; \
-	  if test -n "$(DOC_MODULE_VERSION)"; then \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
-	  fi; \
-	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-	fi
-
-uninstall-local:
-	@if test -n "$(DOC_MODULE_VERSION)"; then \
-	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-	else \
-	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-	fi; \
-	rm -rf $${installdir}
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
diff --git a/meta-oe/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init
deleted file mode 100644
index d160300..0000000
--- a/meta-oe/recipes-core/udev/udev/init
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          udev
-# Required-Start:    mountvirtfs
-# Required-Stop:     
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start udevd, populate /dev and load drivers.
-### END INIT INFO
-
-export TZ=/etc/localtime
-
-[ -d /sys/class ] || exit 1
-[ -r /proc/mounts ] || exit 1
-[ -x /sbin/udevd ] || exit 1
-[ -f /etc/default/udev ] && . /etc/default/udev
-[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-
-kill_udevd() {
-	pid=`pidof -x udevd`
-	[ -n "$pid" ] && kill $pid
-}
-
-export ACTION=add
-# propagate /dev from /sys
-echo "Starting udev"
-
-# mount the tmpfs on /dev, if not already done
-LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
-	mount -n -o mode=0755 -t tmpfs none "/dev"
-	mkdir -m 0755 /dev/pts
-	mkdir -m 1777 /dev/shm
-}
-
-if [ "$DEVCACHE" != "" ]; then
-	# Invalidate udev cache if the kernel or its bootargs/cmdline have changed
-	[ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname
-	[ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline
-	[ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices
-	[ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
-	if [ -e $DEVCACHE ] && \
-		cmp -s /tmp/uname /etc/udev/saved.uname && \
-		cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
-		cmp -s /tmp/devices /etc/udev/saved.devices && \
-		cmp -s /tmp/atags /etc/udev/saved.atags; then
-		(cd /; tar xf $DEVCACHE > /dev/null 2>&1)
-		not_first_boot=1
-	fi
-fi
-
-if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then
-	mkdir -p /lib/modules/$(uname -r)
-	depmod -ae
-fi
-
-# make_extra_nodes
-kill_udevd > "/dev/null" 2>&1
-
-# trigger the sorted events
-echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-/sbin/udevd -d
-
-/sbin/udevadm control --env STARTUP=1
-if [ "$not_first_boot" != "" ];then
-	/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics	--subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform --action=add
-	(/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
-else
-	/sbin/udevadm trigger --action=add
-	/sbin/udevadm settle
-fi
-
-exit 0
diff --git a/meta-oe/recipes-core/udev/udev/modprobe.rules b/meta-oe/recipes-core/udev/udev/modprobe.rules
deleted file mode 100644
index d4a096b..0000000
--- a/meta-oe/recipes-core/udev/udev/modprobe.rules
+++ /dev/null
@@ -1,17 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Try and modprobe for drivers for new hardware
-ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/meta-oe/recipes-core/udev/udev/touchscreen.rules b/meta-oe/recipes-core/udev/udev/touchscreen.rules
deleted file mode 100644
index d83fd16..0000000
--- a/meta-oe/recipes-core/udev/udev/touchscreen.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/meta-oe/recipes-core/udev/udev_173.bb b/meta-oe/recipes-core/udev/udev_173.bb
deleted file mode 100644
index 576302c..0000000
--- a/meta-oe/recipes-core/udev/udev_173.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
-/dev/, handles hotplug events and loads drivers at boot time. It replaces \
-the hotplug package and requires a kernel not older than 2.6.27."
-
-# udev 169 and up require kernel 2.6.36 for ARM: 
-# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LICENSE_${PN} = "GPLv2+"
-LICENSE_libudev = "LGPLv2.1+"
-LICENSE_libgudev = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-                    file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-# Needed for udev-extras
-DEPENDS = "gperf-native usbutils acl glib-2.0"
-
-PR = "r4"
-
-# version specific SRC_URI
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.bz2 \
-           file://0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch \
-           file://gtk-doc.make"
-
-# generic SRC_URI
-SRC_URI += " \
-       file://touchscreen.rules \
-       file://modprobe.rules \
-       file://default \
-       file://init \
-       file://cache \
-"
-
-SRC_URI[md5sum] = "2afd20ee1c790eac6d7abe0498ebb414"
-SRC_URI[sha256sum] = "0f753ad9c3022a074d1c052bcee9139581db825283771ac78c0be0d1de109d0c"
-
-# Machine specific udev rules should be in their own recipe that ${PN} can add to RRECOMMENDS
-
-inherit update-rc.d autotools
-
-EXTRA_OECONF += " \
-                  --disable-introspection \
-                  --with-pci-ids-path=/usr/share/misc \
-                  ac_cv_file__usr_share_pci_ids=no \
-                  ac_cv_file__usr_share_hwdata_pci_ids=no \
-                  ac_cv_file__usr_share_misc_pci_ids=yes \
-                  --sbindir=${base_sbindir} \
-                  --libexecdir=${base_libdir}/udev \
-                  --with-rootlibdir=${base_libdir} \
-                  --disable-gtk-doc-html \
-                  --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
-"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/gtk-doc.make ${S}
-}
-
-INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 04 S ."
-
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
-
-FILES_${PN}-systemd = "${base_libdir}/systemd"
-RDEPENDS_${PN}-systemd += "udev"
-
-FILES_libudev = "${base_libdir}/libudev.so.*"
-FILES_libgudev = "${base_libdir}/libgudev*.so.*"
-
-FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
-
-RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
-RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
-RRECOMMENDS_${PN} += "util-linux-blkid"
-
-# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
-# is ${prefix}/lib64
-FILES_${PN} += "/lib/udev*"
-FILES_${PN}-dbg += "/lib/udev/.debug"
- 
-FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
-RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
-
-do_install () {
-	install -d ${D}${usrsbindir} \
-		   ${D}${sbindir}
-	oe_runmake 'DESTDIR=${D}' INSTALL=install install
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-	install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache
-
-	install -d ${D}${sysconfdir}/default
-	install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
-
-	install -m 0644 ${WORKDIR}/*.rules         ${D}${sysconfdir}/udev/rules.d/
-
-	touch ${D}${sysconfdir}/udev/saved.uname
-	touch ${D}${sysconfdir}/udev/saved.cmdline
-	touch ${D}${sysconfdir}/udev/saved.devices
-	touch ${D}${sysconfdir}/udev/saved.atags
-
-	# disable udev-cache sysv script on systemd installs
-	ln -sf /dev/null ${D}/${base_libdir}/systemd/system/udev-cache.service
-}
-
-# Create the cache after checkroot has run
-pkg_postinst_udev_append() {
-	if test "x$D" != "x"; then
-		OPT="-r $D"
-	else
-		OPT="-s"
-	fi
-	update-rc.d $OPT udev-cache start 36 S .
-}
diff --git a/meta-oe/recipes-core/udev/udev_175.bb b/meta-oe/recipes-core/udev/udev_175.bb
deleted file mode 100644
index 2550db2..0000000
--- a/meta-oe/recipes-core/udev/udev_175.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
-/dev/, handles hotplug events and loads drivers at boot time. It replaces \
-the hotplug package and requires a kernel not older than 2.6.27."
-
-DEFAULT_PREFERENCE = "-1"
-
-# udev 169 and up require kernel 2.6.36 for ARM: 
-# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LICENSE_${PN} = "GPLv2+"
-LICENSE_libudev = "LGPLv2.1+"
-LICENSE_libgudev = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-                    file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-# Needed for udev-extras
-DEPENDS = "gperf-native usbutils acl glib-2.0"
-
-PR = "r1"
-
-# 6f410b81aa6d588b03ae795c9b76468591ef7efa -> 175 tag
-SRCREV = "6f410b81aa6d588b03ae795c9b76468591ef7efa"
-
-# version specific SRC_URI
-SRC_URI = "git://git.kernel.org/pub/scm/linux/hotplug/udev.git;protocol=git \
-           file://0001-rip-put-doc-generation-it-depends-on-a-working-docto.patch \
-           file://gtk-doc.make"
-
-# generic SRC_URI
-SRC_URI += " \
-       file://touchscreen.rules \
-       file://modprobe.rules \
-"
-
-S = "${WORKDIR}/git"
-
-# Machine specific udev rules should be in their own recipe that ${PN} can add to RRECOMMENDS
-
-inherit autotools
-
-EXTRA_OECONF += " \
-                  --disable-introspection \
-                  --with-pci-ids-path=/usr/share/misc \
-                  ac_cv_file__usr_share_pci_ids=no \
-                  ac_cv_file__usr_share_hwdata_pci_ids=no \
-                  ac_cv_file__usr_share_misc_pci_ids=yes \
-                  --sbindir=${base_sbindir} \
-                  --libexecdir=${base_libdir}/udev \
-                  --with-rootlibdir=${base_libdir} \
-                  --disable-gtk-doc-html \
-                  --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
-"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/gtk-doc.make ${S}
-}
-
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
-
-FILES_${PN}-systemd = "${systemd_unitdir}"
-RDEPENDS_${PN}-systemd += "udev"
-
-FILES_libudev = "${base_libdir}/libudev.so.*"
-FILES_libgudev = "${base_libdir}/libgudev*.so.*"
-
-FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
-
-RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
-RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
-RRECOMMENDS_${PN} += "util-linux-blkid"
-
-# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
-# is ${prefix}/lib64
-FILES_${PN} += "/lib/udev*"
-FILES_${PN}-dbg += "/lib/udev/.debug"
- 
-FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
-RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
-
-do_install () {
-	install -d ${D}${usrsbindir} \
-		   ${D}${sbindir}
-	oe_runmake 'DESTDIR=${D}' INSTALL=install install
-
-	install -m 0644 ${WORKDIR}/*.rules         ${D}${sysconfdir}/udev/rules.d/
-}
-
diff --git a/meta-oe/recipes-core/udev/udev_182.bb b/meta-oe/recipes-core/udev/udev_182.bb
deleted file mode 100644
index 7d88aed..0000000
--- a/meta-oe/recipes-core/udev/udev_182.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
-/dev/, handles hotplug events and loads drivers at boot time."
-
-# udev 169 and up require kernel 2.6.36 for ARM: 
-# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LICENSE_${PN} = "GPLv2+"
-LICENSE_libudev = "LGPLv2.1+"
-LICENSE_libgudev = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
-                    file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266"
-
-PR = "r1"
-# glib-2.0: Needed for udev-extras
-# util-linux: Needed for libblkid
-# kmod: needed for libkmod
-DEPENDS = "gperf-native usbutils acl glib-2.0 util-linux kmod"
-
-# version specific SRC_URI
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/${P}.tar.gz \
-           file://gtk-doc.make"
-SRC_URI[md5sum] = "1b964456177fbf48023dfee7db3a708d"
-SRC_URI[sha256sum] = "7857ed19fafd8f3ca8de410194e8c7336e9eb8a20626ea8a4ba6449b017faba4"
-
-# generic SRC_URI
-SRC_URI += " \
-       file://touchscreen.rules \
-       file://modprobe.rules \
-"
-
-# Machine specific udev rules should be in their own recipe that ${PN} can add to RRECOMMENDS
-
-inherit autotools
-
-EXTRA_OECONF += " \
-                  --disable-introspection \
-                  --with-pci-ids-path=/usr/share/misc \
-                  ac_cv_file__usr_share_pci_ids=no \
-                  ac_cv_file__usr_share_hwdata_pci_ids=no \
-                  ac_cv_file__usr_share_misc_pci_ids=yes \
-                  --sbindir=${base_sbindir} \
-                  --libexecdir=${base_libdir} \
-                  --with-rootlibdir=${base_libdir} \
-                  --with-rootprefix= \
-                  --disable-gtk-doc-html \
-                  --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
-"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/gtk-doc.make ${S}
-}
-
-LDFLAGS_prepend-libc-uclibc = " -lrt "
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-consolekit udev-utils"
-
-FILES_${PN}-systemd = "${systemd_unitdir}"
-RDEPENDS_${PN}-systemd += "udev"
-
-FILES_libudev = "${base_libdir}/libudev.so.*"
-FILES_libgudev = "${base_libdir}/libgudev*.so.*"
-
-RDEPENDS_${PN} += "udev-utils"
-RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
-
-# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
-# is ${prefix}/lib64
-FILES_${PN} += "/lib/udev*"
-FILES_${PN}-dbg += "/lib/udev/.debug"
-
-FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
-RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
-
-FILES_udev-utils = "${bindir}/udevadm"
-
-do_install () {
-	install -d ${D}${usrsbindir} \
-		   ${D}${sbindir}
-	oe_runmake 'DESTDIR=${D}' INSTALL=install install
-
-	install -m 0644 ${WORKDIR}/*.rules         ${D}${sysconfdir}/udev/rules.d/
-}
-
-- 
1.8.0.2

[meta-oe][PATCH 02/26] modemmanager: update to 0.6.0.0

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

* All *.a files moved to -staticdev
* MJ: fixed *.la packaging

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../dont-include-private-glib-headers.patch        | 94 ----------------------
 ...modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} | 16 ++--
 2 files changed, 9 insertions(+), 101 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
 rename meta-oe/recipes-connectivity/networkmanager/{modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} (59%)

diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch b/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
deleted file mode 100644
index 71dffc0..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 28f64090dfa15097587bbea69209df10b8ab8593 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Mon, 24 Oct 2011 19:09:11 +0000
-Subject: core: don't include private headers from glib
-
-The "glib/gtypes.h" is now considered private, and only "glib.h" should be
-included directly.
----
-diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h
-index 5d5f13f..cec5dc3 100644
---- a/src/mm-at-serial-port.h
-+++ b/src/mm-at-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_AT_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-manager.h b/src/mm-manager.h
-index 1c98458..c6a64bd 100644
---- a/src/mm-manager.h
-+++ b/src/mm-manager.h
-@@ -17,7 +17,6 @@
- #ifndef MM_MANAGER_H
- #define MM_MANAGER_H
- 
--#include <glib/gtypes.h>
- #include <glib-object.h>
- #include <dbus/dbus-glib.h>
- #include "mm-modem.h"
-diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h
-index 933aae1..be11af6 100644
---- a/src/mm-modem-base.h
-+++ b/src/mm-modem-base.h
-@@ -18,7 +18,6 @@
- #define MM_MODEM_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
-diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
-index 4b0932c..5b049a4 100644
---- a/src/mm-plugin-base.h
-+++ b/src/mm-plugin-base.h
-@@ -17,7 +17,6 @@
- #define MM_PLUGIN_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-diff --git a/src/mm-port.h b/src/mm-port.h
-index 4bcffd4..df935db 100644
---- a/src/mm-port.h
-+++ b/src/mm-port.h
-@@ -17,7 +17,6 @@
- #define MM_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- typedef enum {
-diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h
-index 2786ee8..605016d 100644
---- a/src/mm-qcdm-serial-port.h
-+++ b/src/mm-qcdm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_QCDM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h
-index eb12cbb..9450926 100644
---- a/src/mm-serial-port.h
-+++ b/src/mm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
---
-cgit v0.9.0.2-2-gbebe
diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
similarity index 59%
rename from meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
rename to meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
index 55e083a..60a5425 100644
--- a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
@@ -3,23 +3,25 @@ DEPENDS = "ppp udev glib-2.0"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r1"
+PR = "r0"
 
 inherit gnome gettext
 
-SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.bz2 \
-file://dont-include-private-glib-headers.patch" 
+SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "cd04109506e88bf4c4cd3e7ce0034c08"
-SRC_URI[sha256sum] = "108de70537b1193634883fa6b3642b130a23f4c04d901cb15caeceb486af6152"
+SRC_URI[md5sum] = "f32640f6672d997ec0887307186e9639"
+SRC_URI[sha256sum] = "d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2"
 
 S = "${WORKDIR}/ModemManager-${PV}"
 
 FILES_${PN}-dbg += "${libdir}/ModemManager/.debug \
                     ${libdir}/pppd/*/.debug"
 FILES_${PN}-dev += "${datadir}/dbus-1/interfaces \
-                    ${libdir}/ModemManager/*a \
-                    ${libdir}/pppd/*/*a"
+                    ${libdir}/pppd/*/*.la \
+                    ${libdir}/ModemManager/*.la"
+FILES_${PN}-staticdev += "\
+                          ${libdir}/ModemManager/*.a \
+                          ${libdir}/pppd/*/*.a"
 FILES_${PN} += "${datadir}/dbus-1/*services/ \
                 ${libdir}/ModemManager/*.so \
                 ${libdir}/pppd/*/*.so \
-- 
1.8.0.2

[meta-oe][PATCH 03/26] samba: added gnu-configize for AArch64 support

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 7985199..4750ecb 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -50,6 +50,7 @@ EXTRA_OECONF += "\
 	"
 
 do_configure() {
+	gnu-configize --force
 	oe_runconf
 }
 
-- 
1.8.0.2

[meta-oe][PATCH 04/26] dialog: added gnu-configize for AArch64 support

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/dialog/dialog.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc
index 03b0aa7..27e4e60 100644
--- a/meta-oe/recipes-extended/dialog/dialog.inc
+++ b/meta-oe/recipes-extended/dialog/dialog.inc
@@ -19,6 +19,7 @@ EXTRA_OECONF = "--with-ncurses \
                 --disable-rpath-hack"
 
 do_configure() {
+    gnu-configize --force
     sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure
     oe_runconf
 }
-- 
1.8.0.2

[meta-oe][PATCH 05/26] xterm: added gnu-configize for AArch64 support

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xorg-app/xterm_277.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_277.bb b/meta-oe/recipes-graphics/xorg-app/xterm_277.bb
index f68e23c..18abe35 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_277.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_277.bb
@@ -15,6 +15,7 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
                  --disable-setuid"
 
 do_configure() {
+        gnu-configize --force
         sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
         oe_runconf
 }
-- 
1.8.0.2

[meta-oe][PATCH 06/26] florence: added gnome-doc-utils and libnotify to dependencies

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

gnome-doc-utils due to this:

| autoreconf: Entering directory `.'
| autoreconf: configure.ac: not using Gettext
| autoreconf: running: aclocal --system-acdir=/home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/work/aarch64-oe-linux/florence/0.5.1-r1/florence-0.5.1/aclocal-copy/ --automake-acdir=/home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force
| autoreconf: configure.ac: tracing
| autoreconf: configure.ac: not using Libtool
| autoreconf: running: /home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/autoconf --force
| autoreconf: running: /home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/autoheader --force
| autoreconf: running: automake --foreign --add-missing --copy --force-missing
| gnome-doc-utils.make:63: error: HAVE_GNOME_DOC_UTILS does not appear in AM_CONDITIONAL
| docs/Makefile.am:1:   'gnome-doc-utils.make' included from here
| gnome-doc-utils.make:143: error: ENABLE_SK does not appear in AM_CONDITIONAL
| docs/Makefile.am:1:   'gnome-doc-utils.make' included from here
| gnome-doc-utils.make:192: error: ENABLE_SK does not appear in AM_CONDITIONAL
| docs/Makefile.am:1:   'gnome-doc-utils.make' included from here
| src/Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.

libnotify due to:

| configure:7503: checking for LIBNOTIFY
| configure:7510: $PKG_CONFIG --exists --print-errors "libnotify"
| Package libnotify was not found in the pkg-config search path.
| Perhaps you should add the directory containing `libnotify.pc'
| to the PKG_CONFIG_PATH environment variable
| No package 'libnotify' found

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/florence/florence_0.5.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/florence/florence_0.5.1.bb b/meta-oe/recipes-support/florence/florence_0.5.1.bb
index dcbcefa..56d8914 100644
--- a/meta-oe/recipes-support/florence/florence_0.5.1.bb
+++ b/meta-oe/recipes-support/florence/florence_0.5.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 PR = "r1"
 
-DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native"
+DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify"
 
 SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2 \
            file://0001-Fix-glib-includes.patch"
-- 
1.8.0.2

[meta-oe][PATCH 07/26] meta-oe: Fix erroneous use of "startline" in LIC_FILES_CHKSUM

[Martin Jansa]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

"beginline" is the correct parameter name. Checksums have been updated
where necessary (i.e. if the beginning line was something other than the
default of 1).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb       | 2 +-
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc            | 2 +-
 meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb | 2 +-
 meta-oe/recipes-extended/tmux/tmux_1.6.bb                | 2 +-
 meta-oe/recipes-support/mini-iconv/mini-iconv.bb         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
index 3000dbb..7e0a4fb 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
@@ -7,7 +7,7 @@ SECTION = "console"
 LICENSE = "GPLv3+"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-                    file://main_common.cc;startline=5;endline=16;md5=0ef2c1bede11c6c9c6c12330d60bc7a7"
+                    file://main_common.cc;beginline=5;endline=16;md5=b5a59150a33658cc1ffc31b1a4ffb9f2"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz"
 SRC_URI[md5sum] = "57b67407e882c6418531d48a2f20d16b"
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
index 76669be..4040870 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
 DEPENDS = "virtual/libusb0 ncurses"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
-                    file://README;startline=60;md5=8237b4d4d80a525b15f8162192e07bee"
+                    file://README;beginline=60;md5=637e042cdd3671ba00e78b58ede45d3b"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"
 
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb
index cf6c212..89b4f06 100644
--- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.pengutronix.de"
 SECTION = "libs/network"
 
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://src/libsocketcan.c;startline=3;endline=17;md5=2c5c54d58b42d2216f34759062be3ddb"
+LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1"
 
 SRCREV = "3a2cec63a4e6212cc63d21008453bd799cfe8774"
 
diff --git a/meta-oe/recipes-extended/tmux/tmux_1.6.bb b/meta-oe/recipes-extended/tmux/tmux_1.6.bb
index fa58065..6be2355 100644
--- a/meta-oe/recipes-extended/tmux/tmux_1.6.bb
+++ b/meta-oe/recipes-extended/tmux/tmux_1.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tmux.sourceforge.net"
 SECTION = "console/utils"
 
 LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://tmux.c;startline=3;endline=17;md5=f36d9c9e6c1c24996a88891fdf783d04"
+LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=8685b4455330a940fab1ff451aa941a0"
 
 DEPENDS = "ncurses libevent sed-native"
 
diff --git a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
index 7d5bc68..3150013 100644
--- a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
+++ b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 DEPENDS = ""
 PROVIDES = "virtual/libiconv"
 PR = "r0"
-LIC_FILES_CHKSUM = "file://iconv.c;startline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8"
+LIC_FILES_CHKSUM = "file://iconv.c;beginline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8"
 SRC_URI = "http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/mini-iconv.tar.bz2"
 SRC_URI[md5sum] = "84412221e26505a2b3855d4a1cdcd0e0"
 SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aac0a0d4"
-- 
1.8.0.2

[meta-oe][PATCH 08/26] meta-networking: Fix erroneous use of "startline" in LIC_FILES_CHKSUM

[Martin Jansa]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

"beginline" is the correct parameter name. Checksums have been updated
where necessary (i.e. if the beginning line was something other than the
default of 1).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 4 ++--
 meta-networking/recipes-support/mtr/mtr_0.82.bb          | 2 +-
 meta-networking/recipes-support/tunctl/tunctl.inc        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index 40294b0..af48455 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -8,8 +8,8 @@ and should not be enabled unless it is expressly needed."
 DEPENDS = "tcp-wrappers readline"
 SECTION = "network"
 LICENSE = "BSD-4-Clause"
-LIC_FILES_CHKSUM = "file://MCONFIG.in;startline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
-                    file://tftp/tftp.c;startline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
+LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
+                    file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
 
 PR = "r0"
 
diff --git a/meta-networking/recipes-support/mtr/mtr_0.82.bb b/meta-networking/recipes-support/mtr/mtr_0.82.bb
index c6d5152..3a93948 100644
--- a/meta-networking/recipes-support/mtr/mtr_0.82.bb
+++ b/meta-networking/recipes-support/mtr/mtr_0.82.bb
@@ -5,7 +5,7 @@ DEPENDS = "ncurses"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                    file://mtr.c;startline=5;endline=16;md5=87105f8fe9675e897e074869afaafa6f"
+                    file://mtr.c;beginline=5;endline=16;md5=56e390ced194aff352eefab404883057"
 
 SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz \
            file://no-gtk.patch"
diff --git a/meta-networking/recipes-support/tunctl/tunctl.inc b/meta-networking/recipes-support/tunctl/tunctl.inc
index 952af24..29aed44 100644
--- a/meta-networking/recipes-support/tunctl/tunctl.inc
+++ b/meta-networking/recipes-support/tunctl/tunctl.inc
@@ -1,7 +1,7 @@
 SUMMARY = "Tool for controlling the Linux TUN/TAP driver"
 SECTION = "net"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://tunctl.c;startline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999"
+LIC_FILES_CHKSUM = "file://tunctl.c;beginline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz"
 
-- 
1.8.0.2

[meta-oe][PATCH 09/26] libnl: remove

[Martin Jansa]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

Version 3.2.14 is now in OE-Core.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/libnl/libnl_3.2.9.bb | 52 ----------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libnl/libnl_3.2.9.bb

diff --git a/meta-oe/recipes-support/libnl/libnl_3.2.9.bb b/meta-oe/recipes-support/libnl/libnl_3.2.9.bb
deleted file mode 100644
index 11b901c..0000000
--- a/meta-oe/recipes-support/libnl/libnl_3.2.9.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-SECTION = "libs/network"
-
-PE = "1"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "flex-native bison-native"
-
-SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz"
-
-SRC_URI[md5sum] = "c13adec0239b266207fff07d79e5ce9e"
-SRC_URI[sha256sum] = "9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-    # make wpa-supplicant happy
-    # TODO: when moving to oe-core fix at wpa-supplicant
-    # (e.g src/drivers/drivers.mak)
-    cd ${D}${includedir}
-    ln -sf libnl3/netlink netlink
-    cd ${D}${libdir}
-    ln -sf libnl-3.so.200 libnl.so
-    ln -sf libnl-3.so.200 libnl.so.3
-    ln -sf libnl-genl-3.so.200 libnl-genl.so
-    ln -sf libnl-genl-3.so.200 libnl-genl.so.3
-}
-
-FILES_${PN} = "${libdir}/libnl-3.so.* \
-               ${libdir}/libnl.so.* \
-               ${sysconfdir}"
-RREPLACES_${PN} = "libnl2"
-RCONFLICTS_${PN} = "libnl2"
-FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
-FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
-                    ${libdir}/libnl/cli/*/*.la"
-FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
-
-PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl"
-FILES_${PN}-cli   = "${libdir}/libnl-cli-3.so.* \
-                     ${libdir}/libnl/cli/*/*.so.* \
-                     ${sbindir}/nl-*"
-FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nf-3.so.*"
-FILES_${PN}-genl  = "${libdir}/libnl-genl-3.so.* \
-                     ${libdir}/libnl-genl.so.* \
-                     ${sbindir}/genl-ctrl-list"
-RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
-RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
-- 
1.8.0.2

[meta-oe][PATCH 10/26] gtk+3: add libxi dependency

[Martin Jansa]

From: Marko Lindqvist <cazfi74@gmail.com>

Without even compile fails:
| In file included from gdkdevice-xi.c:24:0:
| gdkdeviceprivate-xi.h:28:35: fatal error: X11/extensions/XInput.h: No such file or directory

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
index 854ba41..55397cc 100644
--- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
+++ b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor \
            gtk-doc-native docbook-utils-native libxrandr libgcrypt \
-           libxdamage libxrender libxcomposite cairo gdk-pixbuf gtk+-native"
+           libxdamage libxrender libxcomposite libxi cairo gdk-pixbuf gtk+-native"
 
 LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
 
-- 
1.8.0.2

[meta-oe][PATCH 11/26] samba: Fix build on Fedora 17

[Martin Jansa]

From: Ting Liu <b28495@freescale.com>

* Fedora 17 has /bin/perl, this causes samba build to put perl interpreter
  path as /bin/perl But we set perl location for target as /usr/bin/perl

* This mismatch of perl path causes failure of rootfs image creation:
  | error: Failed dependencies:
  | 	/bin/perl is needed by samba-3.6.8-r3.ppce5500

* MJ: fixed whitespaces

Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/samba/samba.inc      | 7 ++++---
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index d39a84a..416334a 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -84,11 +84,12 @@ do_install_append() {
 	install -d ${D}/var/log/samba
 	install -d ${D}/var/spool/samba
 
-        # Install other stuff not installed by "make install"
-        install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
-        install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
+	# Install other stuff not installed by "make install"
+	install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
+	install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
 
 	rmdir ${D}${base_sbindir}
+	sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
 }
 
 
diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 4750ecb..5722cb6 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "\
     file://config-h.patch \
-- 
1.8.0.2

[meta-oe][PATCH 12/26] fakeroot: update to upstream version 1.18.4

[Martin Jansa]

From: Marko Lindqvist <cazfi74@gmail.com>

License is now GPLv3

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...t-native_1.12.4.bb => fakeroot-native_1.18.4.bb} |  4 ----
 .../fakeroot/fakeroot/configure-libtool.patch       | 20 --------------------
 .../recipes-core/fakeroot/fakeroot/fix-prefix.patch | 15 ---------------
 .../{fakeroot_1.12.4.bb => fakeroot_1.18.4.bb}      | 21 +++++++++++----------
 4 files changed, 11 insertions(+), 49 deletions(-)
 rename meta-oe/recipes-core/fakeroot/{fakeroot-native_1.12.4.bb => fakeroot-native_1.18.4.bb} (67%)
 delete mode 100644 meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch
 delete mode 100644 meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch
 rename meta-oe/recipes-core/fakeroot/{fakeroot_1.12.4.bb => fakeroot_1.18.4.bb} (45%)

diff --git a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
similarity index 67%
rename from meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb
rename to meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
index 1e9f15a..a27a60b 100644
--- a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb
+++ b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
@@ -1,6 +1,5 @@
 require fakeroot_${PV}.bb
 
-SRC_URI += "file://fix-prefix.patch"
 S = "${WORKDIR}/fakeroot-${PV}"
 
 inherit native
@@ -14,6 +13,3 @@ python () {
 }
 
 RDEPENDS_${PN} = "util-linux-native"
-
-SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70"
-SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d"
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch b/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch
deleted file mode 100644
index 46f7df7..0000000
--- a/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: fakeroot-1.12.1/configure.ac
-===================================================================
---- fakeroot-1.12.1.orig/configure.ac
-+++ fakeroot-1.12.1/configure.ac
-@@ -2,14 +2,12 @@
- AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
- AC_PREREQ(2.61)
- AC_CONFIG_MACRO_DIR([build-aux])
--LT_PREREQ(2.1a)
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
- AC_CONFIG_HEADERS([config.h])
- AC_PROG_MAKE_SET
--LT_INIT
--LT_LANG(C)
-+AC_PROG_LIBTOOL
- 
- AH_BOTTOM([#if ! HAVE_BUILTIN_EXPECT
- #define __builtin_expect(x, expected_value) (x)
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch b/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch
deleted file mode 100644
index 3c47bd7..0000000
--- a/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: fakeroot-1.12.1/scripts/fakeroot.in
-===================================================================
---- fakeroot-1.12.1.orig/scripts/fakeroot.in
-+++ fakeroot-1.12.1/scripts/fakeroot.in
-@@ -30,8 +30,8 @@
- }
- 
- # strip /bin/fakeroot to find install prefix
--PREFIX=@prefix@
--BINDIR=@bindir@
-+BINDIR=`dirname $0`
-+PREFIX=`dirname ${BINDIR}`
- 
- USEABSLIBPATH=@LDPRELOADABS@
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb
similarity index 45%
rename from meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb
rename to meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb
index 1cc5602..a277a69 100644
--- a/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb
+++ b/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb
@@ -1,27 +1,28 @@
 DESCRIPTION = "Gives a fake root environment"
 HOMEPAGE = "http://fakeroot.alioth.debian.org"
 SECTION = "base"
-LICENSE = "GPL"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7686b00e9859a1a04043d33452bae823"
-PR = "r2"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+PR = "r0"
 
 SRC_URI = "\
-  ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-  file://configure-libtool.patch \
+  ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \
 "
-	    
+
 inherit autotools
 
+do_configure_prepend() {
+        mkdir -p ${S}/build-aux
+}
+
 do_install_append() {
         install -d ${D}${includedir}/fakeroot
         install -m 644 *.h ${D}${includedir}/fakeroot
-        install -d ${D}${libdir}/libfakeroot/
-        oe_libinstall -so libfakeroot ${D}${libdir}/libfakeroot/
 }
 
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS_${PN} = "util-linux"
 
 
-SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70"
-SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d"
+SRC_URI[md5sum] = "706171d8d520b1ca1576ac73f2ceb4f3"
+SRC_URI[sha256sum] = "0a359efa3e9496c33234b3e9c89306a09bb4da9d33de43c261f1d8447e6ebea2"
-- 
1.8.0.2

[meta-oe][PATCH 13/26] python-numpy: add missing runtime dependencies

[Martin Jansa]

From: Ross Burton <ross.burton@intel.com>

MJ: added PR bump

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
index 031d1cf..2bede09 100644
--- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
+++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 LICENSE = "PSF"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3c42211d73c3faa1026e671dd39883fa"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
            ${CONFIGFILESURI} \
@@ -37,4 +37,6 @@ FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
 RDEPENDS_${PN} = "python-unittest \
                   python-difflib \
                   python-pprint \
+                  python-pickle \
+                  python-shell \
                  "
-- 
1.8.0.2

[meta-oe][PATCH 14/26] proj: add recipe

[Martin Jansa]

From: Jan Luebbe <jluebbe@debian.org>

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/proj/proj.inc      | 13 +++++++++++++
 meta-oe/recipes-navigation/proj/proj_4.7.0.bb |  7 +++++++
 2 files changed, 20 insertions(+)
 create mode 100644 meta-oe/recipes-navigation/proj/proj.inc
 create mode 100644 meta-oe/recipes-navigation/proj/proj_4.7.0.bb

diff --git a/meta-oe/recipes-navigation/proj/proj.inc b/meta-oe/recipes-navigation/proj/proj.inc
new file mode 100644
index 0000000..f6275d1
--- /dev/null
+++ b/meta-oe/recipes-navigation/proj/proj.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
+HOMEPAGE = "http://trac.osgeo.org/proj/"
+SECTION = "libs"
+
+INC_PR = "r0"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608"
+
+SRC_URI = "http://download.osgeo.org/proj/proj-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
diff --git a/meta-oe/recipes-navigation/proj/proj_4.7.0.bb b/meta-oe/recipes-navigation/proj/proj_4.7.0.bb
new file mode 100644
index 0000000..8e4f901
--- /dev/null
+++ b/meta-oe/recipes-navigation/proj/proj_4.7.0.bb
@@ -0,0 +1,7 @@
+require proj.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "927d34623b52e0209ba2bfcca18fe8cd"
+SRC_URI[sha256sum] = "fc5440002a496532bfaf423c28bdfaf9e26cc96c84ccefcdefde911efbd98986"
+
-- 
1.8.0.2

[meta-oe][PATCH 15/26] geos: add recipe

[Martin Jansa]

From: Jan Luebbe <jluebbe@debian.org>

* MJ: fixed packaging and QA issues

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/geos/geos.inc      | 19 +++++++++++++++++++
 meta-oe/recipes-navigation/geos/geos_3.3.2.bb |  7 +++++++
 2 files changed, 26 insertions(+)
 create mode 100644 meta-oe/recipes-navigation/geos/geos.inc
 create mode 100644 meta-oe/recipes-navigation/geos/geos_3.3.2.bb

diff --git a/meta-oe/recipes-navigation/geos/geos.inc b/meta-oe/recipes-navigation/geos/geos.inc
new file mode 100644
index 0000000..eda4ad3
--- /dev/null
+++ b/meta-oe/recipes-navigation/geos/geos.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "GEOS - Geometry Engine, Open Source"
+HOMEPAGE = "http://trac.osgeo.org/geos/"
+SECTION = "libs"
+
+INC_PR = "r0"
+
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+# libgeos-${PV}.so is needed in PV
+FILES_SOLIBSDEV = ""
+FIELS_${PN}-dev = "${libdir}/libgeos.so \
+                   ${libdir}/libgeos_c.so"
+FILES_${PN} += " ${libdir}/libgeos-${PV}.so"
+INSANE_SKIP_${PN} = "dev-so"
diff --git a/meta-oe/recipes-navigation/geos/geos_3.3.2.bb b/meta-oe/recipes-navigation/geos/geos_3.3.2.bb
new file mode 100644
index 0000000..e57ca6b
--- /dev/null
+++ b/meta-oe/recipes-navigation/geos/geos_3.3.2.bb
@@ -0,0 +1,7 @@
+require geos.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "5b7270c73fd1c516f368af8fd1962323"
+SRC_URI[sha256sum] = "ec64d3a92540a1618aa3b91dc1235caae1c370ec23afd59a2734062bf182ed5b"
+
-- 
1.8.0.2

[meta-oe][PATCH 16/26] libspatialite: add recipe

[Martin Jansa]

From: Jan Luebbe <jluebbe@debian.org>

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libspatialite/libspatialite.inc                |  16 ++
 .../fix-the-configure-script-and-freexl.patch      | 200 +++++++++++++++++++++
 .../libspatialite/libspatialite_3.0.1.bb           |   9 +
 3 files changed, 225 insertions(+)
 create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite.inc
 create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch
 create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb

diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite.inc b/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
new file mode 100644
index 0000000..f51b3a5
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
@@ -0,0 +1,16 @@
+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"
+
+INC_PR = "r0"
+
+LICENSE = "MPLv1.1 GPLv2+ LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e"
+
+SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-freexl=no"
+
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch
new file mode 100644
index 0000000..0cd0c3f
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch
@@ -0,0 +1,200 @@
+From upstream fossil repo, extracted via git, dropping configure.ac for amalgamation
+
+From: sandro <sandro>
+Date: Sat, 21 Jan 2012 16:53:28 +0000
+Subject: [PATCH] fixing the ./configure script: --enable-geocallbacks=no is
+ the new default and fixing some flaws for
+ --enable-freexl=no
+
+---
+ configure                   |   20 ++++++++++----------
+ configure.ac                |   20 ++++++++++----------
+ src/shapefiles/shapefiles.c |    2 ++
+ 4 files changed, 32 insertions(+), 30 deletions(-)
+
+diff --git a/configure b/configure
+index e8cf620..917bfca 100755
+--- a/configure
++++ b/configure
+@@ -1410,7 +1410,7 @@ Optional Features:
+                           optimize for fast installation [default=yes]
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-mathsql        enables SQL math functions [default=yes]
+-  --enable-geocallbacks   enables geometry callbacks [default=yes]
++  --enable-geocallbacks   enables geometry callbacks [default=no]
+   --enable-proj           enables PROJ.4 inclusion [default=yes]
+   --enable-geos           enables GEOS inclusion [default=yes]
+   --enable-geosadvanced   enables GEOS advanced features [default=yes]
+@@ -16980,7 +16980,7 @@ ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src
+ if test "${enable_mathsql+set}" = set; then :
+   enableval=$enable_mathsql;
+ else
+-  mathsql=yes
++  enable_mathsql=yes
+ fi
+ 
+ if test x"$enable_mathsql" != "xno"; then
+@@ -16998,10 +16998,10 @@ fi
+ if test "${enable_geocallbacks+set}" = set; then :
+   enableval=$enable_geocallbacks;
+ else
+-  geocallbacks=yes
++  enable_geocallbacks=no
+ fi
+ 
+-if test x"$enable_geocallbacks" != "xno"; then
++if test x"$enable_geocallbacks" == "xyes"; then
+   OMIT_GEOCALLBACKS_FLAGS=
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_rtree_geometry_callback in -lsqlite3" >&5
+ $as_echo_n "checking for sqlite3_rtree_geometry_callback in -lsqlite3... " >&6; }
+@@ -17063,7 +17063,7 @@ fi
+ if test "${enable_proj+set}" = set; then :
+   enableval=$enable_proj;
+ else
+-  proj=yes
++  enable_proj=yes
+ fi
+ 
+ if test x"$enable_proj" != "xno"; then
+@@ -17153,7 +17153,7 @@ fi
+ if test "${enable_geos+set}" = set; then :
+   enableval=$enable_geos;
+ else
+-  geos=yes
++  enable_geos=yes
+ fi
+ 
+ if test x"$enable_geos" != "xno"; then
+@@ -17237,7 +17237,7 @@ fi
+ if test "${enable_geosadvanced+set}" = set; then :
+   enableval=$enable_geosadvanced;
+ else
+-  geosadvanced=yes
++  enable_geosadvanced=yes
+ fi
+ 
+   if test x"$enable_geosadvanced" != "xno"; then
+@@ -17316,7 +17316,7 @@ fi
+ if test "${enable_iconv+set}" = set; then :
+   enableval=$enable_iconv;
+ else
+-  geos=yes
++  enable_iconv=yes
+ fi
+ 
+ if test x"$enable_iconv" != "xno"; then
+@@ -17579,7 +17579,7 @@ fi
+ if test "${enable_freexl+set}" = set; then :
+   enableval=$enable_freexl;
+ else
+-  proj=yes
++  enable_freexl=yes
+ fi
+ 
+ if test x"$enable_freexl" != "xno"; then
+@@ -17669,7 +17669,7 @@ fi
+ if test "${enable_epsg+set}" = set; then :
+   enableval=$enable_epsg;
+ else
+-  epsg=yes
++  enable_epsg=yes
+ fi
+ 
+ if test x"$enable_epsg" != "xno"; then
+diff --git a/configure.ac b/configure.ac
+index 216cc9f..69cb6c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,7 +79,7 @@ AC_CONFIG_FILES([Makefile \
+ #
+ AC_ARG_ENABLE(mathsql, [AS_HELP_STRING(
+   [--enable-mathsql], [enables SQL math functions [default=yes]])],
+-  [], [mathsql=yes])
++  [], [enable_mathsql=yes])
+ if test x"$enable_mathsql" != "xno"; then
+   OMIT_MATHSQL_FLAGS=
+ else
+@@ -92,9 +92,9 @@ AC_SUBST(OMIT_MATHSQL_FLAGS)
+ #   --enable-geocallbacks
+ #
+ AC_ARG_ENABLE(geocallbacks, [AS_HELP_STRING(
+-  [--enable-geocallbacks], [enables geometry callbacks [default=yes]])],
+-  [], [geocallbacks=yes])
+-if test x"$enable_geocallbacks" != "xno"; then
++  [--enable-geocallbacks], [enables geometry callbacks [default=no]])],
++  [], [enable_geocallbacks=no])
++if test x"$enable_geocallbacks" == "xyes"; then
+   OMIT_GEOCALLBACKS_FLAGS=
+   AC_CHECK_LIB(sqlite3,sqlite3_rtree_geometry_callback,,AC_MSG_ERROR([obsolete 'libsqlite3' (< v.3.7.3). please retry specifying: --disable-geocallbacks]),-lm)
+ else
+@@ -108,7 +108,7 @@ AC_SUBST(OMIT_GEOCALLBACKS_FLAGS)
+ #
+ AC_ARG_ENABLE(proj, [AS_HELP_STRING(
+   [--enable-proj], [enables PROJ.4 inclusion [default=yes]])],
+-  [], [proj=yes])
++  [], [enable_proj=yes])
+ if test x"$enable_proj" != "xno"; then
+   OMIT_PROJ_FLAGS=
+   AC_CHECK_HEADERS(proj_api.h,, [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])
+@@ -124,7 +124,7 @@ AC_SUBST(OMIT_PROJ_FLAGS)
+ #
+ AC_ARG_ENABLE(geos, [AS_HELP_STRING(
+   [--enable-geos], [enables GEOS inclusion [default=yes]])],
+-  [], [geos=yes])
++  [], [enable_geos=yes])
+ if test x"$enable_geos" != "xno"; then
+   OMIT_GEOS_FLAGS=
+   AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
+@@ -134,7 +134,7 @@ if test x"$enable_geos" != "xno"; then
+   #
+   AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
+ 	  [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
+-	  [], [geosadvanced=yes])
++	  [], [enable_geosadvanced=yes])
+   if test x"$enable_geosadvanced" != "xno"; then
+ 	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
+ 	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
+@@ -152,7 +152,7 @@ AC_SUBST(OMIT_GEOS_FLAGS)
+ #
+ AC_ARG_ENABLE(iconv, [AS_HELP_STRING(
+   [--enable-iconv], [enables ICONV inclusion [default=yes]])],
+-  [], [geos=yes])
++  [], [enable_iconv=yes])
+ if test x"$enable_iconv" != "xno"; then
+   OMIT_ICONV_FLAGS=
+   AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
+@@ -172,7 +172,7 @@ AC_SUBST(OMIT_ICONV_FLAGS)
+ #
+ AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
+   [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
+-  [], [proj=yes])
++  [], [enable_freexl=yes])
+ if test x"$enable_freexl" != "xno"; then
+   OMIT_FREEXL_FLAGS=
+   AC_CHECK_HEADERS(freexl.h,, [AC_MSG_ERROR([cannot find freexl.h, bailing out])])
+@@ -188,7 +188,7 @@ AC_SUBST(OMIT_FREEXL_FLAGS)
+ #
+ AC_ARG_ENABLE(epsg, [AS_HELP_STRING(
+   [--enable-epsg], [enables full EPSG dataset support [default=yes]])],
+-  [], [epsg=yes])
++  [], [enable_epsg=yes])
+ if test x"$enable_epsg" != "xno"; then
+   OMIT_EPSG_FLAGS=
+ else
+diff --git a/src/shapefiles/shapefiles.c b/src/shapefiles/shapefiles.c
+index 4bf5fd0..09e3cd3 100644
+--- a/src/shapefiles/shapefiles.c
++++ b/src/shapefiles/shapefiles.c
+@@ -62,7 +62,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
+ #include <spatialite/gaiageo.h>
+ #include <spatialite.h>
+ 
++#ifndef OMIT_FREEXL
+ #include <freexl.h>
++#endif
+ 
+ #if defined(_WIN32) && !defined(__MINGW32__)
+ #define strcasecmp	_stricmp
+-- 
+1.7.9.1
+
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb
new file mode 100644
index 0000000..1cb72e8
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb
@@ -0,0 +1,9 @@
+require libspatialite.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "450d1a0d9da1bd9f770b7db3f2509f69"
+SRC_URI[sha256sum] = "4983d6584069fd5ff0cfcccccee1015088dab2db177c0dc7050ce8306b68f8e6"
+
+SRC_URI =+ "file://fix-the-configure-script-and-freexl.patch"
+
-- 
1.8.0.2

[meta-oe][PATCH 17/26] wpa-supplicant, gcc-common-4.6, packagegroup-qte-toolchain-target: use correct PRINC form

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend | 2 +-
 .../recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend     | 2 +-
 toolchain-layer/recipes-devtools/gcc/gcc-common-4.6.inc                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
index 7ca6c59..f379101 100644
--- a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
+++ b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
@@ -1,3 +1,3 @@
 RDEPENDS_${PN} += "qwt-e-dev"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
index a4dceb4..609a1f3 100644
--- a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
@@ -1,4 +1,4 @@
-PRINC = "2"
+PRINC := "${@int(PRINC) + 2}"
 
 inherit systemd
 
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-common-4.6.inc b/toolchain-layer/recipes-devtools/gcc/gcc-common-4.6.inc
index cbb90e9..f6b4929 100644
--- a/toolchain-layer/recipes-devtools/gcc/gcc-common-4.6.inc
+++ b/toolchain-layer/recipes-devtools/gcc/gcc-common-4.6.inc
@@ -1,4 +1,4 @@
 # this will prepend this layer to FILESPATH
 FILESEXTRAPATHS := "${THISDIR}/gcc-4.6"
-PRINC = "6"
+PRINC := "${@int(PRINC) + 6}"
 ARM_INSTRUCTION_SET = "arm"
-- 
1.8.0.2

[meta-oe][PATCH 18/26] lua: update to upstream version 5.1.5

[Martin Jansa]

From: Marko Lindqvist <cazfi74@gmail.com>

* COPYRIGHT: md5sum changed only because (C) years now up to 2012.
* MJ: removed trailing whitespaces

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../lua/lua5.1/bitwise_operators.patch             | 143 +++++++++------------
 meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc      |   2 +-
 .../lua/{lua5.1_5.1.4.bb => lua5.1_5.1.5.bb}       |   9 +-
 3 files changed, 69 insertions(+), 85 deletions(-)
 rename meta-oe/recipes-devtools/lua/{lua5.1_5.1.4.bb => lua5.1_5.1.5.bb} (75%)

diff --git a/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch b/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch
index 138a2bd..4f0331e 100644
--- a/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch
+++ b/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch
@@ -1,8 +1,7 @@
-Index: lua-5.1.4/src/lcode.c
-===================================================================
---- lua-5.1.4.orig/src/lcode.c	2007-12-28 16:32:23.000000000 +0100
-+++ lua-5.1.4/src/lcode.c	2009-01-27 21:15:39.000000000 +0100
-@@ -650,6 +650,17 @@
+diff -Nurd lua-5.1.5/src/lcode.c lua-5.1.5/src/lcode.c
+--- lua-5.1.5/src/lcode.c	2011-01-31 16:53:16.000000000 +0200
++++ lua-5.1.5/src/lcode.c	2012-11-28 21:12:23.958419501 +0200
+@@ -642,6 +642,17 @@
      case OP_POW: r = luai_numpow(v1, v2); break;
      case OP_UNM: r = luai_numunm(v1); break;
      case OP_LEN: return 0;  /* no constant folding for 'len' */
@@ -20,7 +19,7 @@ Index: lua-5.1.4/src/lcode.c
      default: lua_assert(0); r = 0; break;
    }
    if (luai_numisnan(r)) return 0;  /* do not attempt to produce NaN */
-@@ -662,7 +673,11 @@
+@@ -654,7 +665,11 @@
    if (constfolding(op, e1, e2))
      return;
    else {
@@ -32,7 +31,7 @@ Index: lua-5.1.4/src/lcode.c
      int o1 = luaK_exp2RK(fs, e1);
      if (o1 > o2) {
        freeexp(fs, e1);
-@@ -698,6 +713,14 @@
+@@ -690,6 +705,14 @@
    expdesc e2;
    e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
    switch (op) {
@@ -47,7 +46,7 @@ Index: lua-5.1.4/src/lcode.c
      case OPR_MINUS: {
        if (!isnumeral(e))
          luaK_exp2anyreg(fs, e);  /* cannot operate on non-numeric constants */
-@@ -778,6 +801,14 @@
+@@ -770,6 +793,14 @@
      case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break;
      case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break;
      case OPR_POW: codearith(fs, OP_POW, e1, e2); break;
@@ -62,10 +61,9 @@ Index: lua-5.1.4/src/lcode.c
      case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break;
      case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break;
      case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break;
-Index: lua-5.1.4/src/lcode.h
-===================================================================
---- lua-5.1.4.orig/src/lcode.h	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/lcode.h	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/lcode.h lua-5.1.5/src/lcode.h
+--- lua-5.1.5/src/lcode.h	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/lcode.h	2012-11-28 21:12:23.958419501 +0200
 @@ -25,6 +25,9 @@
  */
  typedef enum BinOpr {
@@ -89,10 +87,9 @@ Index: lua-5.1.4/src/lcode.h
  
  #define getcode(fs,e)	((fs)->f->code[(e)->u.s.info])
  
-Index: lua-5.1.4/src/ldebug.c
-===================================================================
---- lua-5.1.4.orig/src/ldebug.c	2008-05-08 18:56:26.000000000 +0200
-+++ lua-5.1.4/src/ldebug.c	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/ldebug.c lua-5.1.5/src/ldebug.c
+--- lua-5.1.5/src/ldebug.c	2008-05-08 19:56:26.000000000 +0300
++++ lua-5.1.5/src/ldebug.c	2012-11-28 21:12:23.958419501 +0200
 @@ -592,6 +592,16 @@
    luaG_typeerror(L, p2, "perform arithmetic on");
  }
@@ -110,10 +107,9 @@ Index: lua-5.1.4/src/ldebug.c
  
  int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
    const char *t1 = luaT_typenames[ttype(p1)];
-Index: lua-5.1.4/src/ldebug.h
-===================================================================
---- lua-5.1.4.orig/src/ldebug.h	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/ldebug.h	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/ldebug.h lua-5.1.5/src/ldebug.h
+--- lua-5.1.5/src/ldebug.h	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/ldebug.h	2012-11-28 21:12:23.958419501 +0200
 @@ -30,4 +30,9 @@
  LUAI_FUNC int luaG_checkcode (const Proto *pt);
  LUAI_FUNC int luaG_checkopenop (Instruction i);
@@ -124,10 +120,9 @@ Index: lua-5.1.4/src/ldebug.h
 +#endif
 +
  #endif
-Index: lua-5.1.4/src/llex.c
-===================================================================
---- lua-5.1.4.orig/src/llex.c	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/llex.c	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/llex.c lua-5.1.5/src/llex.c
+--- lua-5.1.5/src/llex.c	2009-11-23 16:58:22.000000000 +0200
++++ lua-5.1.5/src/llex.c	2012-11-28 21:12:23.958419501 +0200
 @@ -39,7 +39,11 @@
      "end", "false", "for", "function", "if",
      "in", "local", "nil", "not", "or", "repeat",
@@ -140,7 +135,7 @@ Index: lua-5.1.4/src/llex.c
      "<number>", "<name>", "<string>", "<eof>",
      NULL
  };
-@@ -371,6 +375,30 @@
+@@ -373,6 +377,30 @@
          if (ls->current != '=') return '=';
          else { next(ls); return TK_EQ; }
        }
@@ -171,7 +166,7 @@ Index: lua-5.1.4/src/llex.c
        case '<': {
          next(ls);
          if (ls->current != '=') return '<';
-@@ -379,8 +407,9 @@
+@@ -381,8 +409,9 @@
        case '>': {
          next(ls);
          if (ls->current != '=') return '>';
@@ -182,10 +177,9 @@ Index: lua-5.1.4/src/llex.c
        case '~': {
          next(ls);
          if (ls->current != '=') return '~';
-Index: lua-5.1.4/src/llex.h
-===================================================================
---- lua-5.1.4.orig/src/llex.h	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/llex.h	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/llex.h lua-5.1.5/src/llex.h
+--- lua-5.1.5/src/llex.h	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/llex.h	2012-11-28 21:12:23.962419499 +0200
 @@ -28,7 +28,11 @@
    TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
    TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
@@ -198,10 +192,9 @@ Index: lua-5.1.4/src/llex.h
    TK_NAME, TK_STRING, TK_EOS
  };
  
-Index: lua-5.1.4/src/lopcodes.c
-===================================================================
---- lua-5.1.4.orig/src/lopcodes.c	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/lopcodes.c	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/lopcodes.c lua-5.1.5/src/lopcodes.c
+--- lua-5.1.5/src/lopcodes.c	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/lopcodes.c	2012-11-28 21:12:23.962419499 +0200
 @@ -32,6 +32,15 @@
    "DIV",
    "MOD",
@@ -234,10 +227,9 @@ Index: lua-5.1.4/src/lopcodes.c
   ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_UNM */
   ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_NOT */
   ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_LEN */
-Index: lua-5.1.4/src/lopcodes.h
-===================================================================
---- lua-5.1.4.orig/src/lopcodes.h	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/lopcodes.h	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/lopcodes.h lua-5.1.5/src/lopcodes.h
+--- lua-5.1.5/src/lopcodes.h	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/lopcodes.h	2012-11-28 21:12:23.962419499 +0200
 @@ -174,10 +174,20 @@
  OP_DIV,/*	A B C	R(A) := RK(B) / RK(C)				*/
  OP_MOD,/*	A B C	R(A) := RK(B) % RK(C)				*/
@@ -281,10 +273,9 @@ Index: lua-5.1.4/src/lopcodes.h
  OP_SETLIST,/*	A B C	R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B	*/
  
  OP_CLOSE,/*	A 	close all variables in the stack up to (>=) R(A)*/
-Index: lua-5.1.4/src/lparser.c
-===================================================================
---- lua-5.1.4.orig/src/lparser.c	2007-12-28 16:32:23.000000000 +0100
-+++ lua-5.1.4/src/lparser.c	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/lparser.c lua-5.1.5/src/lparser.c
+--- lua-5.1.5/src/lparser.c	2011-10-21 22:31:42.000000000 +0300
++++ lua-5.1.5/src/lparser.c	2012-11-28 21:12:23.962419499 +0200
 @@ -780,6 +780,9 @@
      case TK_NOT: return OPR_NOT;
      case '-': return OPR_MINUS;
@@ -320,10 +311,9 @@ Index: lua-5.1.4/src/lparser.c
     {10, 9}, {5, 4},                 /* power and concat (right associative) */
     {3, 3}, {3, 3},                  /* equality and inequality */
     {3, 3}, {3, 3}, {3, 3}, {3, 3},  /* order */
-Index: lua-5.1.4/src/ltm.c
-===================================================================
---- lua-5.1.4.orig/src/ltm.c	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/ltm.c	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/ltm.c lua-5.1.5/src/ltm.c
+--- lua-5.1.5/src/ltm.c	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/ltm.c	2012-11-28 21:12:23.962419499 +0200
 @@ -34,6 +34,9 @@
      "__add", "__sub", "__mul", "__div", "__mod",
      "__pow", "__unm", "__len", "__lt", "__le",
@@ -334,10 +324,9 @@ Index: lua-5.1.4/src/ltm.c
    };
    int i;
    for (i=0; i<TM_N; i++) {
-Index: lua-5.1.4/src/ltm.h
-===================================================================
---- lua-5.1.4.orig/src/ltm.h	2007-12-27 14:02:25.000000000 +0100
-+++ lua-5.1.4/src/ltm.h	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/ltm.h lua-5.1.5/src/ltm.h
+--- lua-5.1.5/src/ltm.h	2007-12-27 15:02:25.000000000 +0200
++++ lua-5.1.5/src/ltm.h	2012-11-28 21:12:23.962419499 +0200
 @@ -33,6 +33,15 @@
    TM_LE,
    TM_CONCAT,
@@ -354,23 +343,9 @@ Index: lua-5.1.4/src/ltm.h
    TM_N		/* number of elements in the enum */
  } TMS;
  
-Index: lua-5.1.4/src/lua.h
-===================================================================
---- lua-5.1.4.orig/src/lua.h	2008-08-06 15:30:12.000000000 +0200
-+++ lua-5.1.4/src/lua.h	2009-01-27 21:16:39.000000000 +0100
-@@ -17,7 +17,7 @@
- 
- 
- #define LUA_VERSION	"Lua 5.1"
--#define LUA_RELEASE	"Lua 5.1.4"
-+#define LUA_RELEASE	"Lua 5.1.4+bitwiseops"
- #define LUA_VERSION_NUM	501
- #define LUA_COPYRIGHT	"Copyright (C) 1994-2008 Lua.org, PUC-Rio"
- #define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
-Index: lua-5.1.4/src/luaconf.h
-===================================================================
---- lua-5.1.4.orig/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
-+++ lua-5.1.4/src/luaconf.h	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/src/luaconf.h lua-5.1.5/src/luaconf.h
+--- lua-5.1.5/src/luaconf.h	2008-02-11 18:25:08.000000000 +0200
++++ lua-5.1.5/src/luaconf.h	2012-11-28 21:12:23.962419499 +0200
 @@ -2,6 +2,7 @@
  ** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
  ** Configuration file for Lua
@@ -474,11 +449,22 @@ Index: lua-5.1.4/src/luaconf.h
  /* }================================================================== */
  
  
-Index: lua-5.1.4/src/lvm.c
-===================================================================
---- lua-5.1.4.orig/src/lvm.c	2007-12-28 16:32:23.000000000 +0100
-+++ lua-5.1.4/src/lvm.c	2009-01-27 21:15:39.000000000 +0100
-@@ -325,6 +325,9 @@
+diff -Nurd lua-5.1.5/src/lua.h lua-5.1.5/src/lua.h
+--- lua-5.1.5/src/lua.h	2012-01-13 22:36:20.000000000 +0200
++++ lua-5.1.5/src/lua.h	2012-11-28 21:13:01.266418680 +0200
+@@ -17,7 +17,7 @@
+ 
+ 
+ #define LUA_VERSION	"Lua 5.1"
+-#define LUA_RELEASE	"Lua 5.1.5"
++#define LUA_RELEASE	"Lua 5.1.5+bitwiseops"
+ #define LUA_VERSION_NUM	501
+ #define LUA_COPYRIGHT	"Copyright (C) 1994-2012 Lua.org, PUC-Rio"
+ #define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
+diff -Nurd lua-5.1.5/src/lvm.c lua-5.1.5/src/lvm.c
+--- lua-5.1.5/src/lvm.c	2011-08-17 23:43:11.000000000 +0300
++++ lua-5.1.5/src/lvm.c	2012-11-28 21:12:23.966419498 +0200
+@@ -329,6 +329,9 @@
        case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); break;
        case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
        case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
@@ -488,7 +474,7 @@ Index: lua-5.1.4/src/lvm.c
        default: lua_assert(0); break;
      }
    }
-@@ -332,7 +335,30 @@
+@@ -336,7 +339,30 @@
      luaG_aritherror(L, rb, rc);
  }
  
@@ -520,7 +506,7 @@ Index: lua-5.1.4/src/lvm.c
  
  /*
  ** some macros for common tasks in `luaV_execute'
-@@ -369,6 +395,22 @@
+@@ -373,6 +399,22 @@
        }
  
  
@@ -543,7 +529,7 @@ Index: lua-5.1.4/src/lvm.c
  
  void luaV_execute (lua_State *L, int nexeccalls) {
    LClosure *cl;
-@@ -502,6 +544,45 @@
+@@ -506,6 +548,45 @@
          }
          continue;
        }
@@ -589,10 +575,9 @@ Index: lua-5.1.4/src/lvm.c
        case OP_NOT: {
          int res = l_isfalse(RB(i));  /* next assignment may change this value */
          setbvalue(ra, res);
-Index: lua-5.1.4/test/bitwisepatchtest.lua
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ lua-5.1.4/test/bitwisepatchtest.lua	2009-01-27 21:15:39.000000000 +0100
+diff -Nurd lua-5.1.5/test/bitwisepatchtest.lua lua-5.1.5/test/bitwisepatchtest.lua
+--- lua-5.1.5/test/bitwisepatchtest.lua	1970-01-01 02:00:00.000000000 +0200
++++ lua-5.1.5/test/bitwisepatchtest.lua	2012-11-28 21:12:23.966419498 +0200
 @@ -0,0 +1,24 @@
 +hex=function (i) return "0x"..string.format("%X", i) end
 +print(hex(0x54|0x55))
diff --git a/meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc b/meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc
index 41d5801..64c03d2 100644
--- a/meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc
+++ b/meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc
@@ -4,7 +4,7 @@ includedir=${prefix}/include
 
 Name: Lua
 Description: Lua language engine
-Version: 5.1.4
+Version: 5.1.5
 Requires:
 Libs: -L${libdir} -llua
 Libs.private: -lm
diff --git a/meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb b/meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb
similarity index 75%
rename from meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb
rename to meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb
index 0dc81db..9da9e95 100644
--- a/meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb
+++ b/meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "Lua is a powerful light-weight programming language designed \
 for extending applications."
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=90c3badc6055c699194c4a7cea583296"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=59bdd99bb82238f238cf5c65c21604fd"
 HOMEPAGE = "http://www.lua.org/"
 
 DEPENDS += "readline"
-PR = "r11"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
            file://bitwise_operators.patch \
            file://lua5.1.pc \
@@ -20,7 +19,7 @@ SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}"
 TARGET_CC_ARCH += " -fPIC ${LDFLAGS}"
 EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'"
 
-do_configure_prepend() {                                                                                                                                     
+do_configure_prepend() {
 	sed -i -e s:/usr/local:${prefix}:g src/luaconf.h
 }
 
@@ -45,5 +44,5 @@ do_install () {
 }
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "d0870f2de55d59c1c8419f36e8fac150"
-SRC_URI[sha256sum] = "b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a"
+SRC_URI[md5sum] = "2e115fe26e435e33b0d5c022e4490567"
+SRC_URI[sha256sum] = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"
-- 
1.8.0.2

[meta-oe][PATCH 19/26] postgresql: disable spinlocks for AArch64

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/postgresql/postgresql.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index eeda729..4e7aec2 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -19,6 +19,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-rpath"
 EXTRA_OECONF_sh4 = "--disable-spinlocks --disable-rpath"
+EXTRA_OECONF_aarch64 += "--disable-spinlocks"
 
 do_compile_append() {
          cp /usr/sbin/zic ${S}/src/timezone/
-- 
1.8.0.2

[meta-oe][PATCH 20/26] libgcc: s/virtclass/class/ to make it up-to-date

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 toolchain-layer/recipes-devtools/gcc/libgcc_4.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain-layer/recipes-devtools/gcc/libgcc_4.6.bb b/toolchain-layer/recipes-devtools/gcc/libgcc_4.6.bb
index 8529755..4dade08 100644
--- a/toolchain-layer/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/toolchain-layer/recipes-devtools/gcc/libgcc_4.6.bb
@@ -5,7 +5,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
+PKGSUFFIX_class-nativesdk = "-nativesdk"
 
 PACKAGES = "\
   ${PN} \
-- 
1.8.0.2

[meta-oe][PATCH 21/26] gcc-cross-canadian 4.6: fix dependencies to be nativesdk-* not *-nativesdk

[Martin Jansa]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
index e0af4aa..788391a 100644
--- a/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
+++ b/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
@@ -5,8 +5,8 @@ require recipes-devtools/gcc/gcc-cross-canadian.inc
 require recipes-devtools/gcc/gcc-configure-sdk.inc
 require recipes-devtools/gcc/gcc-package-sdk.inc
 
-DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
-RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
+DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils"
+RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils"
 
 SYSTEMHEADERS = "/usr/include"
 SYSTEMLIBS = "/lib/"
-- 
1.8.0.2

[meta-oe][PATCH 22/26] krb5: import from OE-Classic

[Martin Jansa]

From: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>

Add building of MIT Kerberos implementation.

The recipe was picked from OE-Classic & updated to new version

Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-connectivity/krb5/krb5_1.8.5.bb | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 meta/recipes-connectivity/krb5/krb5_1.8.5.bb

diff --git a/meta/recipes-connectivity/krb5/krb5_1.8.5.bb b/meta/recipes-connectivity/krb5/krb5_1.8.5.bb
new file mode 100644
index 0000000..2f497a3
--- /dev/null
+++ b/meta/recipes-connectivity/krb5/krb5_1.8.5.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "A network authentication protocol"
+HOMEPAGE = "http://web.mit.edu/Kerberos/"
+SECTION = "console/network"
+PR = "r0"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${S}/../README;md5=5595a75ae6fab5f825f579a817baa618"
+DEPENDS = "ncurses util-linux e2fsprogs-native"
+
+inherit autotools binconfig perlnative
+
+SRC_URI = "http://web.mit.edu/kerberos/dist/krb5/1.8/krb5-1.8.5-signed.tar"
+
+S = "${WORKDIR}/${PN}-${PV}/src/"
+
+EXTRA_OECONF += " --without-tcl --with-system-et"
+CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \
+                  ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \
+                  ac_cv_file__etc_TIMEZONE=no"
+
+CFLAGS_append += "-DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et"
+LDFLAGS_append += "-lpthread"
+
+FILES_${PN}-doc += ${datadir}/examples
+
+krb5_do_unpack() {
+	tar xzf ${WORKDIR}/krb5-1.8.5.tar.gz -C ${WORKDIR}/
+}
+
+python do_unpack() {
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('krb5_do_unpack', d)
+}
+
+do_configure() {
+	oe_runconf
+}
+
+SRC_URI[md5sum] = "48b17caedf19d07d714a8d7a25422c95"
+SRC_URI[sha256sum] = "7d6989efaaf0b3330ce5b329edb1d0bf33250ca78b789fdd117e02c49c238812"
-- 
1.8.0.2

[meta-oe][PATCH 23/26] lvm2: upgrade to 2.02.97 which is compatible with newer udev

[Martin Jansa]

* older versions are using symbols removed in newer udev
  | dmsetup.c:985: error: undefined reference to 'udev_get_dev_path'
  | collect2: error: ld returned 1 exit status
  | make[1]: *** [dmsetup] Error 1
  | make[1]: Leaving directory
  `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lvm2/2.02.85-r2.0/LVM2.2.02.85/tools'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb | 7 -------
 meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb
 create mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb

diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb b/meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb
deleted file mode 100644
index b2a4ff3..0000000
--- a/meta-oe/recipes-support/lvm2/lvm2_2.02.85.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require lvm2.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "91785ca438e5ce679dd3a386b183d552"
-SRC_URI[sha256sum] = "e5c2b0d76e7b1df7630e211734eb09697d66ab879b17eb19545cb77272813eb7"
-
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb b/meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb
new file mode 100644
index 0000000..2de17cf
--- /dev/null
+++ b/meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb
@@ -0,0 +1,6 @@
+require lvm2.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "d18bd01334309db1c422b9bf6b181057"
+SRC_URI[sha256sum] = "edda82012e8a9e1f0b00ba5a331468d3e0201992be14c0dbea71bf564a51fc2b"
-- 
1.8.0.2

[meta-oe][PATCH 24/26] cryptsetup: import from oe-classic

[Martin Jansa]

* add LIC_FILES_CHKSUM
* depend on util-linux (renamed from util-linux-ng)
* depend on lvm2 instead of device-mapper
* inherit gettext

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/cryptsetup/cryptsetup_1.1.3.bb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-oe/recipes-support/cryptsetup/cryptsetup_1.1.3.bb

diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.1.3.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.1.3.bb
new file mode 100644
index 0000000..254f563
--- /dev/null
+++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.1.3.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Setup virtual encryption devices under dm-crypt Linux"
+HOMEPAGE = "http://code.google.com/p/cryptsetup/"
+SECTION = "console"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "util-linux lvm2 libgcrypt popt"
+RRECOMMENDS_${PN} = "kernel-module-aes \
+                     kernel-module-dm-crypt \
+                     kernel-module-md5 \
+                     kernel-module-cbc \
+                     kernel-module-sha256 \
+                    "
+SRC_URI = "http://cryptsetup.googlecode.com/files/cryptsetup-${PV}.tar.bz2"
+SRC_URI[md5sum] = "318a64470861ea5b92a52f2014f1e7c1"
+SRC_URI[sha256sum] = "9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a"
+
+inherit autotools gettext
-- 
1.8.0.2

[meta-oe][PATCH 25/26] libsdl-image: update to upstream version 1.2.12

[Martin Jansa]

From: Marko Lindqvist <cazfi74@gmail.com>

Now uses zlib license.
Works with libpng15.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../{libsdl-image_1.2.10.bb => libsdl-image_1.2.12.bb}        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-multimedia/libsdl-image/{libsdl-image_1.2.10.bb => libsdl-image_1.2.12.bb} (75%)

diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
similarity index 75%
rename from meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb
rename to meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
index 12a3abd..ccc3d40 100644
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.10.bb
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
@@ -1,16 +1,16 @@
 DESCRIPTION = "Simple DirectMedia Layer image library."
 SECTION = "libs"
 
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
+LICENSE = "zlib"
+LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227"
 
-PR = "r3"
+PR = "r0"
 
 DEPENDS = "tiff zlib libpng jpeg virtual/libsdl"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
-SRC_URI[md5sum] = "6c06584b31559e2b59f2b982d0d1f628"
-SRC_URI[sha256sum] = "75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876"
+SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb"
+SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
 
 S = "${WORKDIR}/SDL_image-${PV}"
 
@@ -31,4 +31,3 @@ do_configure_prepend() {
 	rm -f acinclude/ltsugar.m4
 	rm -f acinclude/ltversion.m4
 }
-
-- 
1.8.0.2

[meta-oe][PATCH 26/26] libsdl-mixer: update to upstream version 1.2.12

[Martin Jansa]

From: Marko Lindqvist <cazfi74@gmail.com>

Now uses zlib license.
Dropped fix-flac-madness patch as upsream configure check in question
now uses AC_TRY_COMPILE instead of AC_TRY_RUN.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libsdl-mixer/libsdl-mixer/configure.patch      |  9 ++++---
 .../libsdl-mixer/fix-flac-madness.diff             | 28 ----------------------
 ...bsdl-mixer_1.2.11.bb => libsdl-mixer_1.2.12.bb} | 10 ++++----
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff
 rename meta-oe/recipes-multimedia/libsdl-mixer/{libsdl-mixer_1.2.11.bb => libsdl-mixer_1.2.12.bb} (78%)

diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
index 7cc69e0..4c9e8d0 100644
--- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
+++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
@@ -1,11 +1,10 @@
-Index: SDL_mixer-1.2.11/configure.in
-===================================================================
---- SDL_mixer-1.2.11.orig/configure.in	2011-02-15 11:54:23.929086120 +0100
-+++ SDL_mixer-1.2.11/configure.in	2011-02-15 11:56:53.745736645 +0100
+diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in
+--- SDL_mixer-1.2.12/configure.in	2012-01-16 00:01:05.000000000 +0200
++++ SDL_mixer-1.2.12/configure.in	2012-12-15 04:08:04.627871456 +0200
 @@ -1,6 +1,5 @@
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(README)
--AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
+-AC_CONFIG_AUX_DIR(build-scripts)
  
  dnl Set various version strings - taken gratefully from the GTk sources
  
diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff
deleted file mode 100644
index 48fe88e..0000000
--- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- /tmp/configure.in	2009-12-02 16:18:33.000000000 +0100
-+++ SDL_mixer-1.2.11/configure.in	2009-12-02 16:20:02.000000000 +0100
-@@ -413,24 +413,7 @@
-               [], [enable_music_flac_shared=yes])
- if test x$enable_music_flac = xyes; then
-     AC_CHECK_HEADER([FLAC/export.h], [have_flac_export=yes])
--    if test x$have_flac_export = xyes; then
--        LIBS_SAVED="$LIBS"
--        LIBS="-lFLAC"
--        AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver])
--        AC_TRY_RUN([
--#include "FLAC/export.h"
--#include "stdio.h"
--int main( int argc, char *argv[] ) {
--#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver)
--    return 0;
--#else
--    return 1;
--#endif
--}
--], have_flac_ver=yes, have_flac_ver=no)
--        LIBS="$LIBS_SAVED"
--        AC_MSG_RESULT($have_flac_ver)
--    fi
-+	have_flac_ver=yes
- 
-     if test x$have_flac_ver = xyes; then
-         AC_CHECK_HEADER([FLAC/stream_decoder.h], [have_flac_hdr=yes])
diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
similarity index 78%
rename from meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb
rename to meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
index bccbc50..c8fa6ca 100644
--- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb
+++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
@@ -1,15 +1,15 @@
 DESCRIPTION = "Simple DirectMedia Layer mixer library."
 SECTION = "libs"
 DEPENDS = "virtual/libsdl flac libmikmod libvorbis  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
+LICENSE = "zlib"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
-           file://fix-flac-madness.diff \
            file://configure.patch \
           "
-SRC_URI[md5sum] = "65ada3d997fe85109191a5fb083f248c"
-SRC_URI[sha256sum] = "86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9"
+
+SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
+SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
 
 S = "${WORKDIR}/SDL_mixer-${PV}"
 
-- 
1.8.0.2