Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

6 files changed, 54 insertions, 169 deletions

diff --git a/recipes/gnome/gconf_2.26.2.bb b/recipes/gnome/gconf_2.26.2.bb
index 005ab47cfc..dcd0e621ef 100644
--- a/recipes/gnome/gconf_2.26.2.bb
+++ b/recipes/gnome/gconf_2.26.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.26/GConf-${PV}.tar.bz2
            file://org.gnome.GConf.Defaults.service \
           "
 
-EXTRA_OECONF = "--disable-gtk-doc"
+EXTRA_OECONF = "--disable-gtk-doc POLKIT_POLICY_FILE_VALIDATE=true"
 HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
 
 inherit autotools pkgconfig gettext
diff --git a/recipes/gnome/gnome-screensaver_2.28.0.bb b/recipes/gnome/gnome-screensaver_2.28.0.bb
new file mode 100644
index 0000000000..c5b6635179
--- /dev/null
+++ b/recipes/gnome/gnome-screensaver_2.28.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "GNOME utilities"
+SECTION = "x11/gnome"
+LICENSE = "GPL"
+DEPENDS = "gnome-common glib-2.0 gtk+ gconf"
+inherit gnome pkgconfig
+
+EXTRA_OECONF = " \
+                --with-shadow=${STAGING_INCDIR}/.. \
+               "
+
+do_configure_prepend () {
+	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+	sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure.ac
+}
+
+do_stage () {
+	autotools_stage_all
+}
+
+FILES_${PN}-dbg += "${libexecdir}/gnome-screensaver/.debug "
+
+
diff --git a/recipes/shadow/shadow_4.1.4.bb b/recipes/shadow/shadow_4.1.4.bb
new file mode 100644
index 0000000000..393edce09e
--- /dev/null
+++ b/recipes/shadow/shadow_4.1.4.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "login/password utilities"
+LICENSE = "GPL"
+
+inherit autotools
+
+SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.gz"
+
+S = "${WORKDIR}/shadow-${PV}"
+
+CFLAGS_append = " -I../include"
+
diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch
index e7b1dab300..27e1c731f5 100644
--- a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch
+++ b/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch
@@ -1,6 +1,6 @@
 diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac
 --- ticodecplugin/configure.ac	2009-09-05 00:04:51.000000000 -0500
-+++ ticodecplugin.new/configure.ac	2009-09-15 13:14:44.000000000 -0500
++++ ticodecplugin.new/configure.ac	2009-10-10 15:50:24.000000000 -0500
 @@ -25,6 +25,7 @@
  AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
  
@@ -10,14 +10,14 @@ diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac
  dnl check for tools
  AC_PROG_CC
 diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am
---- ticodecplugin/src/Makefile.am	2009-09-05 00:04:51.000000000 -0500
-+++ ticodecplugin.new/src/Makefile.am	2009-09-15 13:14:44.000000000 -0500
+--- ticodecplugin/src/Makefile.am	2009-10-10 14:27:46.000000000 -0500
++++ ticodecplugin.new/src/Makefile.am	2009-10-10 15:50:24.000000000 -0500
 @@ -4,16 +4,16 @@
  plugin_LTLIBRARIES  = libgstticodecplugin.la
  
  # sources used to compile this plug-in
--libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c  gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gstticommonutils.c
-+libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c  gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gstticommonutils.c omapfb.c yuv.S
+-libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c  gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c
++libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c  gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c omapfb.c yuv.S
  
  # flags used to compile this plugin
  # add other _CFLAGS and _LIBS as needed
@@ -28,27 +28,27 @@ diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am
  libgstticodecplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,$(XDC_CONFIG_BASENAME)/linker.cmd
  
  # headers we need but don't want installed
--noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gstticommonutils.h
-+noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gstticommonutils.h omapfb.h
+-noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h
++noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h omapfb.h
  
  # XDC Configuration
  CONFIGURO     = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro
 diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecplugin.c
---- ticodecplugin/src/gstticodecplugin.c	2009-09-05 00:04:51.000000000 -0500
-+++ ticodecplugin.new/src/gstticodecplugin.c	2009-09-15 13:14:44.000000000 -0500
-@@ -44,6 +44,7 @@
- #include "gsttidmaivideosink.h"
- #include "gsttividenc.h"
+--- ticodecplugin/src/gstticodecplugin.c	2009-10-10 14:27:46.000000000 -0500
++++ ticodecplugin.new/src/gstticodecplugin.c	2009-10-10 15:52:51.000000000 -0500
+@@ -46,6 +46,7 @@
  #include "gsttividenc1.h"
