summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-26 15:10:39 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-26 15:10:39 +0200
commitfa8b49b614644b3b02cf2e962fed95cf41f6e6f3 (patch)
tree8a632d463112f5a09165aa9b4d70253780f9a458
parent7448905b379d0d740b9ad8145d4dd161e32fe240 (diff)
parent0c340037644f87054462f62b50cd397c162615b7 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
-rw-r--r--recipes/gnome/gnome-dvb-daemon_0.1.18.bb4
-rw-r--r--recipes/tcltk/tcl_8.5.8.bb2
-rw-r--r--site/arm-linux4
3 files changed, 8 insertions, 2 deletions
diff --git a/recipes/gnome/gnome-dvb-daemon_0.1.18.bb b/recipes/gnome/gnome-dvb-daemon_0.1.18.bb
index ea13d5d30e..b472cc8de8 100644
--- a/recipes/gnome/gnome-dvb-daemon_0.1.18.bb
+++ b/recipes/gnome/gnome-dvb-daemon_0.1.18.bb
@@ -1,9 +1,11 @@
DESCRIPTION = "GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your DVB devices, record and watch TV shows and browse EPG. It can be controlled by any application via its D-Bus interface."
LICENSE = "GPLv3"
-DEPENDS = "libxml2 python-dbus python-gst python-pygtk libgee vala-native gstreamer gst-plugins-good gst-plugins-bad glib-2.0 dbus-glib sqlite3 gst-rtsp"
+DEPENDS = "totem libxml2 python-dbus python-gst python-pygtk libgee vala-native gstreamer gst-plugins-good gst-plugins-bad glib-2.0 dbus-glib sqlite3 gst-rtsp"
RDEPENDS_${PN} = "python-netserver python-dbus python-gst python-pygtk gst-plugin-dvb gst-fluendo-mpegdemux dvb-apps dvb-scan dvb-tzap dvb-czap dvbstream"
+PR = "r1"
+
inherit gnome
SRC_URI = "http://launchpad.net/gnome-dvb-daemon/trunk/${PV}/+download/gnome-dvb-daemon-${PV}.tar.bz2;name=archive"
diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb
index f5ad8790d3..2209ca4948 100644
--- a/recipes/tcltk/tcl_8.5.8.bb
+++ b/recipes/tcltk/tcl_8.5.8.bb
@@ -3,7 +3,7 @@ LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
-PR = "r5"
+PR = "r6"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
diff --git a/site/arm-linux b/site/arm-linux
index 18dfb38d14..65d8e014d0 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -178,3 +178,7 @@ rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
# squeak (forbid unaliged access)
ac_cv_double_align=${ac_cv_double_align=no}
ac_cv_double_order=${ac_cv_double_order=no}
+
+# TCL
+tcl_cv_api_getaddrinfo=${tcl_cv_api_getaddrinfo=yes}
+tcl_cv_api_serial=${tcl_cv_api_serial=termios}