summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2009-05-22 16:28:58 +0200
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2009-05-30 07:38:56 +0900
commit9ab5e002541d9c3dabbe8ba584305681cabf61b4 (patch)
treed74205b1507c8ca0b8b5d57140e5b0613f03f2fe
parent4e9b399fb27c7bbe8a4ed54cf6259ddc494c3df0 (diff)
bluez: 3.36 does not need the hciattach-ti-bts.patch. Fixes do_patch.
-rw-r--r--recipes/bluez/bluez-cups-backend_3.33.bb4
-rw-r--r--recipes/bluez/bluez-gstreamer-plugin_3.33.bb4
-rw-r--r--recipes/bluez/bluez-utils-alsa_3.33.bb4
-rw-r--r--recipes/bluez/bluez-utils3.inc2
-rw-r--r--recipes/bluez/bluez-utils_3.33.bb4
-rw-r--r--recipes/bluez/bluez-utils_3.36.bb5
6 files changed, 16 insertions, 7 deletions
diff --git a/recipes/bluez/bluez-cups-backend_3.33.bb b/recipes/bluez/bluez-cups-backend_3.33.bb
index 40e099642a..f3601b424b 100644
--- a/recipes/bluez/bluez-cups-backend_3.33.bb
+++ b/recipes/bluez/bluez-cups-backend_3.33.bb
@@ -4,6 +4,10 @@ PR = "r1"
DEPENDS += "cups"
+# TI patch landed upstream sometime between 3.35 and 3.36,
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
index 53b7eb86f2..f4e3ca4d83 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -4,6 +4,10 @@ PR = "r1"
DEPENDS += "gstreamer gst-plugins-base "
+# TI patch landed upstream sometime between 3.35 and 3.36,
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
diff --git a/recipes/bluez/bluez-utils-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb
index a1e3e85818..2558b8728a 100644
--- a/recipes/bluez/bluez-utils-alsa_3.33.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.33.bb
@@ -4,6 +4,10 @@ PR = "r1"
DEPENDS += "alsa-lib"
+# TI patch landed upstream sometime between 3.35 and 3.36,
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc
index 703788f0f8..5fab6e72c6 100644
--- a/recipes/bluez/bluez-utils3.inc
+++ b/recipes/bluez/bluez-utils3.inc
@@ -10,10 +10,8 @@ LICENSE = "GPL"
FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
-# ti patch should be sent it upstream!
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://hciattach-ti-bts.patch;patch=1 \
file://sbc-thumb.patch;patch=1"
diff --git a/recipes/bluez/bluez-utils_3.33.bb b/recipes/bluez/bluez-utils_3.33.bb
index dc098e3137..322f84114f 100644
--- a/recipes/bluez/bluez-utils_3.33.bb
+++ b/recipes/bluez/bluez-utils_3.33.bb
@@ -2,6 +2,10 @@ require bluez-utils3.inc
PR = "r3"
+# TI patch landed upstream sometime between 3.35 and 3.36,
+# albeit in a somewhat different form
+SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
diff --git a/recipes/bluez/bluez-utils_3.36.bb b/recipes/bluez/bluez-utils_3.36.bb
index bd319e85f2..20a9bad46c 100644
--- a/recipes/bluez/bluez-utils_3.36.bb
+++ b/recipes/bluez/bluez-utils_3.36.bb
@@ -2,11 +2,6 @@ require bluez-utils3.inc
PR = "r4"
-# removed hciattach-ti-bts.patch (landed upstream)
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://sbc-thumb.patch;patch=1"
-
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \