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

10 files changed, 142 insertions, 2 deletions

diff --git a/package/Config.in b/package/Config.in
index ba040251a..581eab25e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -175,7 +175,10 @@ source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/dbus-glib/Config.in.lib"
 source "package/e2fsprogs/Config.in.lib"
+source "package/fltk/Config.in"
+source "package/fltk/Config.in.lib"
 source "package/fontconfig/Config.in"
+source "package/freeglut/Config.in"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
 source "package/gtk+/Config.in"
@@ -620,6 +623,7 @@ source "package/xf86-input-evtouch/Config.in"
 endmenu
 
 menu "X applications"
+source "package/dillo/Config.in"
 source "package/evilwm/Config.in"
 source "package/firefox/Config.in"
 source "package/font-util/Config.in"
@@ -677,6 +681,8 @@ source "package/libXdamage/Config.in"
 source "package/libXdamage/Config.in.lib"
 source "package/libXfixes/Config.in"
 source "package/libXfixes/Config.in.lib"
+source "package/libXi/Config.in"
+source "package/libXi/Config.in.lib"
 source "package/libXmu/Config.in"
 source "package/libXmu/Config.in.lib"
 source "package/libXpm/Config.in"
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index d5ce04b77..0a4ff3b9a 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -17,7 +17,7 @@ PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
 
 WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 
-PKG_TARGET_DEPENDS:=  	ibmx40
+PKG_TARGET_DEPENDS:=  	ibmx40 lemote
 
 include $(TOPDIR)/mk/package.mk
 
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--disable-gallium \
 			--disable-glw \
 			--with-driver=dri \
+			--with-dri-drivers=i810 \
 			--without-demos
 
 XAKE_FLAGS+=		APP_CC=${HOSTCC} HOST_CC=${HOSTCC}
@@ -48,7 +49,7 @@ pre-configure:
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \
+	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
 		$(IDIR_MESALIB)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
new file mode 100644
index 000000000..07e2de442
--- /dev/null
+++ b/package/dillo/Makefile
@@ -0,0 +1,30 @@
+# 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:=		dillo
+PKG_VERSION:=		2.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f8bcd62093f178bed81e46cc54e73f42
+PKG_DESCR:=		small graphical web browser
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
+PKG_BUILDDEP+=		fltk libiconv jpeg libpng zlib
+PKG_URL:=		http://www.dillo.org/
+PKG_SITES:=		http://www.dillo.org/download/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+TLDFLAGS+=		-liconv
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/dillo \
+		$(IDIR_DILLO)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
new file mode 100644
index 000000000..66a6bbff3
--- /dev/null
+++ b/package/fltk/Makefile
@@ -0,0 +1,27 @@
+# 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:=		fltk
+PKG_VERSION:=		2.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		557544badbacca4ee1ebb2448f6e1f8a
+PKG_DESCR:=		fast light toolkit
+PKG_SECTION:=		libs
+PKG_BUILDDEP+=		libX11 libXi MesaLib freeglut
+PKG_URL:=		http://www.fltk.org/
+PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
+WRKDIST=		${WRKDIR}/${PKG_NAME}-2.0.x-r7513
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib
+	$(CP) ${WRKINST}/usr/lib/libfltk*.so* $(IDIR_LIBFLTK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
new file mode 100644
index 000000000..7c2fd2f8b
--- /dev/null
+++ b/package/fltk/patches/patch-makeinclude_in
@@ -0,0 +1,11 @@
+--- fltk-2.0.x-r7513.orig/makeinclude.in	2006-04-11 00:06:06.000000000 +0200
++++ fltk-2.0.x-r7513/makeinclude.in	2010-06-13 17:18:11.503473158 +0200
+@@ -45,7 +45,7 @@ NROFF		= @NROFF@
+ RM		= rm -f
+ RMDIR		= rm -rf
+ SHELL		= /bin/sh
+-STRIP		= strip
++STRIP		= echo
+ 
+ # compiler names:
+ CC		= @CC@
diff --git a/package/fltk/patches/patch-makeinclude_in.orig b/package/fltk/patches/patch-makeinclude_in.orig
new file mode 100644
index 000000000..ddee413e3
--- /dev/null
+++ b/package/fltk/patches/patch-makeinclude_in.orig
@@ -0,0 +1,11 @@
+--- fltk-2.0.x-r7513.orig/makeinclude.in	2006-04-11 00:06:06.000000000 +0200
++++ fltk-2.0.x-r7513/makeinclude.in	2010-06-13 17:15:29.633155678 +0200
+@@ -45,7 +45,7 @@ NROFF		= @NROFF@
+ RM		= rm -f
+ RMDIR		= rm -rf
+ SHELL		= /bin/sh
+-STRIP		= strip
++STRIP		= 
+ 
+ # compiler names:
+ CC		= @CC@
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
new file mode 100644
index 000000000..40b91c7df
--- /dev/null
+++ b/package/freeglut/Makefile
@@ -0,0 +1,22 @@
+# 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:=		freeglut
+PKG_VERSION:=		2.6.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		39f0f2de89f399529d2b981188082218
+PKG_DESCR:=		OpenGL Utility Toolkit
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.freeglut.org/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FREEGLUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
new file mode 100644
index 000000000..097b902d3
--- /dev/null
+++ b/package/libXi/Makefile
@@ -0,0 +1,27 @@
+# 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:=		libXi
+PKG_VERSION:=		1.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1c038312e4f9b61fe72e52d0f59a01d5
+PKG_DESCR:=		X Window System client interface to the XINPUT extension to the X protocol.
+PKG_SECTION:=		x11
+PKG_BUILDDEP+=		xproto xextproto libXext
+PKG_URL:=		http://xorg.freedesktop.org/
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBXI)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libXi*.so* \
+		$(IDIR_LIBXI)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index ef3ed22cd..6566b0f9d 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -6,8 +6,12 @@ include ${TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
 else
+ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
+include ${TOPDIR}/toolchain/eglibc/Makefile.inc
+else
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
+endif
 
 PKG_NAME:=		libthread-db
 PKG_DESCR:=		POSIX threads library for gdb/gdbserver
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 00bfea228..5ec3e3aff 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -84,6 +84,7 @@ post-install:
 	${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/
 	${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin
+	chmod u+s $(IDIR_XORG_SERVER)/usr/bin/Xorg
 	${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \