From c4142342ee8c3dc5ab0a1fcb64ddf4124825ab06 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 14:32:33 +0200
Subject: disable m68k builds

---
 package/libpng/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'package/libpng/Makefile')

diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 9d11abd47..66068212c 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.libpng.org/pub/png/libpng.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/}
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 PKG_SUBPKGS:=		LIBPNG LIBPNG_DEV
 PKGSD_LIBPNG_DEV:=	development files for libpng
 PKGSC_LIBPNG_DEV:=	devel
-- 
cgit v1.2.3


From 90d5c8b73e8d538e121275b12e714332ca785cff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 17:20:24 +0200
Subject: automatically create development subpackages, without user
 interaction, depend on gcc for the target, simplifies a lot of library
 packages

---
 package/libpng/Makefile | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'package/libpng/Makefile')

diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 9d11abd47..1d43a4998 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libpng
 PKG_VERSION:=		1.5.15
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ea24254980fd820964a710e4d2a947c7
 PKG_DESCR:=		A library for reading/writing PNG images
 PKG_SECTION:=		libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.libpng.org/pub/png/libpng.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/}
-
-PKG_SUBPKGS:=		LIBPNG LIBPNG_DEV
-PKGSD_LIBPNG_DEV:=	development files for libpng
-PKGSC_LIBPNG_DEV:=	devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
 
@@ -33,11 +29,4 @@ libpng-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib
 
-libpng-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPNG_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3