+ #include "gsttiaudenc1.h"
+ #include "gsttividresize.h"
 +#include "omapfb.h"
  
  /* entry point to initialize the plug-in
   * initialize the plug-in itself
-@@ -137,6 +138,13 @@
-         GST_TYPE_TIDMAIVIDEOSINK))
+@@ -153,6 +154,13 @@
+         GST_TYPE_TIVIDRESIZE))
          return FALSE;
  
-+    env_value = getenv("GST_Omapfbdmaisink_DISABLE");
++    env_value = getenv("GST_omapdmaifbsink_DISABLE");
 +
 +    if ((!env_value || strcmp(env_value,"1")) && !gst_element_register(
 +        TICodecPlugin, "omapdmaifbsink", GST_RANK_PRIMARY,
@@ -60,7 +60,7 @@ diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecp
  
 diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c
 --- ticodecplugin/src/omapfb.c	1969-12-31 18:00:00.000000000 -0600
-+++ ticodecplugin.new/src/omapfb.c	2009-09-15 13:16:03.000000000 -0500
++++ ticodecplugin.new/src/omapfb.c	2009-10-10 15:50:24.000000000 -0500
 @@ -0,0 +1,1005 @@
 +/*
 + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com>
@@ -1069,7 +1069,7 @@ diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c
 +}
 diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h
 --- ticodecplugin/src/omapfb.h	1969-12-31 18:00:00.000000000 -0600
-+++ ticodecplugin.new/src/omapfb.h	2009-09-15 13:14:44.000000000 -0500
++++ ticodecplugin.new/src/omapfb.h	2009-10-10 15:50:24.000000000 -0500
 @@ -0,0 +1,142 @@
 +/*
 + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com>
@@ -1215,7 +1215,7 @@ diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h
 +#endif /* GST_OMAPFB_H */
 diff -uNr ticodecplugin/src/yuv.S ticodecplugin.new/src/yuv.S
 --- ticodecplugin/src/yuv.S	1969-12-31 18:00:00.000000000 -0600
