merge of '497bad113a4cfe870e10990d7361bc8a266713e5'

     and '7f3fc45ed4f6bbc596b8513870bdaa4ecc6576ce'

4 files changed, 81 insertions, 0 deletions

diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb
new file mode 100644
index 0000000000..192eb14275
--- /dev/null
+++ b/packages/libxml/libxml2_2.6.26.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "GNOME XML library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+
+SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
+
+do_stage() {
+	autotools_stage_all
+	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+python populate_packages_prepend () {
+	# autonamer would call this libxml2-2, but we don't want that
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libxml2', 'libxml2', d)
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}/*"
diff --git a/packages/libxslt/libxslt-1.1.17/.mtn2git_empty b/packages/libxslt/libxslt-1.1.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxslt/libxslt-1.1.17/.mtn2git_empty
diff --git a/packages/libxslt/libxslt-1.1.17/destdir.patch b/packages/libxslt/libxslt-1.1.17/destdir.patch
new file mode 100644
index 0000000000..8df1b206bc
--- /dev/null
+++ b/packages/libxslt/libxslt-1.1.17/destdir.patch
@@ -0,0 +1,10 @@
+Index: libxslt-1.1.17/libxslt/Makefile.am
+===================================================================
+--- libxslt-1.1.17.orig/libxslt/Makefile.am	2005-10-02 11:25:21.000000000 +0200
++++ libxslt-1.1.17/libxslt/Makefile.am	2006-09-29 23:13:35.000000000 +0200
+@@ -61,4 +61,4 @@
+ 	@(cd ../xsltproc ; $(MAKE))
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) "$(libdir)/libxslt-plugins"
++	$(mkinstalldirs) "$(DESTDIR)$(libdir)/libxslt-plugins"
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
new file mode 100644
index 0000000000..816b3fdd04
--- /dev/null
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2"
+LICENSE = "MIT"
+PR = "r2"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
+               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
+               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
+               xsltexports.h xsltutils.h"
+exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
+
+do_stage () {
+	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
+	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libxslt
+	for i in ${xsltheaders}; do
+		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
+	done
+	mkdir -p ${STAGING_INCDIR}/libexslt
+	for i in ${exsltheaders}; do
+		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
+	done
+
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
+			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
+	chmod a+rx ${STAGING_BINDIR}/xslt-config
+	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"