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

12 files changed, 80 insertions, 20 deletions

diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 8ee6641c6..63f6d916f 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a07a97cfb28b588cbcf83ffa9ec92e3f
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		jpeg libtiff fontconfig libiconv
+PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
 PKG_NEED_CXX:=		1
@@ -46,6 +46,10 @@ CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
 			--without-lcms \
 			--without-lcms2 \
 			--without-wmf \
+			--without-xml \
+			--with-jpeg \
+			--with-png \
+			--with-tiff \
 			--enable-fast-install
 
 libimagemagick-install:
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 57f394c0d..bec5fe6e6 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -15,7 +15,7 @@ PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU)
+PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_HARDWARE_QEMU)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 9f2c54702..f9f89576c 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -18,7 +18,7 @@ PKG_ARCH_DEPENDS:=	x86 x86_64
 
 PKG_CFLINE_GRUB_BIN:=	select BUSYBOX_FEATURE_STAT_FORMAT@
 PKG_CFLINE_GRUB_BIN+=	depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-PKG_DFLT_GRUB_BIN:=	y if !ADK_TOOLCHAIN_ONLY
+PKG_DFLT_GRUB_BIN:=	y if !ADK_TOOLCHAIN_ONLY && !ADK_TOOLCHAIN_ARCHIVE
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
index a92899818..2c1689069 100644
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -1,5 +1,5 @@
 --- libX11-1.4.0.orig/src/util/Makefile.in	2010-11-21 23:15:55.000000000 +0100
-+++ libX11-1.4.0/src/util/Makefile.in	2011-01-24 16:37:00.000000000 +0100
++++ libX11-1.4.0/src/util/Makefile.in	2011-04-28 22:56:41.000000000 +0200
 @@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -8,3 +8,18 @@
  	$(CWARNFLAGS)
  
  EXTRA_DIST = mkks.sh
+@@ -351,12 +350,12 @@ distclean-compile:
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ makekeys-makekeys.o: makekeys.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
+ @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ 
+ makekeys-makekeys.obj: makekeys.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 19e9325a4..bdf1c54c8 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -13,9 +13,13 @@ PKG_BUILDDEP:=		xproto xextproto libXext
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index fb8011912..4aa9a16b2 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -16,15 +16,19 @@ PKG_SUBPKGS:=		LIBLZO LIBLZO_DEV
 PKGSD_LIBLZO_DEV:=	lzo library headers
 PKGSC_LIBLZO_DEV:=	devel
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV}))
+$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV},$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--enable-static
 MAKE_FLAGS+=		CFLAGS_O="${TARGET_CFLAGS}"
 
-liblzo-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib
 	${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib
 
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 64a71f7d8..0ce3b3f52 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -75,6 +75,11 @@ CONFIGURE_ARGS+=	--disable-strip \
 			--with-privsep-path=/var/run/sshd \
 			--with-ssl-dir="${STAGING_TARGET_DIR}/usr"
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+TARGET_LDFLAGS+=	-static
+endif
+
 openssh-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh
 	chmod 0700 ${IDIR_OPENSSH}/etc/ssh
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 83d538537..cf7d657fa 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -25,9 +25,13 @@ PKGSS_LIBOPENSSL_DEV:=	libopenssl
 PKG_FLAVOURS_LIBOPENSSL:=	WITH_EC
 PKGFD_WITH_EC:=			enable Elliptic Curve crypto
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL}))
 
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 7cdacf554..623025f79 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -41,7 +41,6 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-libblkid \
 			--enable-libmount \
 			--enable-mount
-MAKE_FLAGS+=		OPT="${TARGET_CFLAGS}" ARCH="${ARCH}"
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -lintl
 
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
new file mode 100644
index 000000000..74e01e1f7
--- /dev/null
+++ b/package/x11vnc/Makefile
@@ -0,0 +1,32 @@
+# 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:=		x11vnc
+PKG_VERSION:=		0.9.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1498a68d02aa7b6c97bf746c073c8d00
+PKG_DESCR:=		VNC server for X11 displays
+PKG_SECTION:=		x11/apps
+PKG_BUILDDEP:=		libX11 libXtst
+PKG_URL:=		http://www.karlrunge.com/x11vnc/
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq ($(ADK_STATIC),y)
+MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS} -static" \
+			LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz"
+endif
+
+CONFIGURE_ARGS+=	--without-ssl
+
+x11vnc-install:
+	$(INSTALL_DIR) $(IDIR_X11VNC)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/x11vnc \
+		$(IDIR_X11VNC)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp
index cf47ce9b4..2b3ee6aea 100644
--- a/package/xinit/patches/patch-startx_cpp
+++ b/package/xinit/patches/patch-startx_cpp
@@ -20,12 +20,3 @@
  
      authdisplay=${display:-:0}
  #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
-@@ -347,5 +336,8 @@ screenrestore
- kbd_mode -a
- #endif
- 
-+xset dpms 0 0 60
-+xset s 0
-+
- exit $retval
- 
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 24b7d3b11..c94c0dcf3 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -38,6 +38,8 @@ ifeq ($(ADK_STATIC),)
 CONFIGURE_OPTS:=	--shared
 endif
 
+ALL_TARGET:=		libz.a libz.so.1.2.5
+
 do-configure:
 	(cd $(WRKBUILD); $(COPTS) \
 		uname="Linux" \
@@ -49,7 +51,7 @@ do-configure:
 		$(CONFIGURE_OPTS) \
 	);
 
-zlib-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
 	${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib