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

package/cairo/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
 PKG_VERSION:=		1.12.16
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		a1304edcdc99282f478b995ee5f8f854
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
@@ -33,7 +33,10 @@ endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-fc=yes \
 			--enable-tee=yes \
-			--enable-xlib=yes
+			--enable-xlib=yes \
+			--enable-pdf=no \
+			--disable-test-surfaces \
+			--disable-full-testing
 
 cairo-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo

package/cairo/patches/patch-Makefile_in

@@ -0,0 +1,20 @@
+--- cairo-1.12.16.orig/Makefile.in	2013-08-26 19:00:44.000000000 +0200
++++ cairo-1.12.16/Makefile.in	2014-02-10 14:44:58.000000000 +0100
+@@ -80,7 +80,7 @@ EXTRA_PROGRAMS =
+ TESTS =
+ check_PROGRAMS =
+ # libpng is required for our test programs
+-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
++@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
+@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
+ #	$(srcdir)/build/Makefile.win32.features-h \
+ #	$(NULL)
+ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+-DIST_SUBDIRS = src doc util boilerplate test perf
++DIST_SUBDIRS = src doc util boilerplate perf
+ SUBDIRS = src doc util $(am__append_1)
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \

package/eglibc/files/libc.so.sparc

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-sparc)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/libgd/Makefile

@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libgd
 PKG_VERSION:=		2.1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		03588159bf4faab9079849c8d709acc6
 PKG_DESCR:=		A library for the dynamic creation of images
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libjpeg-turbo libpng
+PKG_DEPENDS:=		libpng libjpeg-turbo
 PKG_BUILDDEP:=		libpng libjpeg-turbo
 PKG_URL:=		http://www.libgd.org/
 PKG_SITES:=		https://bitbucket.org/libgd/gd-libgd/downloads/
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+=	--without-x \
 			--without-freetype \
 			--with-jpeg=${STAGING_TARGET_DIR}/usr \
 			--with-png=${STAGING_TARGET_DIR}/usr \
+			--without-tiff \
+			--without-vpx \
 			--without-xpm
 
 libgd-install: