From 846ef0e3c607d17dfab32ab36407b01f6ce1da0b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 26 Nov 2010 22:36:41 +0100
Subject: add support for imagemagick package

---
 package/libX11/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'package/libX11/Makefile')

diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 4d7e7794e..e219ed49e 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBX11 LIBX11_DEV
+PKGSD_LIBX11_DEV:=	X11 headers
+PKGSC_LIBX11_DEV:=	devel
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -21,7 +23,7 @@ endif
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
 
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
-- 
cgit v1.2.3


From 83e2707a887a4c495a42f7e59f9f332df6b759ab Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 27 Nov 2010 00:40:17 +0100
Subject: make native builds of x11 apps work

---
 package/libX11/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'package/libX11/Makefile')

diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index e219ed49e..153a08f12 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -5,11 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		b68aebbfcac1174c4c95d260e9369766
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
+PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau 
+PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBX11 LIBX11_DEV
@@ -44,7 +45,5 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 libx11-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
 	${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11
-	${CP} ${STAGING_DIR}/usr/include/xproto/X11/*.h \
-		${IDIR_LIBX11_DEV}/usr/include/X11
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3