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

package/fltk/Makefile

@@ -30,6 +30,8 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp
 endif
 
+CONFIGURE_ARGS+=	--disable-xinerama
+
 ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
 CONFIGURE_ENV+=		CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++" \

package/xcb-proto/Makefile

@@ -23,11 +23,13 @@ include $(TOPDIR)/mk/python.mk
 
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 
+post-build:
+	${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
+	${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb
+
 xcb-proto-install:
 	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
 	${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share
-	${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
-	${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_DIR}/usr/share/xcb
 	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/pkgconfig
 	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcb-proto.pc \
 		${IDIR_XCB_PROTO}/usr/lib/pkgconfig

scripts/scan-tools.sh

@@ -112,8 +112,8 @@ if ! which gzip >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which lzma >/dev/null 2>&1; then
-	echo You must install lzma to continue.
+if ! which lzma >/dev/null 2>&1 && ! which xz >/dev/null 2>&1; then
+	echo You must install lzma or xz-utils to continue.
 	echo
 	out=1
 fi