16-May-2011 Consolidated Pull Request

index d5d8291..20e042b 100644
@@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = "\
 # rpcinfo can be useful but only with glibc images
 GLIBC_DEPENDENCIES = "glibc-utils"
 
-RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
-RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_linux = " ${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = " ${GLIBC_DEPENDENCIES}"

index 50f1afc..a649213 100644
@@ -7,7 +7,6 @@ BUGTRACKER = "http://code.google.com/p/opkg/issues/list"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
-DEPENDS = "curl gpgme openssl"
 DEPENDS_virtclass-native = "curl-native"
 DEPENDS_virtclass-nativesdk = "curl-nativesdk"
 

@@ -21,9 +20,14 @@ do_configure_prepend() {
 }
 
 inherit autotools pkgconfig
+EXTRA_OECONF += " --disable-gpg \
+                  --disable-openssl \
+                  --disable-ssl-curl \
+                  --disable-curl \
+                  --disable-sha256"
 
 target_localstatedir := "${localstatedir}"
-EXTRA_OECONF = "--with-opkglibdir=${localstatedir}/lib"
+EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib"
 EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
 EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
 

index 5664a09..5964a47 100644
@@ -7,6 +7,7 @@ RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
 RDEPENDS_${PN}_virtclass-native = ""
 RDEPENDS_${PN}_virtclass-nativesdk = ""
 PACKAGE_ARCH_update-alternatives-cworth = "all"
+RREPLACES_${PN} = "opkg-nogpg"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
            file://add_vercmp.patch \

@@ -15,7 +16,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 
 S = "${WORKDIR}/trunk"
 
-SRCREV = "596"
+SRCREV = "609"
 PV = "0.1.8+svnr${SRCPV}"
 PR = "r2"
 

index d493f6f..91a783d 100644
@@ -39,11 +39,17 @@ do_install () {
 RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
 
 PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
+PACKAGES =+ "libcomerr libss libe2p libext2fs"
+
 FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
 FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
 FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
 FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
 FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
+FILES_libcomerr = "${libdir}/libcom_err.so.*"
+FILES_libss = "${libdir}/libss.so.*"
+FILES_libe2p = "${libdir}/libe2p.so.*"
+FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
 
 BBCLASSEXTEND = "native"

deleted file mode 100644
index 13a6c2c..0000000
@@ -1,12 +0,0 @@
---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig	2006-06-08 14:49:12.158684250 +0200
-+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c	2006-06-08 14:49:52.493205000 +0200
-@@ -52,8 +52,8 @@
- /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
- 
- #define NEED_REPLIES
- #ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
-+#include <kdrive-config.h>
- #endif
- 
- #include <X11/X.h>

deleted file mode 100644
index 8ec3a37..0000000
@@ -1,11 +0,0 @@
-Index: xorg-server-1.2.0/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am	2007-03-28 17:11:38.000000000 +0200
-+++ xorg-server-1.2.0/hw/kdrive/Makefile.am	2007-03-28 17:12:28.000000000 +0200
-@@ -1,5 +1,5 @@
- if KDRIVEFBDEV
--FBDEV_SUBDIRS = fbdev
-+FBDEV_SUBDIRS = fbdev epson
- endif
- 
- if KDRIVEIMAGEON

deleted file mode 100644
index 9a59530..0000000
@@ -1,12 +0,0 @@
-Index: xorg-server-1.2.0/configure.ac
-===================================================================
---- xorg-server-1.2.0.orig/configure.ac	2007-03-29 13:28:10.000000000 +0200
-+++ xorg-server-1.2.0/configure.ac	2007-03-29 13:28:35.000000000 +0200
-@@ -1517,6 +1517,7 @@
-             AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
-         fi
-         AC_DEFINE(TSLIB, 1, [Have tslib support])
-+        AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support])
-     fi
- 
-     # damage shadow extension glx (NOTYET) fb mi

110 lines not on this page · raw message

41 lines not on this page · raw message

307 lines not on this page · raw message

515 lines not on this page · raw message

54 lines not on this page · raw message

58 lines not on this page · raw message

deleted file mode 100644
index 72c8a18..0000000
@@ -1,29 +0,0 @@
-Server reports XRandR version provided by libxrandr instead of XRandR
-version implemented. It confuses applications that execute XRandR
-version dependent code (e. g. gtk+ >= 2.18.0).
-
-Index: xorg-server-1.3.0.0/randr/rrdispatch.c
-===================================================================
---- xorg-server-1.3.0.0.orig/randr/rrdispatch.c
-+++ xorg-server-1.3.0.0/randr/rrdispatch.c
-@@ -22,6 +22,9 @@
- 
- #include "randrstr.h"
- 
-+#define SERVER_RANDR_MAJOR	1
-+#define SERVER_RANDR_MINOR	2
-+
- Bool
- RRClientKnowsRates (ClientPtr	pClient)
- {
-@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
-      * Report the current version; the current
-      * spec says they're all compatible after 1.0
-      */
--    rep.majorVersion = RANDR_MAJOR;
--    rep.minorVersion = RANDR_MINOR;
-+    rep.majorVersion = SERVER_RANDR_MAJOR;
-+    rep.minorVersion = SERVER_RANDR_MINOR;
-     if (client->swapped) {
-     	swaps(&rep.sequenceNumber, n);
-     	swapl(&rep.length, n);

151 lines not on this page · raw message

122 lines not on this page · raw message

deleted file mode 100644
index 2341e40..0000000
@@ -1,19 +0,0 @@
-Index: xorg-server-1.7.99.2/configure.ac
-===================================================================
---- xorg-server-1.7.99.2.orig/configure.ac	2010-01-29 16:38:49.000000000 +0000
-+++ xorg-server-1.7.99.2/configure.ac	2010-01-29 16:42:39.000000000 +0000
-@@ -503,14 +503,10 @@
- 
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR
--AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
--	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
--	[
- 		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
- 		case $host_os in
- 			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- 		esac
--	])
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- 				[ FONTPATH="$withval" ],
- 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])

deleted file mode 100644
index bd88427..0000000
@@ -1,20 +0,0 @@
---- xserver/hw/kdrive/linux/linux.c.orig	2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c	2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
-     /*
-      * Open the APM driver
-      */
--    LinuxApmFd = open ("/dev/apm_bios", 2);
-+    /*LinuxApmFd = open ("/dev/apm_bios", 2);
-     if (LinuxApmFd < 0 && errno == ENOENT)
- 	LinuxApmFd = open ("/dev/misc/apm_bios", 2); 
-     if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
- 	RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
- 	AddEnabledDevice (LinuxApmFd);
-     }
--	
-+    */	
-     /*
-      * now get the VT
-      */

deleted file mode 100644
index 13a6c2c..0000000
@@ -1,12 +0,0 @@
---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig	2006-06-08 14:49:12.158684250 +0200
-+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c	2006-06-08 14:49:52.493205000 +0200
-@@ -52,8 +52,8 @@
- /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
- 
- #define NEED_REPLIES
- #ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
-+#include <kdrive-config.h>
- #endif
- 
- #include <X11/X.h>

148 lines not on this page · raw message

83 lines not on this page · raw message

61 lines not on this page · raw message

deleted file mode 100644
index eb98fb8..0000000
@@ -1,18 +0,0 @@
----
- render/glyphstr.h |    1 +
- 1 file changed, 1 insertion(+)
-
---- xorg-server-1.3.0.0.orig/render/glyphstr.h
-+++ xorg-server-1.3.0.0/render/glyphstr.h
-@@ -23,10 +23,11 @@
-  */
- 
- #ifndef _GLYPHSTR_H_
- #define _GLYPHSTR_H_
- 
-+#include <X11/X.h>
- #include <X11/extensions/renderproto.h>
- #include "picture.h"
- #include "screenint.h"
- #include "regionstr.h"
- #include "miscstruct.h"

515 lines not on this page · raw message

54 lines not on this page · raw message

deleted file mode 100644
index 35ccada..0000000
@@ -1,13 +0,0 @@
---- xserver/hw/kdrive/linux/mouse.c.orig	2004-05-13 14:25:51.000000000 -0700
-+++ xserver/hw/kdrive/linux/mouse.c	2005-09-22 12:20:47.000000000 -0700
-@@ -927,8 +927,10 @@ char *kdefaultMouse[] =  {
-     "/dev/psaux",
-     "/dev/input/mice",
-     "/dev/adbmouse",
-+#ifdef BREAK_MY_SERIAL_CONSOLE
-     "/dev/ttyS0",
-     "/dev/ttyS1",
-+#endif
- };
- 
- #define NUM_DEFAULT_MOUSE    (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))

deleted file mode 100644
index 6b34032..0000000
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac	2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX

58 lines not on this page · raw message

index 52b63ed..cc9acaa 100644
@@ -4,7 +4,7 @@ DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \
         libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans bigreqsproto \
         xcmiscproto libdrm openssl"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
 PROVIDES = "virtual/xserver"
 PACKAGES =+ "xserver-kdrive-fbdev \

new file mode 100644
index 0000000..2f98bb8
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff --git a/configure.ac b/configure.ac
+index b3b752c..600500b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+ dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+ DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+-if test "$cross_compiling" != yes; then
+-	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+-		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+-		[case $host_os in
++		case $host_os in
+ 			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+-		esac])
+-fi
++		esac
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ 				[ FONTPATH="$withval" ],
+ 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])

index bd88427..458f19a 100644
@@ -1,20 +1,24 @@
---- xserver/hw/kdrive/linux/linux.c.orig	2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c	2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
+Upstream-Status: Inappropriate [disable feature]
+
+diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
+index 9863c14..adbfbaa 100644
+--- a/hw/kdrive/linux/linux.c
++++ b/hw/kdrive/linux/linux.c
+@@ -251,7 +251,7 @@ LinuxEnable (void)
      /*
       * Open the APM driver
       */
 -    LinuxApmFd = open ("/dev/apm_bios", 2);
-+    /*LinuxApmFd = open ("/dev/apm_bios", 2);
++/*  LinuxApmFd = open ("/dev/apm_bios", 2);
      if (LinuxApmFd < 0 && errno == ENOENT)
- 	LinuxApmFd = open ("/dev/misc/apm_bios", 2); 
+ 	LinuxApmFd = open ("/dev/misc/apm_bios", 2);
      if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ LinuxEnable (void)
  	RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
  	AddEnabledDevice (LinuxApmFd);
      }
--	
-+    */	
+-
++*/
      /*
       * now get the VT
       */

deleted file mode 100644
index ccc1913..0000000
@@ -1,39 +0,0 @@
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac	2007-04-20 03:23:40.000000000 +0200
-+++ xorg-server-1.3.0.0/configure.ac	2007-05-09 16:51:34.000000000 +0200
-@@ -520,7 +520,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
- 
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
-+else
- REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
- 
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1603,7 +1607,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
- 
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
- 
- AC_TRY_COMPILE([
-@@ -1616,10 +1622,12 @@
- 
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
- 
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
- 
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], 

index 14cf990..4cde6ab 100644
@@ -1,14 +1,12 @@
 Add some extra video modes and change the default to VGA.
 
----
- hw/kdrive/src/kmode.c |   41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
+Upstream-Status: Inappropriate [embedded specific]
 
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c	2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c	2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming  kdMonitorTimings[
+diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
+index 38b7bc8..d569444 100644
+--- a/hw/kdrive/src/kmode.c
++++ b/hw/kdrive/src/kmode.c
+@@ -30,6 +30,31 @@ const KdMonitorTiming  kdMonitorTimings[] = {
      /*	H	V	Hz	KHz */
  		/*  FP	    BP	    BLANK   POLARITY */
  

@@ -40,10 +38,10 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
      /* IPAQ modeline:
       *
       * Modeline "320x240"      5.7222 320 337 340 352   240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming  kdMonitorTimings[
+@@ -39,6 +64,11 @@ const KdMonitorTiming  kdMonitorTimings[] = {
  	            1,      11,     14,     KdSyncNegative,
      },
-     
+ 
 +    {   240,	320,	64,	    0,
 +	            0,	    0,	    0,     KdSyncNegative,
 +	            0,      0,      0,     KdSyncNegative,

@@ -52,7 +50,7 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
      /* Other VESA modes */
      {	640,	350,	85,	31500,			    /* VESA */
  		    32,	    96,	    192,    KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming  kdMonitorTimings[
+@@ -74,11 +104,18 @@ const KdMonitorTiming  kdMonitorTimings[] = {
  		    16,	    120,    176,    KdSyncNegative, /* 37.861 */
  		    1,	    20,	    24,	    KdSyncNegative, /* 72.809 */
      },

@@ -62,17 +60,16 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
  		   16,	    48,	    160,    KdSyncNegative, /* 31.469 */
  		   10,	    33,	    45,	    KdSyncNegative, /* 59.940 */
      },
-+
-+
-+  {   480,    640,    60,     0,                      /* VESA */
+ 
++    {  480,    640,    60,     0,                      /* VESA */
 +               0,      0,     0,    KdSyncNegative, /* 31.469 */
 +               0,      0,     0,     KdSyncNegative, /* 59.940 */
-+   },
-+  
-     
++    },
++
      /* 800x600 modes */
      {	800,	600,	85,	56250,			    /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming  kdMonitorTimings[
+ 		    32,	    152,    248,    KdSyncPositive, /* 53.674 */
+@@ -88,8 +125,6 @@ const KdMonitorTiming  kdMonitorTimings[] = {
  		    16,	    160,    256,    KdSyncPositive, /* 46.875 */
  		    1,	    21,	    25,	    KdSyncPositive, /* 75.000 */
      },

index a5c22a5..125d126 100644
@@ -1,8 +1,10 @@
-Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c	2008-09-25 21:55:12.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c	2008-09-25 21:55:46.000000000 +0100
-@@ -498,6 +498,7 @@
+Upstream-Status: Pending
+
+diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
+index 2c7fa91..7f6b6f9 100644
+--- a/hw/kdrive/fbdev/fbdev.c
++++ b/hw/kdrive/fbdev/fbdev.c
+@@ -485,6 +485,7 @@ fbdevRandRSetConfig (ScreenPtr		pScreen,
      KdScreenInfo	*screen = pScreenPriv->screen;
      FbdevScrPriv	*scrpriv = screen->driver;
      Bool		wasEnabled = pScreenPriv->enabled;

@@ -10,17 +12,10 @@ Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
      FbdevScrPriv	oldscr;
      int			oldwidth;
      int			oldheight;
-@@ -525,11 +526,46 @@
-     oldheight = screen->height;
-     oldmmwidth = pScreen->mmWidth;
-     oldmmheight = pScreen->mmHeight;
--    
-+
-     /*
+@@ -517,6 +518,41 @@ fbdevRandRSetConfig (ScreenPtr		pScreen,
       * Set new configuration
       */
--    
-+
+ 
 +    if (newwidth != oldwidth || newheight != oldheight)
 +    {
 +	struct fb_var_screeninfo var;

@@ -58,4 +53,4 @@ Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
 +
      scrpriv->randr = KdAddRotation (screen->randr, randr);
  
-     KdOffscreenSwapOut (screen->pScreen);
+     fbdevUnmapFramebuffer (screen);

similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/fix-newer-xorg-headers.patch

157 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/keyboard-resume-workaround.patch

new file mode 100644
index 0000000..b1340fb
@@ -0,0 +1,22 @@
+require xserver-kdrive.inc
+
+DEPENDS += "libxkbfile libxcalibrate font-util pixman"
+
+RDEPENDS_${PN} += "xkeyboard-config"
+
+EXTRA_OECONF += "--disable-glx"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+	file://extra-kmodes.patch; \
+	file://disable-apm.patch; \
+	file://no-serial-probing.patch; \
+	file://keyboard-resume-workaround.patch; \
+	file://hide-cursor-and-ppm-root.patch; \
+	file://fbdev_xrandr_ioctl.patch; \
+	file://fix-newer-xorg-headers.patch;\
+	file://crosscompile.patch;"
+
+S = "${WORKDIR}/xorg-server-${PV}"

deleted file mode 100644
index b7e5520..0000000
@@ -1,29 +0,0 @@
-require xserver-kdrive.inc
-
-DEPENDS += "libxkbfile libxcalibrate font-util pixman"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-EXTRA_OECONF += "--disable-glx"
-
-PE = "1"
-PR = "r26"
-
-SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
-	file://extra-kmodes.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://fbdev_xrandr_ioctl.patch;patch=1 \
-	file://fix-newer-xorg-headers.patch;patch=1 \
-	file://crosscompile.patch;patch=1 \
-	file://nodolt.patch;patch=1"
-#	file://kdrive-evdev.patch;patch=1
-#	file://kdrive-use-evdev.patch;patch=1
-#	file://enable-builtin-fonts.patch;patch=1
-#	file://optional-xkb.patch;patch=1
-
-
-S = "${WORKDIR}/xorg-server-${PV}"

index 60ceed4..d87c30e 100644
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
 LICENSE = "GPLv2"
-DEPENDS = "startup-notification gtk+ gconf clutter-1.4 gdk-pixbuf-native intltool glib-2.0-native"
+DEPENDS = "startup-notification gtk+ gconf clutter-1.6 gdk-pixbuf-native intltool glib-2.0-native"
 # gobject-introspection
 inherit gnome update-alternatives
 

47 lines not on this page · raw message

index e4c185a..50f2647 100644
@@ -1,11 +1,14 @@
 require mutter.inc
 
+PR = "r1"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "http://download.moblin.org/sources/mutter/2.28/mutter-2.28.1_0.0.tar.bz2 \
-           file://nodocs.patch;patch=1 \
-           file://nozenity.patch;patch=1 \
-           file://fix_pkgconfig.patch;patch=1 \
+           file://nodocs.patch \
+           file://nozenity.patch \
+           file://fix_pkgconfig.patch \
+           file://fix_CGL_TEXTURE_RECTANGLE_ARB.patch \
            "
 
 S = "${WORKDIR}/mutter-2.28.1_0.0"

index 8d308f1..c3ba32e 100644
@@ -18,3 +18,4 @@ SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
            "
 S = "${WORKDIR}/git"
 
+DEFAULT_PREFERENCE = "-1"

index a88e18e..7970b6d 100644
@@ -1,6 +1,9 @@
-# Disable stripping binaries during make install.
-#
-# Signed-off-by: Scott Garman <[email protected]>
+Disable stripping binaries during make install.
+
+Upstream-Status: Inappropriate [Other]
+Build system specific.
+
+Signed-off-by: Scott Garman <[email protected]>
 
 diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in
 --- openssh-5.6p1.orig/Makefile.in	2010-05-11 23:51:39.000000000 -0700

index 32609b9..fbb4967 100644
@@ -1,6 +1,9 @@
-# disable compiling examples
-#
-# comment added by Kevin Tian <[email protected]>, 2010-07-10
+Disable compiling examples
+
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Kevin Tian <[email protected]>
+Signed-off-by: Scott Garman <[email protected]>
 
 --- dbus-glib-0.70/dbus/Makefile.am.orig	2006-07-23 16:04:43.000000000 +0200
 +++ dbus-glib-0.70/dbus/Makefile.am	2006-07-23 16:04:52.000000000 +0200

index ff1578f..c0ac10b 100644
@@ -1,6 +1,10 @@
-# avoid to use expat's own *.m4
-#
-# comment added by Kevin Tian <[email protected]>, 2010-07-07
+Avoid using expat's m4 files
+
+Upstream-Status: Inappropriate [Other]
+Workaround specific to our build system.
+
+Signed-off-by: Kevin Tian <[email protected]>
+Signed-off-by: Scott Garman <[email protected]>
 
 diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
 --- expat-2.0.0~orig/configure.in	2006-01-10 19:10:46.000000000 -0600

index 4f3507e..92f5898 100644
@@ -1,6 +1,9 @@
 Patch obtained from OpenEmbedded.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <[email protected]>
+
 --- OpenSP-1.5/include/Attribute.h~attributevalue	2000-03-09 13:30:56.000000000 -0500
 +++ OpenSP-1.5/include/Attribute.h	2004-01-20 14:11:36.000000000 -0500
 @@ -31,6 +31,28 @@

index 5e2fc8b..c78b9ad 100644
@@ -1,6 +1,9 @@
 Patch obtained from OpenEmbedded.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <[email protected]>
+
 Index: OpenSP-1.5/doc/Makefile.am
 ===================================================================
 --- OpenSP-1.5.orig/doc/Makefile.am	2000-05-06 09:10:32.000000000 +1000

index a8504c5..96a782c 100644
@@ -1,6 +1,9 @@
 Patch obtained from OpenEmbedded.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <[email protected]>
+
 --- /dev/null	2003-09-23 18:19:32.000000000 -0400
 +++ OpenSP-1.5/m4/codeset.m4	2004-01-20 03:01:28.000000000 -0500
 @@ -0,0 +1,23 @@

index cc849ca..da31411 100644
@@ -1,6 +1,9 @@
 Patch obtained from OpenEmbedded.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <[email protected]>
+
 Index: OpenSP-1.5/include/RangeMap.cxx
 ===================================================================
 --- OpenSP-1.5.orig/include/RangeMap.cxx	2000-02-26 03:55:21.000000000 +1100

index 1366ada..1f39b03 100644
@@ -1,6 +1,9 @@
 Patch obtained from OpenEmbedded.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <[email protected]>
+
 --- sgml-common-0.6.3/bin/Makefile.am~autohell.patch	2001-01-30 15:42:21.000000000 +0100
 +++ sgml-common-0.6.3/bin/Makefile.am	2004-06-17 11:51:11.000000000 +0200
 @@ -1,6 +1,5 @@

index ec66aae..54b3f54 100644
@@ -7,7 +7,10 @@ Upstream was notified about this on 2011-01-24. When upgrading
 this recipe, this should be fixed and you should remove this
 patch.
 
+Upstream-Status: Pending
+
 Signed-off-by: Scott Garman <[email protected]>
+
 diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2
 --- sgml-common-0.6.3.orig/LICENSE-GPLv2	1969-12-31 16:00:00.000000000 -0800
 +++ sgml-common-0.6.3/LICENSE-GPLv2	2011-01-28 17:05:17.299528001 -0800

index 2458ef3..079a6b4 100644
@@ -1,5 +1,9 @@
-# Fix cross-compilation issues in configure.ac
-# Derived from an OE patch for at-3.1.8
+Fix cross-compilation issues in configure.ac
+Derived from an OE patch for at-3.1.8
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <[email protected]>
 
 Index: at-3.1.12/configure.ac
 ===================================================================

index 6383660..877be35 100644
@@ -9,6 +9,10 @@ Fixed the issue by adding a dependancy in the makefile.
 Nitin <[email protected]>
 2010/09/02
 
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: at-3.1.12/Makefile.in
 ===================================================================
 --- at-3.1.12.orig/Makefile.in

index dfa0d91..a6b8e82 100644
@@ -1,5 +1,9 @@
-# Avoid multiple stat definitions
-# Patch taken from cpio mailing list posting 2010-03-19
+Avoid multiple stat definitions
+Patch taken from cpio mailing list posting 2010-03-19
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <[email protected]>
 
 diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h
 --- cpio-2.11.orig/src/filetypes.h	2010-02-12 02:19:23.000000000 -0800

index e622a0d..5e551ac 100644
@@ -2,6 +2,11 @@ innetgr may not be there so make sure that when innetgr is not present
 then we inform about it and not use it.
 
 -Khem
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c
 ===================================================================
 --- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c

index 2375fc6..22fda53 100644
@@ -1,6 +1,10 @@
-# Fix path to libtool scripts so autoreconf can succeed.
-#
-# Signed-off-by: Scott Garman <[email protected]>
+Fix path to libtool scripts so autoreconf can succeed.
+
+Upstream-Status: Inappropriate [Other]
+Workaround specific to our build system.
+
+Signed-off-by: Scott Garman <[email protected]>
+
 diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4
 --- sudo-1.7.4p4.orig//aclocal.m4	2010-08-06 07:17:36.000000000 -0700
 +++ sudo-1.7.4p4//aclocal.m4	2010-11-22 14:38:20.360957038 -0800

index 9291e92..755341f 100644
@@ -1,3 +1,9 @@
+Fixes an error which prevents compilation
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: source/layoutex/ParagraphLayout.cpp
 ===================================================================
 --- source.orig/layoutex/ParagraphLayout.cpp	2009-06-30 11:48:47.000000000 +0100

index eba3d80..8543044 100644
@@ -4,6 +4,11 @@ harmless. This is a hack.
 
 RP 10/6/2010
 
+Upstream-Status: Inappropriate [Other]
+Hacky workaround not likely to be accepted upstream.
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: source/config/Makefile.inc.in
 ===================================================================
 --- source.orig/config/Makefile.inc.in	2010-06-10 21:49:19.000000000 +0100

index 4702abc..f477dad 100644
@@ -1,3 +1,10 @@
+Use g++ for linking.
+
+Upstream-Status: Inappropriate [Other]
+Build system specific
+
+Signed-off-by: Scott Garman <[email protected]>
+
 ---
  tools/genccode/Makefile.in |    2 +-
  tools/gencmn/Makefile.in   |    2 +-

index 2611f22..1ee8181 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 diff --git a/COPYING b/COPYING
 new file mode 100644
 index 0000000..d511905

index 9193929..c34ef34 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 ---
  Makefile  |    6 +++---
  config.mk |    3 ++-

index f6bd91e..c287014 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher

index 29012fe..c93f511 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- console-tools-0.3.2/kbdtools/showkey.c~compile	1999-08-25 17:20:08.000000000 -0400
 +++ console-tools-0.3.2/kbdtools/showkey.c	2004-05-09 03:03:23.000000000 -0400
 @@ -264,7 +264,6 @@

index f5b7532..60ee8ff 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher

index 47d7ea5..f370be8 100644
@@ -1,6 +1,8 @@
 Patch from Matthias Goebl <[email protected]>
 Added via OE bugtracker: bug #478
 
+Upstream-Status: Pending
+
 --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig
 +++ console-tools-0.3.2/kbdtools/kbd_mode.c
 @@ -29,11 +29,16 @@

index c73d8a3..0c95068 100644
@@ -1,6 +1,8 @@
 Fixing the locale issues isn't enough, console-tools also does a couple of
 other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)),
 
+Upstream-Status: Pending
+
 --- console-tools-0.3.2/lib/cfont/fontstruct.c.ark	2005-05-22 19:12:38.000000000 +0000
 +++ console-tools-0.3.2/lib/cfont/fontstruct.c	2005-05-22 19:13:23.000000000 +0000
 @@ -50,8 +50,7 @@

index 2611f22..1ee8181 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 diff --git a/COPYING b/COPYING
 new file mode 100644
 index 0000000..d511905

index aa2faf9..9b5e952 100644
@@ -11,6 +11,7 @@ This patch avoids these linking errors:
 Nitin A Kamble <[email protected]>
 Date: 2011/02/03
 
+Upstream-Status: Pending
 
 Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am
 ===================================================================

index 565832e..2f62972 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: git/os/osdep.h
 ===================================================================
 --- git.orig/os/osdep.h	2008-10-07 18:38:21.000000000 +0100

index daf5824..95ad9cf 100644
@@ -2,6 +2,8 @@
 #
 # by Kevin Tian <[email protected]>, 2010-07-21
 
+Upstream-Status: Inappropriate [disable feature]
+
 diff --git a/Makefile.am b/Makefile.am
 index 6f83c12..32972a8 100644
 --- a/Makefile.am

index 9550255..31dc0e9 100644
@@ -5,6 +5,8 @@
 #
 # Kevin Tian <[email protected]>, 2010-08-06
 
+Upstream-Status: Pending
+
 diff --git a/depmod.c b/depmod.c
 index 647e5e6..46e03e0 100644
 --- a/depmod.c

index 7b30824..d29957d 100644
@@ -2,6 +2,8 @@
 #
 # comments added by Kevin Tian <[email protected]>, 2010-07-21
 
+Upstream-Status: Pending
+
 diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
 --- module-init-tools-3.12/modprobe.8.orig
 +++ module-init-tools-3.12/modprobe.8

index 128c953..4a6e0fe 100644
@@ -1,6 +1,9 @@
 # poky uses new name to differentiate from modutils, so reflect this new name in source
 #
 # comment added by Kevin Tian <[email protected]>, 2010-07-21
+
+Upstream-Status: Inappropriate [embedded specific]
+
 --- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
 +++ module-init-tools-3.0-pre10/generate-modprobe.conf
 @@ -45,12 +45,12 @@

index ca83ec0..33fb6e0 100644
@@ -9,6 +9,8 @@
 #
 # by Kevin Tian <[email protected]>, 2010-07-21
 
+Upstream-Status: Pending
+
 Index: module-init-tools-3.2.2/Makefile.am
 ===================================================================
 --- module-init-tools-3.2.2.orig/Makefile.am	2010-05-26 15:43:16.000000000 -0400

index 6e7b76a..21ac49c 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 Index: modutils-initscripts-1.0/LICENSE
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

index a26a3a2..3198553 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- modutils-2.4.27/include/elf_arm.h.orig	2004-09-21 18:37:00.000000000 -0400
 +++ modutils-2.4.27/include/elf_arm.h	2004-09-21 18:38:18.000000000 -0400
 @@ -1,7 +1,11 @@

index cdf5015..63e80d7 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher

index 53750bc..4507b03 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: modutils-2.4.27/depmod/depmod.c
 ===================================================================
 --- modutils-2.4.27.orig/depmod/depmod.c

index 65904b6..b2419a4 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- modutils-2.4.26.orig/genksyms/lex.l
 +++ modutils-2.4.26/genksyms/lex.l
 @@ -130,6 +130,7 @@

index 0e15a10..ab100f2 100644
@@ -2,6 +2,8 @@ This test disables the annoying
    Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
 message.
 
+Upstream-Status: Inappropriate [disable feature]
+
 --- modutils-2.4.6/insmod/modprobe.c~notest	Mon Feb 26 02:07:17 2001
 +++ modutils-2.4.6/insmod/modprobe.c	Wed Feb 19 14:31:52 2003
 @@ -785,7 +785,6 @@

index 2927a23..973705e 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- modutils-2.4.25/Makefile.common.in	Sun Nov 24 21:23:35 2002
 +++ modutils-2.4.25/Makefile.common.in	Thu Jan 29 17:16:30 2004
 @@ -7,6 +7,7 @@

index 077baaf..e9f1224 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h
 --- modutils-2.4.27.orig/include/module.h	2003-01-27 11:22:02.000000000 -0500
 +++ modutils-2.4.27/include/module.h	2004-08-23 19:52:34.756772712 -0400

index 0999a85..abd7ff4 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration] 
+
 Index: eggdbus-0.6/docs/eggdbus/Makefile.am
 ===================================================================
 --- eggdbus-0.6.orig/docs/eggdbus/Makefile.am

index 2b2cb49..a605a34 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: eggdbus-0.6/src/eggdbus/Makefile.am
 ===================================================================
 --- eggdbus-0.6.orig/src/eggdbus/Makefile.am

index 3cf0953..76ed3a8 100644
@@ -2,6 +2,8 @@ Enable i386-linux-user
 
 Signed-off-by: Zhai Edwin <[email protected]>
 
+Upstream-Status: Inappropriate [configuration] 
+
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target

index 0219cc8..5a65039 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration] 
+
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target

index 470cf80..4569643 100644
@@ -7,6 +7,9 @@ More information is available on the Fedora Wiki:
 https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
 
 JL - 15/06/10
+
+Upstream-Status: Inappropriate [configuration] 
+
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target

index cf0d659..098070a 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration] 
+
 Index: qemu-0.14.0/Makefile
 ===================================================================
 --- qemu-0.14.0.orig/Makefile

index 92467a7..bbc9c9e 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream
+
 Index: qemu-0.14.0/Makefile.target
 ===================================================================
 --- qemu-0.14.0.orig/Makefile.target

index 42ec98f..c4c5424 100644
@@ -1,6 +1,9 @@
 # fix VMware VGA driver depth calculation error, which may cause segmentation fault
 #
 # ktian1, 06/29/2010
+
+Upstream-Status: Pending
+
 Index: qemu-0.14.0/console.h
 ===================================================================
 --- qemu-0.14.0.orig/console.h

index 478b204..837af5b 100644
@@ -10,6 +10,8 @@ committer Andrzej Zaborowski <[email protected]> Tue, 16 Jun 2009 22:2
  target-i386/opengl_exec.c |   31 ++++++++++++++++---------------
  1 files changed, 16 insertions(+), 15 deletions(-)
 
+Upstream-Status: Inappropriate [configuration] 
+
 Index: qemu-0.14.0/target-i386/opengl_exec.c
 ===================================================================
 --- qemu-0.14.0.orig/target-i386/opengl_exec.c

index 7d55f3c..53a0894 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature] 
+
 Index: gtk+-2.12.3/gtk/gtkfilechooser.c
 ===================================================================
 --- gtk+-2.12.3.orig/gtk/gtkfilechooser.c	2007-12-04 16:52:08.000000000 +0000

index cfb50dc..58f2729 100644
@@ -6,6 +6,8 @@ introspection is disabled.
 JL 28/03/11
 [email protected]
 
+Upstream-Status: Inappropriate [configuration] 
+
 Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
 ===================================================================
 --- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am

index 726d590..7d9689e 100644
@@ -1,6 +1,9 @@
 Fix the ordering of LDADD options to fix a compilation failure.
 
 Signed-off-by: Scott Garman <[email protected]>
+
+Upstream-Status: Inappropriate [configuration] 
+
 diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
 --- screenshot.orig//Makefile.am	2010-06-29 11:55:00.000000000 -0700
 +++ screenshot/Makefile.am	2011-03-01 11:09:01.215813968 -0800

index fade195..79fc9ce 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
 --- libfm-0.1.14-orig//src/Makefile.am	2011-04-26 10:01:44.297664993 +0800
 +++ libfm-0.1.14/src/Makefile.am	2011-04-26 10:02:10.637665004 +0800

index 818a07e..536434f 100644
@@ -136,6 +136,13 @@ do_validate_branches() {
  	 	return
  	fi
 
+	# nothing to do if SRCREV=${AUTOREV}
+	if [ "${SRCREV_machine}" = "AUTOINC" ]; then
+		# restore the branch for builds
+		git checkout -f ${KBRANCH}
+		return
+	fi
+
  	branch_head=`git show-ref -s --heads ${KBRANCH}`
  	meta_head=`git show-ref -s --heads ${KMETA}`
  	target_branch_head="${SRCREV_machine}"

index 829d105..f7600ca 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c"
+SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af"
 PR = r10
 PV = "0.1+git${SRCPV}"
 

index 905dad7..f24cff8 100644
@@ -4,19 +4,9 @@ addhandler distro_eventhandler
 python distro_eventhandler() {
 
     if bb.event.getName(e) == "BuildStarted":
-	"""initialize log files."""
-	logpath = bb.data.getVar('LOG_DIR', e.data, 1)
-	bb.utils.mkdirhier(logpath)
-	logfile = os.path.join(logpath, "distrodata.%s.csv" % bb.data.getVar('DATETIME', e.data, 1))
-	if not os.path.exists(logfile):
-		slogfile = os.path.join(logpath, "distrodata.csv")
-		if os.path.exists(slogfile):
-			os.remove(slogfile)
-		os.system("touch %s" % logfile)
-		os.symlink(logfile, slogfile)
-		bb.data.setVar('LOG_FILE', logfile, e.data)
-
-	lf = bb.utils.lockfile(logfile + ".lock")
+	import oe.distro_check as dc
+	logfile = dc.create_log_file(e.data, "distrodata.csv")
+	lf = bb.utils.lockfile("%s.lock" % logfile)
 	f = open(logfile, "a")
 	f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status\n")
         f.close()

@@ -33,9 +23,9 @@ python do_distrodata_np() {
         bb.note("Package Name: %s" % pn)
 
         import oe.distro_check as dist_check
-        tmpdir = bb.data.getVar('TMPDIR', d, 1)
+        tmpdir = bb.data.getVar('TMPDIR', d, True)
         distro_check_dir = os.path.join(tmpdir, "distro_check")
-        datetime = bb.data.getVar('DATETIME', localdata, 1)
+        datetime = bb.data.getVar('DATETIME', localdata, True)
         dist_check.update_distro_data(distro_check_dir, datetime)
 
 	if pn.find("-native") != -1:

@@ -111,15 +101,15 @@ python do_distrodata_np() {
 addtask distrodata
 do_distrodata[nostamp] = "1"
 python do_distrodata() {
-	logpath = bb.data.getVar('LOG_DIR', d, 1)
+	logpath = bb.data.getVar('LOG_DIR', d, True)
 	bb.utils.mkdirhier(logpath)
 	logfile = os.path.join(logpath, "distrodata.csv")
 
         import oe.distro_check as dist_check
 	localdata = bb.data.createCopy(d)
-        tmpdir = bb.data.getVar('TMPDIR', d, 1)
+        tmpdir = bb.data.getVar('TMPDIR', d, True)
         distro_check_dir = os.path.join(tmpdir, "distro_check")
-        datetime = bb.data.getVar('DATETIME', localdata, 1)
+        datetime = bb.data.getVar('DATETIME', localdata, True)
         dist_check.update_distro_data(distro_check_dir, datetime)
 
         pn = bb.data.getVar("PN", d, True)

@@ -189,7 +179,7 @@ python do_distrodata() {
         # do the comparison
         result = dist_check.compare_in_distro_packages_list(distro_check_dir, localdata)
 
-	lf = bb.utils.lockfile(logfile + ".lock")
+	lf = bb.utils.lockfile("%s.lock" % logfile)
 	f = open(logfile, "a")
 	f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s," % \
 		  (pname, pdesc, maintainer, plicense, pchksum, hasrstatus, vermatch, pcurver, pupver, noupdate, noupdate_reason, rstatus))

@@ -211,19 +201,10 @@ do_distrodataall() {
 addhandler checkpkg_eventhandler
 python checkpkg_eventhandler() {
     if bb.event.getName(e) == "BuildStarted":
-	"""initialize log files."""
-	logpath = bb.data.getVar('LOG_DIR', e.data, 1)
-	bb.utils.mkdirhier(logpath)
-	logfile = os.path.join(logpath, "checkpkg.%s.csv" % bb.data.getVar('DATETIME', e.data, 1))
-	if not os.path.exists(logfile):
-		slogfile = os.path.join(logpath, "checkpkg.csv")
-		if os.path.exists(slogfile):
-			os.remove(slogfile)
-		os.system("touch %s" % logfile)
-		os.symlink(logfile, slogfile)
-		bb.data.setVar('LOG_FILE', logfile, e.data)
-
-	lf = bb.utils.lockfile(logfile + ".lock")
+	import oe.distro_check as dc
+	logfile = dc.create_log_file(e.data, "checkpkg.csv")
+
+	lf = bb.utils.lockfile("%s.lock" % logfile)
 	f = open(logfile, "a")
 	f.write("Package\tVersion\tUpver\tLicense\tSection\tHome\tRelease\tPriority\tDepends\tBugTracker\tPE\tDescription\tStatus\tTracking\tURI\tMAINTAINER\n")
         f.close()

@@ -304,7 +285,7 @@ python do_checkpkg() {
 		Clear internal url cache as it's a temporary check. Not doing so will have 
 		bitbake check url multiple times when looping through a single url
 		"""
-		fn = bb.data.getVar('FILE', d, 1)
+		fn = bb.data.getVar('FILE', d, True)
 		bb.fetch2.urldata_cache[fn] = {}
 
 		"""

@@ -335,7 +316,7 @@ python do_checkpkg() {
 	Return new version if success, or else error in "Errxxxx" style
 	"""
 	def check_new_dir(url, curver, d):
-		pn = bb.data.getVar('PN', d, 1)
+		pn = bb.data.getVar('PN', d, True)
 		f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-1-" % pn)
 		status = internal_fetch_wget(url, d, f)
 		fhtml = f.read()

@@ -394,7 +375,7 @@ python do_checkpkg() {
 		"""possible to have no version in pkg name, such as spectrum-fw"""
 		if not re.search("\d+", curname):
 			return pcurver
-		pn = bb.data.getVar('PN', d, 1)
+		pn = bb.data.getVar('PN', d, True)
 		f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-2-" % pn)
 		status = internal_fetch_wget(url, d, f)
 		fhtml = f.read()

@@ -437,35 +418,35 @@ python do_checkpkg() {
 		f.close()
 		"""if host hasn't directory information, no need to save tmp file"""
 		if status != "ErrHostNoDir" and re.match("Err", status):
-			logpath = bb.data.getVar('LOG_DIR', d, 1)
+			logpath = bb.data.getVar('LOG_DIR', d, True)
 			os.system("cp %s %s/" % (f.name, logpath))
 		os.unlink(f.name)
 		return status
 
 	"""first check whether a uri is provided"""
-	src_uri = bb.data.getVar('SRC_URI', d, 1)
+	src_uri = bb.data.getVar('SRC_URI', d, True)
 	if not src_uri:
 		return
 
 	"""initialize log files."""
-	logpath = bb.data.getVar('LOG_DIR', d, 1)
+	logpath = bb.data.getVar('LOG_DIR', d, True)
 	bb.utils.mkdirhier(logpath)
 	logfile = os.path.join(logpath, "checkpkg.csv")
 
 	"""generate package information from .bb file"""
-	pname = bb.data.getVar('PN', d, 1)
-	pdesc = bb.data.getVar('DESCRIPTION', d, 1)
-	pgrp = bb.data.getVar('SECTION', d, 1)
-	pversion = bb.data.getVar('PV', d, 1)
-	plicense = bb.data.getVar('LICENSE',d,1)
-	psection = bb.data.getVar('SECTION',d,1)
-	phome = bb.data.getVar('HOMEPAGE', d, 1)
-	prelease = bb.data.getVar('PR',d,1)
-	ppriority = bb.data.getVar('PRIORITY',d,1)
-	pdepends = bb.data.getVar('DEPENDS',d,1)
-	pbugtracker = bb.data.getVar('BUGTRACKER',d,1)
-	ppe = bb.data.getVar('PE',d,1)
-	psrcuri = bb.data.getVar('SRC_URI',d,1)
+	pname = bb.data.getVar('PN', d, True)
+	pdesc = bb.data.getVar('DESCRIPTION', d, True)
+	pgrp = bb.data.getVar('SECTION', d, True)
+	pversion = bb.data.getVar('PV', d, True)
+	plicense = bb.data.getVar('LICENSE', d, True)
+	psection = bb.data.getVar('SECTION', d, True)
+	phome = bb.data.getVar('HOMEPAGE', d, True)
+	prelease = bb.data.getVar('PR', d, True)
+	ppriority = bb.data.getVar('PRIORITY', d, True)
+	pdepends = bb.data.getVar('DEPENDS', d, True)
+	pbugtracker = bb.data.getVar('BUGTRACKER', d, True)
+	ppe = bb.data.getVar('PE', d, True)
+	psrcuri = bb.data.getVar('SRC_URI', d, True)
 
 	found = 0
 	for uri in src_uri.split():

@@ -483,9 +464,9 @@ python do_checkpkg() {
 
 	(type, host, path, user, pswd, parm) = bb.decodeurl(uri)
 	if type in ['http', 'https', 'ftp']:
-		pcurver = bb.data.getVar('PV', d, 1)
+		pcurver = bb.data.getVar('PV', d, True)
 	else:
-		pcurver = bb.data.getVar("SRCREV", d, 1)
+		pcurver = bb.data.getVar("SRCREV", d, True)
 
 	if type in ['http', 'https', 'ftp']:
 		newver = pcurver

@@ -509,7 +490,7 @@ python do_checkpkg() {
 			newver = check_new_dir(alturi, dirver, d)
 			altpath = path
 			if not re.match("Err", newver) and dirver != newver:
-				altpath = altpath.replace(dirver, newver, 1)
+				altpath = altpath.replace(dirver, newver, True)
 				
 		"""Now try to acquire all remote files in current directory"""
 		if not re.match("Err", newver):

@@ -625,7 +606,7 @@ python do_checkpkg() {
 		pstatus += ":%s%s" % (host, path)
 
 	"""Read from manual distro tracking fields as alternative"""
-	pmver = bb.data.getVar("RECIPE_LATEST_VERSION", d, 1)
+	pmver = bb.data.getVar("RECIPE_LATEST_VERSION", d, True)
 	if not pmver:
 		pmver = "N/A"
 		pmstatus = "ErrNoRecipeData"

@@ -639,7 +620,7 @@ python do_checkpkg() {
 	psrcuri = psrcuri.split()[0]
 	pdepends = "".join(pdepends.split("\t"))
 	pdesc = "".join(pdesc.split("\t"))
-	lf = bb.utils.lockfile(logfile + ".lock")
+	lf = bb.utils.lockfile("%s.lock" % logfile)
 	f = open(logfile, "a")
 	f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \
 		  (pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver,psrcuri,maintainer))

@@ -654,25 +635,12 @@ do_checkpkgall() {
 	:
 }
 
-#addhandler check_eventhandler
-python check_eventhandler() {
+addhandler distro_check_eventhandler
+python distro_check_eventhandler() {
     if bb.event.getName(e) == "BuildStarted":
-        import oe.distro_check as dc
-        tmpdir = bb.data.getVar('TMPDIR', e.data, 1)
-        distro_check_dir = os.path.join(tmpdir, "distro_check")
-        datetime = bb.data.getVar('DATETIME', e.data, 1)
         """initialize log files."""
-        logpath = bb.data.getVar('LOG_DIR', e.data, 1)
-        bb.utils.mkdirhier(logpath)
-        logfile = os.path.join(logpath, "distrocheck.%s.csv" % bb.data.getVar('DATETIME', e.data, 1))
-        if not os.path.exists(logfile):
-                slogfile = os.path.join(logpath, "distrocheck.csv")
-                if os.path.exists(slogfile):
-                        os.remove(slogfile)
-                os.system("touch %s" % logfile)
-                os.symlink(logfile, slogfile)
-                bb.data.setVar('LOG_FILE', logfile, e.data)
-
+        import oe.distro_check as dc
+        result_file = dc.create_log_file(e.data, "distrocheck.csv")
     return
 }
 

@@ -681,18 +649,23 @@ do_distro_check[nostamp] = "1"
 python do_distro_check() {
     """checks if the package is present in other public Linux distros"""
     import oe.distro_check as dc
+    import bb
+    import shutil
     localdata = bb.data.createCopy(d)
     bb.data.update_data(localdata)
-    tmpdir = bb.data.getVar('TMPDIR', d, 1)
+    tmpdir = bb.data.getVar('TMPDIR', d, True)
     distro_check_dir = os.path.join(tmpdir, "distro_check")
-    datetime = bb.data.getVar('DATETIME', localdata, 1)
+    logpath = bb.data.getVar('LOG_DIR', d, True)
+    bb.utils.mkdirhier(logpath)
+    result_file = os.path.join(logpath, "distrocheck.csv")
+    datetime = bb.data.getVar('DATETIME', localdata, True)
     dc.update_distro_data(distro_check_dir, datetime)
 
     # do the comparison
     result = dc.compare_in_distro_packages_list(distro_check_dir, d)
 
     # save the results
-    dc.save_distro_check_result(result, datetime, d)
+    dc.save_distro_check_result(result, datetime, result_file, d)
 }
 
 addtask distro_checkall after do_distro_check

@@ -701,3 +674,55 @@ do_distro_checkall[nostamp] = "1"
 do_distro_checkall() {
 	:
 }
+#
+#Check Missing License Text.
+#Use this task to generate the missing license text data for pkg-report system,
+#then we can search those recipes which license text isn't exsit in common-licenses directory
+#
+addhandler checklicense_eventhandler
+python checklicense_eventhandler() {
+    if bb.event.getName(e) == "BuildStarted":
+        """initialize log files."""
+        import oe.distro_check as dc
+        logfile = dc.create_log_file(e.data, "missinglicense.csv")
+        lf = bb.utils.lockfile("%s.lock" % logfile)
+        f = open(logfile, "a")
+        f.write("Package\tLicense\tMissingLicense\n")
+        f.close()
+        bb.utils.unlockfile(lf)
+    return
+}
+
+addtask checklicense
+do_checklicense[nostamp] = "1"
+python do_checklicense() {
+    import os
+    import bb
+    import shutil
+    logpath = bb.data.getVar('LOG_DIR', d, True)
+    bb.utils.mkdirhier(logpath)
+    pn = bb.data.getVar('PN', d, True)
+    logfile = os.path.join(logpath, "missinglicense.csv")
+    generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True)
+    license_types = bb.data.getVar('LICENSE', d, True)
+    for license_type in ((license_types.replace('+', '').replace('|', '&')
+                          .replace('(', '').replace(')', '').replace(';', '')
+                          .replace(',', '').replace(" ", "").split("&"))):
+        if not os.path.isfile(os.path.join(generic_directory, license_type)):
+            lf = bb.utils.lockfile("%s.lock" % logfile)
+            f = open(logfile, "a")
+            f.write("%s\t%s\t%s\n" % \
+                (pn,license_types,license_type))
+            f.close()
+            bb.utils.unlockfile(lf)
+    return
+}
+
+addtask checklicenseall after do_checklicense
+do_checklicenseall[recrdeptask] = "do_checklicense"
+do_checklicenseall[nostamp] = "1"
+do_checklicenseall() {
+	:
+}
+
+

index c85d4fb..55cdcad 100644
@@ -73,7 +73,8 @@ def clean_package_list(package_list):
 def get_latest_released_meego_source_package_list():
     "Returns list of all the name os packages in the latest meego distro"
 
-    
+    if not os.path.isfile("/tmp/Meego-1.0"):
+        os.mknod("/tmp/Meego-1.0")
     f = open("/tmp/Meego-1.0", "r")
     package_names = []
     for line in f:

@@ -341,7 +342,22 @@ def compare_in_distro_packages_list(distro_check_dir, d):
     bb.note("Matching: %s" % matching_distros)
     return matching_distros
 
-def save_distro_check_result(result, datetime, d):
+def create_log_file(d, logname):
+    logpath = bb.data.getVar('LOG_DIR', d, True)
+    bb.utils.mkdirhier(logpath)
+    logfn, logsuffix = os.path.splitext(logname)
+    logfile = os.path.join(logpath, "%s.%s%s" % (logfn, bb.data.getVar('DATETIME', d, True), logsuffix))
+    if not os.path.exists(logfile):
+            slogfile = os.path.join(logpath, logname)
+            if os.path.exists(slogfile):
+                    os.remove(slogfile)
+            os.system("touch %s" % logfile)
+            os.symlink(logfile, slogfile)
+            bb.data.setVar('LOG_FILE', logfile, d)
+    return logfile
+
+
+def save_distro_check_result(result, datetime, result_file, d):
     pn = bb.data.getVar('PN', d, True)
     logdir = bb.data.getVar('LOG_DIR', d, True)
     if not logdir:

@@ -349,16 +365,9 @@ def save_distro_check_result(result, datetime, d):
         return
     if not os.path.isdir(logdir):
         os.makedirs(logdir)
-    result_file = os.path.join(logdir, "distrocheck.%s.csv" % datetime)
     line = pn
     for i in result:
         line = line + "," + i
-    if not os.path.exists(result_file):
-        sresult_file = os.path.join(logdir, "distrocheck.csv")
-	if os.path.exists(sresult_file):
-	    os.remove(sresult_file)
-	os.system("touch %s" % result_file)
-	os.symlink(result_file, sresult_file)
     f = open(result_file, "a")
     import fcntl
     fcntl.lockf(f, fcntl.LOCK_EX)

index d9ed15f..23095ec 100644
@@ -233,25 +233,18 @@ do_build () {
 }
 
 python () {
-    import exceptions, string
+    import exceptions, string, re
 
     # If PRINC is set, try and increase the PR value by the amount specified
     princ = bb.data.getVar('PRINC', d, True)
     if princ:
         pr = bb.data.getVar('PR', d, True)
-        start = -1
-        end = -1
-        for i in range(len(pr)):
-            if pr[i] in string.digits:
-                if start == -1:
-                    start = i
-                else:
-                    end = i
-        if start == -1 or end == -1:
+        pr_prefix = re.search("\D+",pr)
+        prval = re.search("\d+",pr)
+        if pr_prefix is None or prval is None:
             bb.error("Unable to analyse format of PR variable: %s" % pr)
-        prval = pr[start:end+1]
-        prval = int(prval) + int(princ)
-        pr = pr[0:start] + str(prval) + pr[end:len(pr)-1]
+        nval = int(prval.group(0)) + int(princ)
+        pr = pr_prefix.group(0) + str(nval) + pr[prval.end():]
         bb.data.setVar('PR', pr, d)
 
     pn = bb.data.getVar('PN', d, 1)

index d93a773..df7fcad 100644
@@ -75,8 +75,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
 FILES_${PN}-sftp = "${bindir}/sftp"
-FILES_${PN}-sftp-server = "${libdir}exec/sftp-server"
-FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
+FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
+FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
 FILES_${PN}-keygen = "${bindir}/ssh-keygen"
 
 RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"

index f477679..cbb4e78 100644
@@ -97,4 +97,5 @@ do_install () {
 	done
 
 	create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
+	create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
 }

index f54033d..3e828c2 100644
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "7eb6c68d977d9039a2b5a734172b064a9d19cdc1"
 SRCREV_machine_qemux86 = "ad62d1aab734513cd96c8f4517f816420a218e77"
 SRCREV_machine_qemux86-64 = "b906f358fd404a1e74a961f25079274e0d933ee1"
 SRCREV_machine = "b906f358fd404a1e74a961f25079274e0d933ee1"
-SRCREV_meta = "ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5"
+SRCREV_meta = "79669230fd82a3e7e254cf8b596a2388a4333e62"
 
 PR = "r18"
 PV = "${LINUX_VERSION}+git${SRCPV}"