Merge "agl-service-unicens(4A): remove mxml recipes due to replacemet by libxml2"

5 files changed, 1 insertions, 97 deletions

diff --git a/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb b/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb
index 0e5029f4..9590ad95 100644
--- a/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb
@@ -15,5 +15,5 @@ S  = "${WORKDIR}/git"
 inherit cmake aglwgt pkgconfig
 
 DEPENDS += "alsa-lib json-c systemd af-binder glib-2.0 libxml2"
-RDEPENDS_${PN} += "mxml "
+RDEPENDS_${PN} += "libxml2 "
 
diff --git a/meta-audio-4a-framework/recipes-platform/images/agl-demo-platform-crosssdk.bbappend b/meta-audio-4a-framework/recipes-platform/images/agl-demo-platform-crosssdk.bbappend
deleted file mode 100644
index 48388a29..00000000
--- a/meta-audio-4a-framework/recipes-platform/images/agl-demo-platform-crosssdk.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-TOOLCHAIN_TARGET_TASK += "mxml-dev"
diff --git a/meta-audio-4a-framework/recipes-support/mxml/files/0001-avoid-testing-library-in-cross-environments.patch b/meta-audio-4a-framework/recipes-support/mxml/files/0001-avoid-testing-library-in-cross-environments.patch
deleted file mode 100644
index a128936b..00000000
--- a/meta-audio-4a-framework/recipes-support/mxml/files/0001-avoid-testing-library-in-cross-environments.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b00ed2af82d4b046a6b8c53bd373ffe908866b0d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 30 Dec 2016 00:30:59 +0100
-Subject: [PATCH] avoid using binraies build - won't work in cross
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 92a490f..8217039 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -88,7 +88,7 @@ PUBLIBOBJS	=	mxml-attr.o mxml-entity.o mxml-file.o mxml-get.o \
- 			mxml-index.o mxml-node.o mxml-search.o mxml-set.o
- LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
- OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
--TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
-+TARGETS		=	$(LIBMXML)
- 
- 
- #
--- 
-2.5.5
-
diff --git a/meta-audio-4a-framework/recipes-support/mxml/files/0002-don-t-loose-our-LDFLAGS.patch b/meta-audio-4a-framework/recipes-support/mxml/files/0002-don-t-loose-our-LDFLAGS.patch
deleted file mode 100644
index 3371d1ac..00000000
--- a/meta-audio-4a-framework/recipes-support/mxml/files/0002-don-t-loose-our-LDFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 358fe387d07b4906c823b2a664f3c57fd62acd3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 27 Feb 2017 18:24:29 +0100
-Subject: [PATCH] don't loose our LDFLAGS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 789677a..f3b3b62 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -25,7 +25,7 @@ CC		=	@CC@
- CFLAGS		=	$(OPTIM) $(ARCHFLAGS) @CFLAGS@ @CPPFLAGS@ @PTHREAD_FLAGS@
- CP		=	@CP@
- DSO		=	@DSO@
--DSOFLAGS	=	@DSOFLAGS@
-+DSOFLAGS	=	$(LDFLAGS) @DSOFLAGS@
- LDFLAGS		=	$(OPTIM) $(ARCHFLAGS) @LDFLAGS@
- INSTALL		=	@INSTALL@
- LIBMXML		=	@LIBMXML@
--- 
-2.9.3
-
diff --git a/meta-audio-4a-framework/recipes-support/mxml/mxml_2.10.bb b/meta-audio-4a-framework/recipes-support/mxml/mxml_2.10.bb
deleted file mode 100644
index bca248b6..00000000
--- a/meta-audio-4a-framework/recipes-support/mxml/mxml_2.10.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Mini-XML is a small XML library"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6ba38606d63bb042c5d8cfee182e120"
-
-DEPENDS = ""
-
-SRC_URI = " \
-    https://github.com/michaelrsweet/mxml/releases/download/release-${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-avoid-testing-library-in-cross-environments.patch \
-    file://0002-don-t-loose-our-LDFLAGS.patch \
-"
-SRC_URI[md5sum] = "8804c961a24500a95690ef287d150abe"
-SRC_URI[sha256sum] = "267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891"
-
-inherit autotools-brokensep
-
-EXTRA_AUTORECONF += "--exclude=autoheader"
-
-do_install() {
-    install -d ${D}${includedir}
-    install -m 644 mxml.h ${D}${includedir}
-
-    install -d ${D}${libdir}/pkgconfig
-    install -m 644 libmxml.so.1.5 ${D}${libdir}
-	ln -s libmxml.so.1.5 ${D}${libdir}/libmxml.so
-	ln -s libmxml.so.1.5 ${D}${libdir}/libmxml.so.1
-
-    install mxml.pc ${D}${libdir}/pkgconfig
-
-    # Remove useless rpath
-    chrpath -d ${D}${libdir}/libmxml.so.1.5
-
-}