merge of 36b037a423c8b35b017dc3b821094d570ea82d5a

     and fa2f4d331a36d371e62aa55ceccfe3ec1383bf08

12 files changed, 22 insertions, 154 deletions

diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 009f9c9290..072c69c5a0 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -58,7 +58,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDER_x11 = "diet-x11"
-include conf/distro/preferred-gpe-versions-2.7.inc
+include conf/distro/preferred-gpe-versions-2.8.inc
 
 #
 # E
diff --git a/packages/libcontactsdb/libcontactsdb_cvs.bb b/packages/libcontactsdb/libcontactsdb_cvs.bb
index 229326752d..c6a8fad421 100644
--- a/packages/libcontactsdb/libcontactsdb_cvs.bb
+++ b/packages/libcontactsdb/libcontactsdb_cvs.bb
@@ -10,6 +10,8 @@ S = "${WORKDIR}/${PN}"
 PV = "0.1+cvs${SRCDATE}"
 PR = "r0"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit autotools gpe pkgconfig
 
 SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
diff --git a/packages/mplayer/mplayer-atty-1.1.4/.mtn2git_empty b/packages/mplayer/mplayer-atty-1.1.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch
deleted file mode 100644
index 03456aca4a..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplayer-1.1.4/Makefile.orig	2005-06-24 15:36:12.974059040 +0000
-+++ mplayer-1.1.4/Makefile	2005-06-24 15:36:31.628223176 +0000
-@@ -245,7 +245,7 @@
-     ifeq ($(TARGET_WIN32),yes)
- 	windres -o osdep/mplayer-rc.o osdep/mplayer.rc
-     endif
--	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) $(LDFLAGS)
- 	cp $(PRG) $(PRG).debug
- 	$(STRIP) $(PRG)
- 
diff --git a/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch
deleted file mode 100644
index 78161e79ee..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2005-04-07 10:19:08.392784784 +0100
-+++ Makefile	2005-04-07 10:21:26.262825352 +0100
-@@ -8,11 +8,6 @@
- 
- PRG_CFG = codec-cfg
- 
--# Do not strip the binaries at installation
--ifeq ($(STRIPBINARIES),yes)
--INSTALLSTRIP = -s
--endif
--
- # These subdirectories require installation due to binaries within them.
- ifeq ($(VIDIX),yes)
- SUBDIRS += libdha vidix
-@@ -283,7 +278,7 @@
- $(MENCODER_DEP): version.h help_mp.h
- 
- $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
--	$(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
-+	$(BUILD_CC) $(BUILD_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
- 
- install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
-@@ -368,7 +363,6 @@
- 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
- 
- strip:
--	strip -s $(ALL_PRG)
- 
- dep:	depend
- 
diff --git a/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch
deleted file mode 100644
index 962f1bc1e3..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c.orig	2005-04-08 09:16:18.310720680 +0000
-+++ mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c	2005-04-08 09:18:11.679486008 +0000
-@@ -248,22 +248,22 @@
- 	c->idct_permutation_type= FF_NO_IDCT_PERM;
-     }
- 
--    c->put_pixels_tab[0][0] = put_pixels16_arm;
--    c->put_pixels_tab[0][1] = put_pixels16_x2_arm;
--    c->put_pixels_tab[0][2] = put_pixels16_y2_arm;
--    c->put_pixels_tab[0][3] = put_pixels16_xy2_arm;
--    c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm;
--    c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm;
--    c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm;
--    c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm;
--    c->put_pixels_tab[1][0] = put_pixels8_arm;
--    c->put_pixels_tab[1][1] = put_pixels8_x2_arm;
--    c->put_pixels_tab[1][2] = put_pixels8_y2_arm;
--    c->put_pixels_tab[1][3] = put_pixels8_xy2_arm;
--    c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;
--    c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm;
--    c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm;
--    c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;
-+    /*     c->put_pixels_tab[0][0] = put_pixels16_arm; */ // NG!
-+    c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK!
-+    c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK!
-+    /*     c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; /\* NG *\/ */
-+    /*     c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; // ?(.....) */
-+    c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; // OK
-+    c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; //OK
-+    /*     c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; //NG */
-+    c->put_pixels_tab[1][0] = put_pixels8_arm; //OK
-+    c->put_pixels_tab[1][1] = put_pixels8_x2_arm; //OK
-+    /*     c->put_pixels_tab[1][2] = put_pixels8_y2_arm; //NG */
-+    /*     c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; //NG */
-+    c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;//OK
-+    c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; //OK
-+    c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK
-+    /*     c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;//NG */
- 
- #ifdef HAVE_IWMMXT
-     dsputil_init_iwmmxt(c, avctx);
diff --git a/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch
deleted file mode 100644
index 9ca1266c4b..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig	2005-04-19 12:09:24.313075760 +0100
-+++ MPlayer-1.0pre7/libmpcodecs/Makefile	2005-04-19 12:09:55.204379568 +0100
-@@ -50,7 +50,7 @@
- SRCS2=$(ENCODER_SRCS)
- OBJS2=$(SRCS2:.c=.o)
- 
--CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-+CFLAGS  = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
- 
- .SUFFIXES: .c .o
- 
diff --git a/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch
deleted file mode 100644
index 059a397926..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- MPlayer-1.0pre7/libmpdemux/Makefile.orig	2005-04-19 12:03:18.032758832 +0100
-+++ MPlayer-1.0pre7/libmpdemux/Makefile	2005-04-19 12:04:01.934084816 +0100
-@@ -36,8 +36,8 @@
- 
- OBJS	= $(SRCS:.c=.o)
- OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
--INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
--CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
-+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
-+CFLAGS  = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
- CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE)
- CPLUSPLUS = $(CC)
- 
diff --git a/packages/mplayer/mplayer-atty-1.1.4/sdl.patch b/packages/mplayer/mplayer-atty-1.1.4/sdl.patch
deleted file mode 100644
index d74c8397b9..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.4/sdl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./configure.orig	2004-09-24 19:09:56.000000000 +0930
-+++ ./configure	2004-09-24 19:22:21.000000000 +0930
-@@ -3554,38 +3554,6 @@
- #################
- 
- 
--echocheck "SDL"
--if test -z "$_sdlconfig" ; then
--  if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then
--    _sdlconfig="sdl-config"
--  elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then
--    _sdlconfig="sdl11-config"
--  else
--    _sdlconfig=false
--  fi
--fi
--if test "$_sdl" = auto || test "$_sdl" = yes ; then
--  cat > $TMPC << EOF
--#include <SDL.h>
--int main(int argc, char *argv[]) { return 0; }
--EOF
--  _sdl=no
--  if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
--    if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then
--      _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
--        if test "$_sdlversion" -gt 116 ; then
--          if test "$_sdlversion" -lt 121 ; then
--            _def_sdlbuggy='#define BUGGY_SDL'
--          else
--            _def_sdlbuggy='#undef BUGGY_SDL'
--          fi
--          _sdl=yes
--        else
--          _sdl=outdated
--        fi
--     fi
--  fi
--fi
- if test "$_sdl" = yes ; then
-   _def_sdl='#define HAVE_SDL 1'
-   if cygwin ; then
diff --git a/packages/sylpheed/files/Makefile-am.patch b/packages/sylpheed/files/Makefile-am.patch
new file mode 100644
index 0000000000..d1fb09ffcf
--- /dev/null
+++ b/packages/sylpheed/files/Makefile-am.patch
@@ -0,0 +1,12 @@
+--- sylpheed-1.9.12/src/Makefile.am.orig	2006-01-16 13:14:05.000000000 +0000
++++ sylpheed-1.9.12/src/Makefile.am	2006-01-16 13:14:19.000000000 +0000
+@@ -177,8 +177,7 @@
+ 	-DG_LOG_DOMAIN=\"Sylpheed\" \
+ 	$(GTK_CFLAGS) \
+ 	$(GDK_PIXBUF_CFLAGS) \
+-	$(GPGME_CFLAGS) \
+-	-I$(includedir)
++	$(GPGME_CFLAGS)
+ 
+ sylpheed_LDADD = \
+ 	$(INTLLIBS) \
diff --git a/packages/sylpheed/sylpheed_1.9.12.bb b/packages/sylpheed/sylpheed_1.9.12.bb
index a6b8cb1738..b02aead205 100644
--- a/packages/sylpheed/sylpheed_1.9.12.bb
+++ b/packages/sylpheed/sylpheed_1.9.12.bb
@@ -3,15 +3,16 @@ DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \
-	file://sylpheed-gnutls.patch;patch=1"
+	file://sylpheed-gnutls.patch;patch=1 \
+	file://Makefile-am.patch;patch=1"
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
 
-EXTRA_OECONF = "--enable-gnutls --includedir=${STAGING_INCDIR}"
+EXTRA_OECONF = "--enable-gnutls"
 
 CFLAGS += "-D_GNU_SOURCE"
 
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 6ebbd2ce40..788b8580c4 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r10"
+PR = "r11"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -66,4 +66,5 @@ S = "${WORKDIR}/xserver"
 
 inherit autotools pkgconfig 
 
-EXTRA_OECONF = "--enable-composite --disable-xinerama"
+LDFLAGS += " -lXfont -lXdmcp -lXau "
+EXTRA_OECONF = "--enable-static=no --disable-static  --enable-composite --disable-xinerama"