-+++ ticodecplugin.new/src/yuv.S	2009-09-15 13:14:44.000000000 -0500
++++ ticodecplugin.new/src/yuv.S	2009-10-10 15:50:24.000000000 -0500
 @@ -0,0 +1,117 @@
 +/*
 +    Copyright (C) 2008 Mans Rullgard
diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch
deleted file mode 100644
index 634fa4aaf6..0000000000
--- a/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- ticodecplugin/ChangeLog
-+++ ticodecplugin.new/ChangeLog
-@@ -1,3 +1,7 @@
-+2009-08-14  Don Darling, Texas Instruments, Inc.
-+	* src/{gstticodecplugin_omap3530.cfg,gstticodecs_omap3530.c}:
-+	Update OMAP3530 Support to use DVSDK 3.00.00.40.
-+
- 2009-07-28 Brijesh Singh, Texas Instruments, Inc.
- 	* src/{gstticircbuffer.c}:
- 	Fix potential memory leak in circular buffer when accel framecopy flag is 
---- ticodecplugin/src/gstticodecplugin_omap3530.cfg
-+++ ticodecplugin.new/src/gstticodecplugin_omap3530.cfg
-@@ -12,8 +12,6 @@
-  *
-  */
- 
--prog.build.platform = "ti.platforms.evm3530";
--
- /* Load the Codec Engine 'Operating System Abstraction Layer' */
- var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
- 
-@@ -27,31 +25,20 @@ ipc.commType = ipc.COMM_DSPLINK;
- /*
-  *  ======== Engine Configuration ========
-  */
--var Engine    = xdc.useModule('ti.sdo.ce.Engine');
--var encEngine = Engine.createFromServer(
--    "encode",
--    "./encodeCombo.x64P",
--    "ti.sdo.servers.encode"
--    );
--var decEngine = Engine.createFromServer(
--    "decode",
--    "./decodeCombo.x64P",
--    "ti.sdo.servers.decode"
-+var Engine = xdc.useModule('ti.sdo.ce.Engine');
-+var demoEngine = Engine.createFromServer(
-+    "codecServer",
-+    "./bin/cs.x64P",
-+    "ti.sdo.server.cs"
-     );
- 
--var encpath = "" + java.lang.System.getenv("ENCODE_COMBO");
--if (encpath != "" && encpath != "null") {
--	encEngine.server = java.lang.System.getenv("ENCODE_COMBO");
--}
--
--var decpath = "" + java.lang.System.getenv("DECODE_COMBO");
--if (decpath != "" && decpath != "null") {
--	decEngine.server = java.lang.System.getenv("DECODE_COMBO"); 
-+var combopath = "" + java.lang.System.getenv("CODEC_SERVER");
-+if (combopath != "" && combopath != "null") {
-+	demoEngine.server = java.lang.System.getenv("CODEC_SERVER");
- }
- 
- /* Load support for the DMAI module */
- var DMAI = xdc.loadPackage('ti.sdo.dmai');
- 
--/* Load support for user space DMA */
--var SCPY = xdc.useModule("ti.sdo.fc.scpy.SCPY");
--var SDMA = xdc.useModule("ti.sdo.linuxutils.sdma.SDMA");
-+var SCPY = xdc.useModule('ti.sdo.fc.scpy.SCPY');
-+var SDMA = xdc.useModule('ti.sdo.linuxutils.sdma.SDMA');
---- ticodecplugin/src/gstticodecs_omap3530.c
-+++ ticodecplugin.new/src/gstticodecs_omap3530.c
-@@ -22,8 +22,7 @@
- #include "gstticodecs.h"
- 
- /* Declaration of the production engine and decoders shipped with the DVSDK */
--static Char decodeEngine[] = "decode";
--static Char encodeEngine[] = "encode";
-+static Char codecServer[] = "codecServer";
- 
- /* NULL terminated list of speech decoders in the engine to use in the demo */
- GstTICodec gst_ticodec_codecs[] = {
-@@ -32,59 +31,55 @@ GstTICodec gst_ticodec_codecs[] = {
-     {
-         "AAC Audio Decoder",     /* String name of codec used by plugin      */
-         "aachedec",              /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     }, {
-         "MPEG1L2 Audio Decoder", /* String name of codec used by plugin      */
-         "mp3dec",                /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     }, {
-         "MPEG1L3 Audio Decoder", /* String name of codec used by plugin      */
-         "mp3dec",                /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
--    }, {
--        "WMA Audio Decoder",     /* String name of codec used by plugin      */
--        "wmadec",                /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     },
--    
-+
-     /* Video Decoders */
-     {
-         "H.264 Video Decoder",   /* String name of codec used by plugin      */
-         "h264dec",               /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     }, {
-         "MPEG4 Video Decoder",   /* String name of codec used by plugin      */
-         "mpeg4dec",              /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     }, {
-         "MPEG2 Video Decoder",   /* String name of codec used by plugin      */
-         "mpeg2dec",              /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     },
- 
-     /* Image Decoders */
-     {
-         "JPEG Image Decoder",    /* String name of codec used by plugin      */
-         "jpegdec",               /* String name of codec used by CE          */
--        decodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     },
- 
-     /* Video Encoders */
-     {
-         "H.264 Video Encoder",   /* String name of codec used by plugin      */
-         "h264enc",               /* String name of codec used by CE          */
--        encodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     }, {
-         "MPEG4 Video Encoder",   /* String name of codec used by plugin      */
-         "mpeg4enc",              /* String name of codec used by CE          */
--        encodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     },
- 
-     /* Image Encoders */
-     {
-         "JPEG Image Encoder",    /* String name of codec used by plugin      */
-         "jpegenc",               /* String name of codec used by CE          */
--        encodeEngine             /* Engine that contains this codec          */
-+        codecServer              /* Engine that contains this codec          */
-     },
- 
-     { NULL }
-
diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb
index f8ae1e1b7e..6463a45bf9 100644
--- a/recipes/ti/gstreamer-ti_svn.bb
+++ b/recipes/ti/gstreamer-ti_svn.bb
@@ -7,9 +7,8 @@ inherit autotools
 DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly"
 
 # Fetch source from svn repo
-SRCREV = "335"
+SRCREV = "407"
 SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \
-           file://gstreamer-ti-tracker-824.patch;patch=1 \
            file://gstreamer-ti-tracker-462.patch;patch=1 \
            file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch;patch=1 \
 "
@@ -19,7 +18,7 @@ SRC_URI_append_armv7a = " \
 "
 
 # Again, no '.' in PWD allowed :(
-PR = "r36"
+PR = "r37"
 PV = "svnr${SRCREV}"
 
 S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin"