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

6 files changed, 34 insertions, 31 deletions

diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 0bef82316..bad5c656d 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
-PKG_VERSION:=		1.0-31868
+PKG_VERSION:=		1.0-32749
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9d5c2c1c927947b31afa6f42c11e8f23
+PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
@@ -53,14 +53,19 @@ else
 CONFIGURE_CPU_OPTS:=	--disable-mmx
 endif
 ifeq (${ADK_TARGET_CPU_WITH_MMXEXT},y)
-CONFIGURE_CPU_OPTS:=	--enable-mmxext
+CONFIGURE_CPU_OPTS+=	--enable-mmxext
 else
-CONFIGURE_CPU_OPTS:=	--disable-mmxext
+CONFIGURE_CPU_OPTS+=	--disable-mmxext
 endif
 ifeq (${ADK_TARGET_CPU_WITH_SSE},y)
-CONFIGURE_CPU_OPTS:=	--enable-sse
+CONFIGURE_CPU_OPTS+=	--enable-sse
 else
-CONFIGURE_CPU_OPTS:=	--disable-sse
+CONFIGURE_CPU_OPTS+=	--disable-sse
+endif
+ifeq (${ADK_TARGET_CPU_WITH_SSE2},y)
+CONFIGURE_CPU_OPTS+=	--enable-sse2
+else
+CONFIGURE_CPU_OPTS+=	--disable-sse2
 endif
 
 ifeq ($(ADK_DEBUG),y)
@@ -89,7 +94,6 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-png \
 			--enable-jpeg \
 			--enable-mad \
-			--disable-faad-internal \
 			--enable-libvorbis \
 			--disable-ossaudio \
 			--disable-vm \
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
deleted file mode 100644
index 0189d6962..000000000
--- a/package/mplayer/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- mplayer-1.0-31868.orig/configure	2010-07-30 17:43:10.000000000 +0200
-+++ mplayer-1.0-31868/configure	2010-10-10 13:06:15.000000000 +0200
-@@ -1530,7 +1530,7 @@ fi
- if irix ; then
-   _ranlib='ar -r'
- elif linux ; then
--  _ranlib='true'
-+  _ranlib='ranlib'
- fi
- 
- if win32 ; then
-@@ -4354,7 +4354,7 @@ dfb_version() {
- 
- if test "$_directfb" = yes; then
-   cat > $TMPC << EOF
--#include <directfb_version.h>
-+#include <directfb/directfb_version.h>
- int
- dfb_ver = DIRECTFB_MAJOR_VERSION.DIRECTFB_MINOR_VERSION.DIRECTFB_MICRO_VERSION
- ;
diff --git a/package/mplayer/patches/patch-libvo_vo_dga_c b/package/mplayer/patches/patch-libvo_vo_dga_c
new file mode 100644
index 000000000..57836218f
--- /dev/null
+++ b/package/mplayer/patches/patch-libvo_vo_dga_c
@@ -0,0 +1,11 @@
+--- mplayer-1.0-32749.orig/libvo/vo_dga.c	2011-01-03 11:26:57.000000000 +0100
++++ mplayer-1.0-32749/libvo/vo_dga.c	2011-01-03 11:44:50.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include "mp_msg.h"
+ 
+ #include <X11/Xlib.h>
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+ 
+ #ifdef CONFIG_XF86VM
+ #include <X11/extensions/xf86vmode.h>
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index fb5a1236d..86c1a9e71 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1131dc5f27c4f3905a6e7ee0d594fd4d
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
diff --git a/package/nfs-utils/patches/patch-support_include_sockaddr_h b/package/nfs-utils/patches/patch-support_include_sockaddr_h
index 07d9eda46..129b83e5a 100644
--- a/package/nfs-utils/patches/patch-support_include_sockaddr_h
+++ b/package/nfs-utils/patches/patch-support_include_sockaddr_h
@@ -1,10 +1,11 @@
 --- nfs-utils-1.2.3.orig/support/include/sockaddr.h	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3/support/include/sockaddr.h	2010-12-25 00:47:43.000000000 +0100
-@@ -20,7 +20,6 @@
++++ nfs-utils-1.2.3/support/include/sockaddr.h	2011-01-03 12:12:10.000000000 +0100
+@@ -20,7 +20,7 @@
  #ifndef NFS_UTILS_SOCKADDR_H
  #define NFS_UTILS_SOCKADDR_H
  
 -#include <libio.h>
++#include <stddef.h>
  #include <stdbool.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 6d5de5bab..1bafddc94 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		397a0d665da8ba9d3b9583629f3d6421
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		misc
+PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://wiki.qemu.org/download/
 
@@ -17,10 +18,16 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		minimal
+CONFIGURE_ARGS+=	--host-cc=$(HOSTCC) \
+			--cross-prefix=$(TARGET_CROSS) \
+			--disable-user \
+			--prefix=/usr \
+			--sysconfdir=/etc \
+			--bindir=/usr/bin
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_QEMU)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/local/bin/qemu* \
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/qemu* \
 		$(IDIR_QEMU)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk