Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 38 insertions, 4 deletions

diff --git a/package/Config.in b/package/Config.in
index a7ad7fe12..a642c10a0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -499,6 +499,8 @@ source "package/libpthread/Config.in.lib"
 source "package/libthread_db/Config.in"
 source "package/readline/Config.in"
 source "package/cyrus-sasl/Config.in.lib"
+source "package/sdl/Config.in"
+source "package/sdl/Config.in.lib"
 source "package/speex/Config.in"
 source "package/openssl/Config.in.lib"
 source "package/sqlite/Config.in.lib"
diff --git a/package/git/Makefile b/package/git/Makefile
index 2a6951c1c..1e38b5099 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
 			NO_CROSS_DIRECTORY_HARDLINKS=1 \
 			CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
-XAKE_FLAGS+=		V=1 uname_S=Linux
+XAKE_FLAGS+=		V=1 uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index c3d40ca56..bef18a7e7 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-build:
-	(cd ${WRKBUILD} && ${BASH} ./Configure);
+	(cd ${WRKBUILD} && ${BASH} ./Configure linux);
 	${MAKE} -C ${WRKBUILD} \
 		CC="${TARGET_CC}" LD=${TARGET_CROSS}ld \
 		CFLAGS="${TARGET_CFLAGS} -I${WRKBUILD} -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ"
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index e40b02d39..4606b2115 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -18,6 +18,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		V=1
+CONFIGURE_ENV+=		ac_cv_path_XMLTO=true
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index 67c0cc380..fa0be1090 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libpri
-PKG_VERSION:=		1.4.10.1
+PKG_VERSION:=		1.4.10.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		55ce81cd0b2cf0c40e287fc5bd5b4883
+PKG_MD5SUM:=		dc1523d8ee027cd62f20fc6cc9727489
 PKG_DESCR:=		C implementation of the Primary Rate ISDN specification
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.asterisk.org
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
new file mode 100644
index 000000000..8d1caac22
--- /dev/null
+++ b/package/sdl/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		sdl
+PKG_VERSION:=		1.2.14
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e52086d1b508fa0b76c52ee30b55bec4
+PKG_DESCR:=		Simple DirectMedia Layer
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.libsdl.org
+PKG_SITES:=		http://www.libsdl.org/release/
+
+DISTFILES:=             SDL-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/SDL-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--disable-esd
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
+	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk