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

package/cifs-utils/Makefile

@@ -0,0 +1,26 @@
+# 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:=		cifs-utils
+PKG_VERSION:=		6.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		371e007a201be90c16497cd9bd5e2553
+PKG_DESCR:=		CIFS utilities
+PKG_SECTION:=		net/fs
+PKG_URL:=		https://wiki.samba.org/index.php/LinuxCIFS_utils
+PKG_SITES:=		ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+cifs-utils-install:
+	$(INSTALL_DIR) $(IDIR_CIFS_UTILS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/sbin/mount.cifs \
+		$(IDIR_CIFS_UTILS)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/firefox/Makefile

@@ -81,6 +81,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-crashreporter \
 			--disable-updater \
 			--disable-libjpeg-turbo \
+			--disable-xpcom-fastload \
 			--disable-elf-hack
 
 TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32

package/harfbuzz/Makefile

@@ -10,6 +10,8 @@ PKG_MD5SUM:=		e901ffe556d706b7d43b272f83be7f09
 PKG_DESCR:=		OpenType text shaping engine
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
+PKG_DEPENDS:=		libstdcxx
+PKG_BUILDDEP:=		libstdcxx
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/libXcursor/Makefile

@@ -10,6 +10,7 @@ PKG_MD5SUM:=		55558a41d0bcf9210636858844fa4d2f
 PKG_DESCR:=		xcursor library
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_BUILDDEP:=		libXfixes libXrender
 
 PKG_SUBPKGS:=		LIBXCURSOR LIBXCURSOR_DEV
 

package/php/Makefile

@@ -19,7 +19,7 @@ PKGSD_PHP_FASTCGI:=	PHP for FastCGI usage
 PKGSD_PHP_CLI:=		PHP CLI
 
 PKG_FLAVOURS_PHP:=	MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MYSQL
-PKG_FLAVOURS_PHP+=	MOD_OPENSSL MOD_PGSQL MOD_SESSION MOD_SNMP MOD_SQLITE MOD_SOCKETS MOD_XML MOD_ZLIB
+PKG_FLAVOURS_PHP+=	MOD_OPENSSL MOD_PGSQL MOD_SESSION MOD_SNMP MOD_SQLITE MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB
 
 PKGFD_MOD_BZ2:=		Bzip2 support
 PKGFB_MOD_BZ2:=		bzip2
@@ -58,6 +58,7 @@ PKGFD_MOD_SOCKETS:=	Socket support
 PKGFD_MOD_XML:=		XML support
 PKGFB_MOD_XML:=		expat
 PKGFS_MOD_XML:=		libexpat
+PKGFD_MOD_SIMPLEXML:=		simple XML support
 PKGFD_MOD_ZLIB:=	ZLIB support
 PKGFB_MOD_ZLIB:=	zlib
 PKGFS_MOD_ZLIB:=	zlib
@@ -90,10 +91,8 @@ PKG_CONFIGURE_OPTS:=	\
 	--disable-mbstring \
 	--disable-mbregex \
 	--disable-phar \
-	--disable-libxml \
 	--disable-short-tags \
 	--disable-ctype \
-	--disable-simplexml \
 	--disable-soap \
 	--disable-fileinfo \
 	--disable-tokenizer \
@@ -193,6 +192,11 @@ PKG_CONFIGURE_OPTS+=	--enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \
 else
 PKG_CONFIGURE_OPTS+=	--disable-xml
 endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),)
+PKG_CONFIGURE_OPTS+=	--enable-simplexml=shared --enable-libxml
+else
+PKG_CONFIGURE_OPTS+=	--disable-simplexml --disable-libxml
+endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_ZLIB),)
 PKG_CONFIGURE_OPTS+=	--with-zlib=shared,"$(STAGING_TARGET_DIR)/usr"
 else
@@ -213,6 +217,7 @@ $(eval $(call PKG_template,PHP_MOD_SNMP,php-mod-snmp,$(PKG_VERSION)-${PKG_RELEAS
 $(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_SIMPLEXML,php-mod-simplexml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_ZLIB,php-mod-zlib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,PHP_MOD_BZ2,bz2))
@@ -229,6 +234,7 @@ $(eval $(call PKG_mod_template,PHP_MOD_SOCKETS,sockets))
 $(eval $(call PKG_mod_template,PHP_MOD_SNMP,snmp))
 $(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo pdo_sqlite))
 $(eval $(call PKG_mod_template,PHP_MOD_XML,xml))
+$(eval $(call PKG_mod_template,PHP_MOD_SIMPLEXML,simplexml))
 $(eval $(call PKG_mod_template,PHP_MOD_ZLIB,zlib))
 
 INSTALL_STYLE:=		manual

target/linux/config/Config.in.graphics

@@ -19,6 +19,7 @@ config ADK_KERNEL_VT_CONSOLE
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
+	default y if ADK_HARDWARE_QEMU
 	default n
 
 config ADK_KERNEL_FONTS