summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-09-21 10:41:36 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-05 12:36:10 +0200
commit38c85c00b18d0c4e9859a25347688bb18b0445b5 (patch)
treec2b91e8c511f52a2ece97b170dcf6b9024c42cb7 /meta-oe
parent66766c8b1651be55d92761fceb7273c7528e4ce1 (diff)
downloadmeta-openembedded-38c85c00b18d0c4e9859a25347688bb18b0445b5.tar.gz
libcanberra avoid gtk3 dragged in at gtk2 environments
* build two versions of canberra-gtk-play for gtk2 and gtk3. * move canberra-gtk-play to libcanberra-gtk2 and canberra-gtk3-play to libcanberra-gtk2. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch92
-rw-r--r--meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb13
2 files changed, 101 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
new file mode 100644
index 000000000..4e0984f36
--- /dev/null
+++ b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
@@ -0,0 +1,92 @@
1From 4a89ddffbb14d747adbe3365ace4db87de52ba39 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 16 Sep 2013 16:08:28 +0200
4Subject: [PATCH] build gtk- and gtk3-version for canberra_gtk_play
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
10---
11 src/Makefile.am | 25 +++++++++++++++----------
12 1 files changed, 15 insertions(+), 10 deletions(-)
13
14diff --git a/src/Makefile.am b/src/Makefile.am
15index 56ed96d..fc72e1f 100644
16--- a/src/Makefile.am
17+++ b/src/Makefile.am
18@@ -319,9 +319,6 @@ endif
19
20 if HAVE_GTK_ANY
21
22-bin_PROGRAMS += \
23- canberra-gtk-play
24-
25 include_HEADERS += \
26 canberra-gtk.h
27
28@@ -329,6 +326,9 @@ endif
29
30 if HAVE_GTK3
31
32+bin_PROGRAMS += \
33+ canberra-gtk3-play
34+
35 lib_LTLIBRARIES += \
36 libcanberra-gtk3.la
37
38@@ -367,6 +367,9 @@ endif
39
40 if HAVE_GTK
41
42+bin_PROGRAMS += \
43+ canberra-gtk-play
44+
45 lib_LTLIBRARIES += \
46 libcanberra-gtk.la
47
48@@ -399,14 +402,17 @@ endif
49
50 if HAVE_GTK3
51
52-canberra_gtk_play_LDADD = \
53+canberra_gtk3_play_LDADD = \
54 $(GTK3_LIBS) \
55 libcanberra.la \
56 libcanberra-gtk3.la
57-canberra_gtk_play_CFLAGS = \
58+canberra_gtk3_play_CFLAGS = \
59 $(GTK3_CFLAGS)
60
61-else
62+canberra_gtk3_play_SOURCES = \
63+ canberra-gtk-play.c
64+
65+endif
66 if HAVE_GTK
67
68 canberra_gtk_play_LDADD = \
69@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \
70 canberra_gtk_play_CFLAGS = \
71 $(GTK_CFLAGS)
72
73-endif
74+canberra_gtk_play_SOURCES = \
75+ canberra-gtk-play.c
76+
77 endif
78
79 if HAVE_GTK_ANY
80@@ -424,9 +432,6 @@ if HAVE_GTK_ANY
81 dist_gsdgtkmodules_DATA = \
82 canberra-gtk-module.desktop
83
84-canberra_gtk_play_SOURCES = \
85- canberra-gtk-play.c
86-
87 EXTRA_DIST += \
88 libcanberra-login-sound.desktop.in \
89 libcanberra-ready-sound.desktop.in \
90--
911.7.6.5
92
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index da94c2056..8b771bf58 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -8,7 +8,10 @@ DEPENDS = "gstreamer gtk+ gtk+3 libtool libvorbis"
8 8
9inherit autotools 9inherit autotools
10 10
11SRC_URI = "http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz" 11SRC_URI = " \
12 http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \
13 file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
14"
12SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8" 15SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8"
13SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72" 16SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
14 17
@@ -39,19 +42,21 @@ PACKAGES_DYNAMIC += "^libcanberra-.*"
39 42
40FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" 43FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*"
41 44
42FILES_${PN}-dev += "${datadir}/vala/vapi" 45FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la"
43 46
44FILES_${PN}-dbg += "${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug" 47FILES_${PN}-dbg += "${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug"
45 48
46FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ 49FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \
47 ${libdir}/gtk-2.0/modules/*.la \ 50 ${libdir}/gtk-2.0/modules/*.la \
48 ${libdir}/gtk-2.0/modules/*.so" 51 ${libdir}/gtk-2.0/modules/*.so \
52 ${bindir}/canberra-gtk-play"
49 53
50# -gtk3 ships a symlink to a .so 54# -gtk3 ships a symlink to a .so
51INSANE_SKIP_${PN}-gtk3 = "dev-so" 55INSANE_SKIP_${PN}-gtk3 = "dev-so"
52FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ 56FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \
53 ${libdir}/gtk-3.0/modules/*.la \ 57 ${libdir}/gtk-3.0/modules/*.la \
54 ${libdir}/gtk-3.0/modules/*.so" 58 ${libdir}/gtk-3.0/modules/*.so \
59 ${bindir}/canberra-gtk3-play"
55 60
56FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ 61FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \
57 ${datadir}/gdm/ ${datadir}/gnome/" 62 ${datadir}/gdm/ ${datadir}/gnome/"