Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
authorkos <kos@dev3>
Thu, 20 Jun 2013 04:10:09 +0000 (13:10 +0900)
committerkos <kos@dev3>
Thu, 20 Jun 2013 04:10:09 +0000 (13:10 +0900)
31 files changed:
meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb
meta-openvuplus/recipes-connectivity/zd1211/zd1211b_2.22.0.0.bb
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch [new file with mode: 0644]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/change-passwd-default-algorithm.patch
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig
meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch [new file with mode: 0644]
meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-core/initscripts/initscripts-1.0/umountfs
meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
meta-openvuplus/recipes-devtools/opkg/opkg/0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg_svn.bbappend
meta-openvuplus/recipes-devtools/python/python-coherence_git.bb
meta-openvuplus/recipes-devtools/python/python-gdata_2.0.14.bb
meta-openvuplus/recipes-devtools/python/python-mutagen_1.18.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gstreamer-0.10.36.1+git/multiqueue-sparsestreams.patch
meta-openvuplus/recipes-multimedia/gstreamer/gstreamer_0.10.36.1.bb
meta-openvuplus/recipes-multimedia/libcec/libcec_2.1.1.bb [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/duo2lcd4linux/duo2lcd4linux_0.1.bb
meta-openvuplus/recipes-vuplus/duo2lcd4linux/lcd4linuxsupport_0.1.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/lcd4linux/lcd4linux_0.11.0-SVN.bb

index a6e10da..a9be4bf 100755 (executable)
@@ -1,12 +1,12 @@
 DESCRIPTION = "Utilities for transponder & dvb-s blindscan"
 SECTION = "base"
 PRIORITY = "optional"
-RDEPENDS = "ncurses"
+RDEPENDS_${PN} = "ncurses"
 
 LICENSE = "CLOSED"
 
 PV = "3.2"
-PR = "r0"
+PR = "r1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "http://archive.vuplus.com/download/utils/vuplus-blindscan-utils-${MACHINE}-${PV}.tar.bz2"
index d42acb2..c0fb4d8 100755 (executable)
@@ -4,14 +4,14 @@ LICENSE = "CLOSED"
 
 KV = "${VUPLUS_KERNEL_VERSION}"
 PV = "${KV}"
-PR = "r21-${SRCDATE}"
+PR = "r22-${SRCDATE}"
 
 PREFERRED_GCC_VERSION = "4.4.3"
 
 SRC_URI = "http://archive.vuplus.com/download/drivers/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
 
 DEPENDS += "virtual/kernel module-init-tools"
-RDEPENDS += "module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod"
 
 S = "${WORKDIR}"
 
index 9e23e2a..7b20c5d 100644 (file)
@@ -1,7 +1,7 @@
 HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial"
 DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet."
 
-PR = "r3"
+PR = "r4"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
@@ -12,7 +12,7 @@ SRC_URI = "\
        "
 
 DEPENDS = "wvstreams ppp"
-RDEPENDS = "ppp wvstreams"
+RDEPENDS_${PN} = "ppp wvstreams"
 
 inherit autotools pkgconfig
 
index ad7effa..cc98c94 100644 (file)
@@ -3,11 +3,11 @@ HOMEPAGE = "http://zd1211.ath.cx/"
 SECTION = "kernel/modules"
 LICENSE = "MPL-1.1 | GPLv2"
 LIC_FILES_CHKSUM = "file://src/zd1211.c;endline=31;md5=76cb7cb1283c3b6e20de40280a74f87f"
-RDEPENDS = "wireless-tools"
+RDEPENDS_${PN} = "wireless-tools"
 
 inherit module
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = " \
         http://www.reactivated.net/software/zd1211-vendor/releases/ZD1211LnxDrv_2_22_0_0.tar.gz \
diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch
new file mode 100644 (file)
index 0000000..b25d587
--- /dev/null
@@ -0,0 +1,38 @@
+From 7c462943dd3c283314e68e945d544dfbaaa4cb25 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@opendreambox.org>
+Date: Mon, 22 Apr 2013 10:40:36 +0200
+Subject: [PATCH 11/11] mount: don't pass option "auto" to kernel
+
+Fixes the following error if "auto" is set in fs options:
+| EXT3-fs (sda1): error: unrecognized mount option "auto" or missing value
+| EXT4-fs (sda1): Unrecognized mount option "auto" or missing value
+| XFS (sda1): unknown mount option [auto].
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+---
+ util-linux/mount.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util-linux/mount.c b/util-linux/mount.c
+index 05e532c..670935d 100644
+--- a/util-linux/mount.c
++++ b/util-linux/mount.c
+@@ -212,6 +212,7 @@ static const int32_t mount_options[] = {
+       IF_FEATURE_MOUNT_FSTAB(
+               /* "defaults" */ 0,
+               /* "quiet" 0 - do not filter out, vfat wants to see it */
++              /* "auto" */ 0,
+               /* "noauto" */ MOUNT_NOAUTO,
+               /* "sw"     */ MOUNT_SWAP,
+               /* "swap"   */ MOUNT_SWAP,
+@@ -269,6 +270,7 @@ static const char mount_option_str[] =
+       IF_FEATURE_MOUNT_FSTAB(
+               "defaults\0"
+               // "quiet\0" - do not filter out, vfat wants to see it
++              "auto\0"
+               "noauto\0"
+               "sw\0"
+               "swap\0"
+-- 
+1.7.10.4
+
index 6ab35eb..43bbb8c 100644 (file)
@@ -7,7 +7,7 @@ index 1cfafae..3231b23 100644
        unsigned opt;
        int rc;
 -      const char *opt_a = "d"; /* des */
-+      const char *opt_a = "m"; /* des */
++      const char *opt_a = "sha512"; /* sha512 */
        const char *filename;
        char *myname;
        char *name;
index b5f4a89..25e9b3b 100644 (file)
@@ -447,7 +447,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y
 # CONFIG_USE_BB_PWD_GRP is not set
 # CONFIG_USE_BB_SHADOW is not set
 CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
+CONFIG_USE_BB_CRYPT_SHA=y
 # CONFIG_ADDUSER is not set
 # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
 # CONFIG_FEATURE_CHECK_NAMES is not set
index c061202..cf4cd40 100644 (file)
@@ -1,4 +1,4 @@
-PR .= "-vuplus9"
+PR .= "-vuplus11"
 
 SRC_URI += " \
             file://0001-ifupdown-support-post-up-pre-down-hooks.patch \
@@ -10,6 +10,7 @@ SRC_URI += " \
             file://0007-ifplugd-move-read_pid-to-libbb-pidfile.c-and-rename-.patch \
             file://0009-udhcpc-calculate-broadcast-address-if-not-given-by-s.patch \
             file://0010-udhcpc-obtain-hostname-from-OS-by-default.patch \
+            file://0011-mount-don-t-pass-option-auto-to-kernel.patch \
             file://0001-work-around-linux-ext2_fs.h-breakage.patch \
             file://0002-Create-and-use-our-own-copy-of-linux-ext2_fs.h.patch \
             file://0003-Drop-include-bb_linux_ext2_fs.h-use-existing-e2fspro.patch \
diff --git a/meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch b/meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch
new file mode 100644 (file)
index 0000000..38ab7e2
--- /dev/null
@@ -0,0 +1,34 @@
+From a942d1543f4d87db821c5836986129dea79a173d Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@kdab.com>
+Date: Thu, 16 Feb 2012 08:43:40 +0100
+Subject: [PATCH] dbus-protocol.h: compile under C++11
+
+C++11 compilers have a feature called 'user-defined string literals' which
+allow arbitrary string suffixes to have user-defined meaning.
+
+This makes code that concatenates macros with string literals without
+intervening whitespace illegal under C++11. Fortunately, string literal
+concatenation has allowed intervening whitespace since the dawn of time,
+so the solution is to simply pad with spaces.
+
+Tested (header) with GCC 4.7 (trunk).
+---
+ dbus/dbus-protocol.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
+index 8aa15e5..60605ab 100644
+--- a/dbus/dbus-protocol.h
++++ b/dbus/dbus-protocol.h
+@@ -456,7 +456,7 @@ extern "C" {
+ /** XML system identifier of the introspection format version 1.0 */
+ #define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
+ /** XML document type declaration of the introspection format version 1.0 */
+-#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n"
++#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n"
+ /** @} */
+-- 
+1.7.2.3
+
diff --git a/meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend b/meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend
new file mode 100644 (file)
index 0000000..ff7200c
--- /dev/null
@@ -0,0 +1,5 @@
+PR .= "-dream1"
+
+SRC_URI += "file://compile-under-c++11.patch"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
index a05d406..8a2e4be 100755 (executable)
@@ -36,3 +36,7 @@ echo "Unmounting local filesystems..."
 unmount </proc/mounts
 
 mount -o remount,ro /
+
+# sync to flush pending writes for loop-mounted file system.
+sync
+
diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch
deleted file mode 100644 (file)
index bf61aef..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-From 70d10c10288da23755055c881bea01b61a2d4df7 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 22:57:35 +0200
-Subject: [PATCH 09/10] Revert "Add Recommended packages to the
- depended_upon_by field."
-
-This reverts commit ac2222f7d6514fb403ce0848f6812a22a48f75c7.
----
- libopkg/pkg_depends.c |   70 ++++++++++++++++++++++---------------------------
- 1 file changed, 32 insertions(+), 38 deletions(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index f237733..ec60b99 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -787,49 +787,43 @@ pkg_depend_str(pkg_t *pkg, int idx)
-       return str;
- }
-+/*
-+ * WARNING: This function assumes pre_depends and depends are at the
-+ * start of the pkg->depends array.
-+ */
- void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg)
- {
--      compound_depend_t * depends;
--      int count, othercount;
--      int i, j;
--      abstract_pkg_t * ab_depend;
--      abstract_pkg_t ** temp;
--
--      count = pkg->pre_depends_count +
--                      pkg->depends_count +
--                      pkg->recommends_count +
--                      pkg->suggests_count;
--
--      for (i = 0; i < count; i++) {
--              depends = &pkg->depends[i];
--              if (depends->type != PREDEPEND
--                  && depends->type != DEPEND
--                  && depends->type != RECOMMEND)
--                      continue;
--              for (j = 0; j < depends->possibility_count; j++) {
--                      ab_depend = depends->possibilities[j]->pkg;
--                      if (!ab_depend->depended_upon_by) {
--                              ab_depend->depended_upon_by =
--                                      xcalloc(1, sizeof(abstract_pkg_t *));
--                      }
-+     compound_depend_t * depends;
-+     int count, othercount;
-+     int i, j;
-+     abstract_pkg_t * ab_depend;
-+     abstract_pkg_t ** temp;
--                      temp = ab_depend->depended_upon_by;
--                      othercount = 1;
--                      while (*temp) {
--                          temp++;
--                          othercount++;
--                      }
--                      *temp = ab_pkg;
-+     count = pkg->pre_depends_count + pkg->depends_count;
-+     depends = pkg->depends;
--                      ab_depend->depended_upon_by =
--                              xrealloc(ab_depend->depended_upon_by,
--                              (othercount + 1) * sizeof(abstract_pkg_t *));
-+     for (i = 0; i < count; i++) {
-+        for (j = 0; j < depends->possibility_count; j++){
-+             ab_depend = depends->possibilities[j]->pkg;
-+             if(!ab_depend->depended_upon_by)
-+                  ab_depend->depended_upon_by = xcalloc(1, sizeof(abstract_pkg_t *));
-+
-+             temp = ab_depend->depended_upon_by;
-+             othercount = 1;
-+             while(*temp){
-+                  temp++;
-+                  othercount++;
-+             }
-+             *temp = ab_pkg;
--                      /* the array may have been moved by realloc */
--                      temp = ab_depend->depended_upon_by + othercount;
--                      *temp = NULL;
--              }
--      }
-+             ab_depend->depended_upon_by = xrealloc(ab_depend->depended_upon_by,
-+                                                                      (othercount + 1) * sizeof(abstract_pkg_t *));
-+             /* the array may have moved */
-+             temp = ab_depend->depended_upon_by + othercount;
-+             *temp = NULL;
-+        }
-+        depends++;
-+     }
- }
- static depend_t * depend_init(void)
--- 
-1.7.9.5
-
diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch
new file mode 100644 (file)
index 0000000..e581dc0
--- /dev/null
@@ -0,0 +1,26 @@
+While removing a package with opkg, the process shouldn't be blocked if
+another package RECOMMENDS the package wanted to be removed. This is
+because, while generating the dependencies, opkg adds dependencies to
+depended_upon_by even if dependency's type is RECOMMEND. The fix is to
+skip dependencies of type RECOMMEND while constructing depended_upon_by.
+
+Bug info:
+https://bugzilla.yoctoproject.org/show_bug.cgi?id=2431
+
+Upstream-Status: Pending
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+
+Index: trunk/libopkg/pkg_depends.c
+===================================================================
+--- trunk.orig/libopkg/pkg_depends.c   2011-09-03 05:54:56.000000000 +0300
++++ trunk/libopkg/pkg_depends.c        2012-10-20 22:23:03.783573202 +0300
+@@ -785,8 +785,7 @@
+       for (i = 0; i < count; i++) {
+               depends = &pkg->depends[i];
+               if (depends->type != PREDEPEND
+-                  && depends->type != DEPEND
+-                  && depends->type != RECOMMEND)
++                  && depends->type != DEPEND)
+                       continue;
+               for (j = 0; j < depends->possibility_count; j++) {
+                       ab_depend = depends->possibilities[j]->pkg;
diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch
new file mode 100644 (file)
index 0000000..5b5bc56
--- /dev/null
@@ -0,0 +1,19 @@
+diff -Naur trunk.org/libopkg/opkg_install.c trunk/libopkg/opkg_install.c
+--- trunk.org/libopkg/opkg_install.c   2013-02-17 12:40:51.000000000 +0100
++++ trunk/libopkg/opkg_install.c       2013-02-17 01:17:37.000000000 +0100
+@@ -366,11 +366,12 @@
+                       for (k=0; k<count1; k++) {
+                               cd1 = &pkg->depends[k];
+-                              if (cd1->type != DEPEND)
++                              if (cd1->type != DEPEND && cd1->type != RECOMMEND)
+                                       continue;
+                               for (l=0; l<cd1->possibility_count; l++) {
+-                                      if (cd0->possibilities[j]
+-                                       == cd1->possibilities[l]) {
++                                      if ( (cd0->type == cd1->type && cd0->possibilities[j] == cd1->possibilities[l]) ||
++                                           (cd0->type != cd1->type && !strcmp(cd0->possibilities[j]->pkg->name, cd1->possibilities[l]->pkg->name) )
++                                         ) {
+                                               found = 1;
+                                               break;
+                                       }
diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch
new file mode 100644 (file)
index 0000000..9d7ddc3
--- /dev/null
@@ -0,0 +1,15 @@
+diff -Naur trunk.orig/libopkg/pkg_depends.c trunk/libopkg/pkg_depends.c
+--- trunk.orig/libopkg/pkg_depends.c   2013-02-17 16:47:33.000000000 +0100
++++ trunk/libopkg/pkg_depends.c        2013-02-17 16:07:11.000000000 +0100
+@@ -236,6 +236,11 @@
+                        /* just mention it politely */
+                        opkg_msg(NOTICE, "package %s suggests installing %s\n",
+                               pkg->name, satisfier_entry_pkg->name);
++                  }
++                  else if (compound_depend->type == RECOMMEND) {
++                       /* just mention it politely */
++                       opkg_msg(NOTICE, "package %s recommend installing %s\n",
++                              pkg->name, satisfier_entry_pkg->name);
+                   } else {
+                        char ** newstuff = NULL;
index 76d0408..3eadd64 100644 (file)
@@ -1,4 +1,10 @@
-PR .= "-vuplus1"
+PR .= "-vuplus2"
+
+PATCHES = "file://0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch \
+           file://0011-opkg-allow-package-move-from-depends-to-recommends.patch \
+           file://0012-opkg-dont-handle-recommends-as-depends.patch"
+
+PATCHES_virtclass-native = ""
 
 SRC_URI += "file://0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch \
             file://0002-Don-t-mark-Conflicts-as-Depends.patch \
@@ -8,8 +14,8 @@ SRC_URI += "file://0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch
             file://0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch \
             file://0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch \
             file://0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch \
-            file://0009-Revert-Add-Recommended-packages-to-the-depended_upon.patch \
             file://0010-opkg_remove-auto-delete-.pyo-files.patch \
+            ${PATCHES} \
             file://unarchive-fixed-uname-gname-cache.patch"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
index 202e827..f93c395 100644 (file)
@@ -4,9 +4,9 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=3f7c147addd67ce1d53239c68a6b7022"
 DEPENDS = "libxml2"
-SRCREV = "f4864b1f63866d738c18c02dcb16d824a049880c"
+SRCREV = "d4d3be1305bb9cb24845ac7dd9e8135a7b7f6d67"
 PV = "0.6.7"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "git://github.com/sreichholf/coherence.git;protocol=git"
 
index 8c0ab29..84511ad 100644 (file)
@@ -3,9 +3,9 @@ HOMEPAGE = "http://code.google.com/p/gdata-python-client/"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://README.txt;beginline=1;endline=13;md5=7a713fc5eed20ac1904c2efe0b816a33"
-RDEPENDS = "python-elementtree"
+RDEPENDS_${PN} = "python-elementtree"
 RDEPENDS_${PN}-tests = "${PN}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://gdata-python-client.googlecode.com/files/gdata-${PV}.tar.gz;name=archive"
 SRC_URI[archive.md5sum] = "29cf394b4f75aa4fae8c1b59079f2a02"
index b785e2a..86e7ad2 100644 (file)
@@ -3,10 +3,10 @@ SECTION = "devel/python"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRCNAME = "mutagen"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "python"
-RDEPENDS = "python-shell"
+RDEPENDS_${PN} = "python-shell"
 
 SRC_URI = "http://mutagen.googlecode.com/files/mutagen-${PV}.tar.gz \
        file://patch.diff \
index bc99eae..68ef05f 100644 (file)
@@ -10,10 +10,10 @@ DEPENDS += "libmusicbrainz tremor curl libmms librtmp"
 DEPENDS += "gst-plugins-base"
 CONFLICTS = "librsvg"
 
-PR = "r1"
+PR = "r2"
 GIT_PV = ""
 
-SRCREV = "852d247947a21d472d7766f51148b5ea7b12ef12"
+SRCREV = "fb0d8700e71c4a6569ba023d16201087aec119fd"
 
 EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \
                  --disable-vdpau --disable-apexsink --enable-orc --disable-mpeg2enc --disable-mplex --disable-rsvg --disable-uvch264"
index c4c11eb..533d8e0 100644 (file)
@@ -10,9 +10,9 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '
 DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor orc orc-native"
 DEPENDS += "gstreamer"
 
-SRCREV = "95c384136a1dfc22ad656c13b547c4077566d80b"
+SRCREV = "bdb33163478fdf95938fbdca7eabad3ea920a277"
 
-PR = "r1"
+PR = "r2"
 GIT_PV = ""
 
 inherit autotools pkgconfig gettext git-project
index 796e5ab..00421e4 100644 (file)
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
                     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
 
-DEPENDS += "cdparanoia cairo jpeg libpng gtk+ zlib libid3tag flac speex libsoup-2.4"
+DEPENDS += "cdparanoia cairo jpeg libpng zlib libid3tag flac speex libsoup-2.4"
 DEPENDS += "gst-plugins-base"
 
-PR = "r0"
+PR = "r2"
 GIT_PV = ""
 
-SRCREV = "967fc61715fa854dacaa200069437fe57d4d8390"
+SRCREV = "7768342230450559509e3e593b2ea33e81ea0ca4"
 
 EXTRA_OECONF = "--enable-orc --disable-esd --disable-aalib --disable-shout2 --disable-libcaca --disable-hal"
 
index 155b4b7..a9a9f5f 100644 (file)
@@ -8,10 +8,10 @@ DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame libcdio openc
 
 EXTRA_OECONF += "--enable-orc"
 
-PR = "r0"
+PR = "r1"
 GIT_PV = ""
 
-SRCREV = "981912f29e54f6cacefe62ee2a24c38a227d0565"
+SRCREV = "9afc696e5fa9fb980e02df5637f022796763216f"
 
 inherit autotools pkgconfig gettext git-project
 
index 64968ff..0fa7ab2 100644 (file)
@@ -1,5 +1,6 @@
---- ./plugins/elements/gstmultiqueue.c-original        2013-01-08 14:40:09.002563354 +0100
-+++ ./plugins/elements/gstmultiqueue.c 2013-01-08 14:39:45.578850244 +0100
+diff -Naur git.org/plugins/elements/gstmultiqueue.c git/plugins/elements/gstmultiqueue.c
+--- git.org/plugins/elements/gstmultiqueue.c   2013-04-22 23:33:43.840120880 +0200
++++ git/plugins/elements/gstmultiqueue.c       2013-04-22 23:37:47.728118492 +0200
 @@ -161,6 +161,7 @@
    GstDataQueueSize max_size, extra_size;
    GstClockTime cur_time;
    } else {
      percent = 0;
      if (sq->max_size.time > 0) {
-@@ -1606,15 +1615,26 @@
-   GstSingleQueue *sq = gst_pad_get_element_private (pad);
-   GstPad *otherpad;
-   GstCaps *result;
--
-+  GstStructure* str;
-+  const gchar *g_type;
-+
+@@ -1609,11 +1618,24 @@
    otherpad = (pad == sq->srcpad) ? sq->sinkpad : sq->srcpad;
  
 -  GST_LOG_OBJECT (otherpad, "Getting caps from the peer of this pad");
    result = gst_pad_peer_get_caps (otherpad);
    if (result == NULL)
      result = gst_caps_new_any ();
-+  str = gst_caps_get_structure(result, 0);
-+  g_type = str ? gst_structure_get_name(str) : (const gchar*)"unknown";
++  else
++  {
++    GstStructure* str;
++    const gchar *g_type;
++    str = gst_caps_get_structure(result, 0);
++    g_type = str ? gst_structure_get_name(str) : (const gchar*)"unknown";
 +
-+  GST_LOG_OBJECT (otherpad, "Got caps from the peer of this pad: %s", g_type);
++    GST_LOG_OBJECT (otherpad, "Got caps from the peer of this pad: %s", g_type);
 +
-+  if ( !g_strcmp0(g_type, "video/x-dvd-subpicture") || !g_strcmp0(g_type, "text/x-pango-markup") || !g_strcmp0(g_type, "text/plain") || !g_strcmp0(g_type, "subpicture/x-pgs") )
-+  {
-+    GST_INFO_OBJECT (otherpad, "subtitle stream discovered --> set is_sparse to true");
-+    sq->is_sparse = TRUE;
++    if ( !g_strcmp0(g_type, "video/x-dvd-subpicture") || !g_strcmp0(g_type, "text/x-pango-markup") || !g_strcmp0(g_type, "text/plain") || !g_strcmp0(g_type, "subpicture/x-pgs") || !g_strcmp0(g_type, "subpicture/x-ass") )
++    {
++      GST_INFO_OBJECT (otherpad, "subtitle stream discovered --> set is_sparse to true");
++      sq->is_sparse = TRUE;
++    }
 +  }
-+
    return result;
  }
-@@ -1841,7 +1861,7 @@
+@@ -1841,7 +1863,7 @@
  
      GST_LOG_OBJECT (mq, "Checking Queue %d", oq->id);
  
@@ -69,7 +67,7 @@
        GST_LOG_OBJECT (mq, "Queue %d is empty", oq->id);
        if (IS_FILLED (sq, visible, size.visible)) {
          sq->max_size.visible = size.visible + 1;
-@@ -1868,7 +1888,7 @@
+@@ -1868,7 +1890,7 @@
       *    we are checking here.
       */
      if (sq->is_eos || IS_FILLED (sq, bytes, ssize.bytes) ||
@@ -78,7 +76,7 @@
        GST_LOG_OBJECT (mq, "Queue %d is filled", oq->id);
        filled = TRUE;
      }
-@@ -1911,7 +1931,7 @@
+@@ -1911,7 +1933,7 @@
          gst_data_queue_limits_changed (oq->queue);
        }
      }
@@ -87,7 +85,7 @@
        empty = FALSE;
    }
    GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
-@@ -2011,6 +2031,7 @@
+@@ -2011,6 +2033,7 @@
        (GstDataQueueFullCallback) single_queue_overrun_cb,
        (GstDataQueueEmptyCallback) single_queue_underrun_cb, sq);
    sq->is_eos = FALSE;
index b25ee9a..f4501a7 100644 (file)
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
 DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
 
-PR = "r1"
+PR = "r3"
 GIT_PV = ""
 
-SRCREV = "935db833e236959c973e6c8ef59586d30f81a26c"
+SRCREV = "1bcabb9a23afb25dcd059bd827aa35b8ee7e5043"
 
 RRECOMMENDS_${PN}_qemux86    += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
diff --git a/meta-openvuplus/recipes-multimedia/libcec/libcec_2.1.1.bb b/meta-openvuplus/recipes-multimedia/libcec/libcec_2.1.1.bb
new file mode 100644 (file)
index 0000000..4dfdeb1
--- /dev/null
@@ -0,0 +1,19 @@
+SUMMARY = "USB CEC Adaptor communication Library"
+HOMEPAGE = "http://libcec.pulse-eight.com/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5e8e16396992369f73f3d28875f846da"
+DEPENDS = "udev"
+SRCREV = "605d913ae656ef9707a7f9cbca41f78d180d79dc"
+PR = "r2"
+
+SRC_URI = "git://github.com/Pulse-Eight/libcec.git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools lib_package pkgconfig
+
+RDEPENDS_${PN}-bin = "${PN} (= ${EXTENDPKGV})"
+
+RRECOMMENDS_${PN} = "kernel-module-cdc-acm"
+
+PKG_${PN}-bin = "cec-utils"
index 378e730..1a9bbf6 100644 (file)
@@ -8,11 +8,11 @@ SRC_URI = " \
        file://duo2lcd4linux.patch;patch=1;pnum=1 \
 "
 
-RDEPENDS = "enigma2 python-codecs python-datetime python-imaging python-textutils python-shell python-ctypes python-pyusb lcd4linux"
+RDEPENDS_${PN} = "enigma2 python-codecs python-datetime python-imaging python-textutils python-shell python-ctypes python-pyusb lcd4linux"
 
 S = "${WORKDIR}/LCD4linux"
 
-PR = "r4"
+PR = "r5"
 
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/LCD4linux"
 
index 6d191ff..cd80033 100644 (file)
@@ -2,7 +2,7 @@ DESCRIPTION = "lcd4linux support for duo2"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-RDEPENDS = "enigma2 png-util"
+RDEPENDS_${PN} = "enigma2 png-util"
 
 SRC_URI = " \
         file://plugin.py \
@@ -10,7 +10,7 @@ SRC_URI = " \
 
 S = "${WORKDIR}"
 
-PR = "r0"
+PR = "r1"
 
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/LCD4linuxSupport"
 
index fddbb67..640b9e6 100644 (file)
@@ -18,7 +18,7 @@ RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugin
                gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \
 "
 
-RDEPENDS = "python-codecs python-core python-lang python-re python-threading \
+RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \
                python-xml python-fcntl python-stringold python-pickle python-netclient \
                glibc-gconv-iso8859-15 ethtool \
                ${RDEPENDS_GST} \
@@ -85,7 +85,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
-PR = "r18"
+PR = "r19"
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
index 214562f..5b95fa8 100644 (file)
@@ -3,10 +3,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 DEPENDS = "virtual/libusb0 ncurses readline jpeg"
-RDEPENDS = "jpeg"
+RDEPENDS_${PN} = "jpeg"
 
 PV = "0.11.0-SVN"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = " --with-glib-prefix=${STAGING_LIBDIR}/.. \
                --with-glib-exec-prefix=${STAGING_LIBDIR}/.. \