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

7 files changed, 14 insertions, 17 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 0682bc824..0c8de9916 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6d1f43e402cec84459a3d7f950bd5192
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff
+PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libxcursor
 PKG_DEPENDS+=		nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
 PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl
 PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 0b708732d..58faf3463 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -21,6 +21,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV}))
 
+#FIXME
+XAKE_FLAGS+=             GCC_HONOUR_COPTS=s
+
 FPM:=default
 ifeq (${ARCH},i386)
 FPM:=intel
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index de0d75403..c14dc6c43 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -24,8 +24,7 @@ PKG_OPTS:=		noremove
 
 NO_DISTFILES:=		1
 
-PKG_SUBPKGS:=		LIBPTHREAD LIBPTHREAD_DEV
-PKGSC_LIBPTHREAD_DEV:=	devel
+PKG_SUBPKGS:=		LIBPTHREAD
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
@@ -34,7 +33,6 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPTHREAD_DEV},${PKG_OPTS}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -46,11 +44,4 @@ ifeq ($(ADK_NATIVE),)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib
 endif
 
-libpthread-dev-install:
-ifeq ($(ADK_NATIVE),)
-	${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib
-	-${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so
-	-${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib
-endif
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 2529c1eec..8bedd1023 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -10,14 +10,15 @@ PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
-PKG_DEPENDS+=		libogg libpng libpthread libvorbis
+PKG_DEPENDS+=		libogg libpng libpthread libvorbis giflib
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
+PKG_DEPENDS+=		libxscrnsaver
 PKG_BUILDDEP:=		alsa-lib libmad libvorbis faad2 ncurses zlib
 PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips
+PKG_ARCH_DEPENDS:=	x86 mips
 
 PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -100,6 +101,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-iconv \
 			--disable-lirc \
 			--disable-radio-v4l2 \
+			--disable-speex \
 			--disable-faac \
 			--disable-libdv \
 			--disable-live \
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 69bc964c9..7074bf80c 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -15,6 +15,7 @@ PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/qemu/
 
 PKG_ARCH_DEPENDS:=	native x86 x86_64
+PKG_SYSTEM_DEPENDS:=	ibm-x40
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index f41b4382c..7c7013710 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rsync
-PKG_VERSION:=		3.0.7
+PKG_VERSION:=		3.0.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b53525900817cf1ba7ad3a516ab5bfe9
+PKG_MD5SUM:=		0ee8346ce16bdfe4c88a236e94c752b4
 PKG_DESCR:=		utility that provides fast incremental file transfer
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libpopt
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 2214c37b8..0e63651cb 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		8506fd205028a96c741e4037de6e3c42
 PKG_DESCR:=		A window manager for the terminal session
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		libncurses
-PKG_BUILDDEP:=		ncurses
+PKG_DEPENDS:=		libncurses libelf
+PKG_BUILDDEP:=		ncurses libelf
 PKG_URL:=		http://www.gnu.org/software/screen/
 PKG_SITES:=		${MASTER_SITE_GNU:=screen/}