tinyxml: use kodi version

package/tinyxml/Makefile

@@ -6,32 +6,27 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		tinyxml
 PKG_VERSION:=		2.6.2
 PKG_RELEASE:=		1
-PKG_HASH:=		ac6bb9501c6f50cc922d22f26b02fab168db47521be5e845b83d3451a3e1d512
+PKG_HASH:=		8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c
 PKG_DESCR:=		simple, small, minimal, c++ xml parser
 PKG_SECTION:=		libs/data
 PKG_BUILDDEP:=		unzip-host
-PKG_URL:=		http://sourceforge.net/projects/tinyxml/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=tinyxml/}
+PKG_SITES:=		http://mirrors.xbmc.org/build-deps/sources/
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}_2_6_2.zip
-WRKDIST=		${WRKDIR}/tinyxml
+DISTFILES:=             ${PKG_NAME}-2.6.2_2.tar.gz
+WRKDIST=		${WRKDIR}/tinyxml-2.6.2_2
 
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TINYXML,tinyxml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CXXFLAGS+=	-fPIC
-CONFIG_STYLE:=		manual
-INSTALL_STYLE:=		manual
+
+AUTOTOOL_STYLE:=	autoreconf
 
 tinyxml-install:
-	$(INSTALL_DIR) $(IDIR_TINYXML)/usr/lib/
-	$(CP) $(WRKBUILD)/libtinyxml*.so* \
+	$(INSTALL_DIR) $(IDIR_TINYXML)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libtinyxml.so* \
 		$(IDIR_TINYXML)/usr/lib
-	$(INSTALL_DATA) $(WRKBUILD)/tiny{str,xml}.h \
-		$(STAGING_TARGET_DIR)/usr/include
-	$(INSTALL_DATA) ./files/tinyxml.pc \
-		$(STAGING_TARGET_DIR)/usr/lib/pkgconfig
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/tinyxml/patches/patch-Makefile

@@ -1,61 +0,0 @@
---- tinyxml.orig/Makefile	2013-07-30 15:47:47.000000000 +0200
-+++ tinyxml/Makefile	2013-07-30 15:47:46.000000000 +0200
-@@ -15,13 +15,13 @@ PROFILE        := NO
- 
- # TINYXML_USE_STL can be used to turn on STL support. NO, then STL
- # will not be used. YES will include the STL files.
--TINYXML_USE_STL := NO
-+TINYXML_USE_STL := YES
- 
- #****************************************************************************
- 
--CC     := gcc
--CXX    := g++
--LD     := g++
-+CC     ?= gcc
-+CXX    ?= g++
-+LD     := $(CXX)
- AR     := ar rc
- RANLIB := ranlib
- 
-@@ -41,9 +41,9 @@ ifeq (YES, ${DEBUG})
-    CXXFLAGS     := ${DEBUG_CXXFLAGS}
-    LDFLAGS      := ${DEBUG_LDFLAGS}
- else
--   CFLAGS       := ${RELEASE_CFLAGS}
--   CXXFLAGS     := ${RELEASE_CXXFLAGS}
--   LDFLAGS      := ${RELEASE_LDFLAGS}
-+   CFLAGS       ?= ${RELEASE_CFLAGS}
-+   CXXFLAGS     ?= ${RELEASE_CXXFLAGS}
-+   LDFLAGS      ?= ${RELEASE_LDFLAGS}
- endif
- 
- ifeq (YES, ${PROFILE})
-@@ -81,7 +81,7 @@ CXXFLAGS := ${CXXFLAGS} ${DEFS}
- # Targets of the build
- #****************************************************************************
- 
--OUTPUT := xmltest
-+OUTPUT := libtinyxml.so.2.6.2
- 
- all: ${OUTPUT}
- 
-@@ -90,7 +90,7 @@ all: ${OUTPUT}
- # Source files
- #****************************************************************************
- 
--SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp
-+SRCS := tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp
- 
- # Add on the sources for libraries
- SRCS := ${SRCS}
-@@ -102,7 +102,8 @@ OBJS := $(addsuffix .o,$(basename ${SRCS
- #****************************************************************************
- 
- ${OUTPUT}: ${OBJS}
--	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
-+	${CXX} -shared -Wl,-soname,libtinyxml.so.2.6.2 -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${EXTRA_LIBS}
-+	ln -sf libtinyxml.so.2.6.2 libtinyxml.so
- 
- #****************************************************************************
- # common rules