added my Recipes
This commit is contained in:
@@ -0,0 +1,92 @@
|
||||
From 4a89ddffbb14d747adbe3365ace4db87de52ba39 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 16 Sep 2013 16:08:28 +0200
|
||||
Subject: [PATCH] build gtk- and gtk3-version for canberra_gtk_play
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/Makefile.am | 25 +++++++++++++++----------
|
||||
1 files changed, 15 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 56ed96d..fc72e1f 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -319,9 +319,6 @@ endif
|
||||
|
||||
if HAVE_GTK_ANY
|
||||
|
||||
-bin_PROGRAMS += \
|
||||
- canberra-gtk-play
|
||||
-
|
||||
include_HEADERS += \
|
||||
canberra-gtk.h
|
||||
|
||||
@@ -329,6 +326,9 @@ endif
|
||||
|
||||
if HAVE_GTK3
|
||||
|
||||
+bin_PROGRAMS += \
|
||||
+ canberra-gtk3-play
|
||||
+
|
||||
lib_LTLIBRARIES += \
|
||||
libcanberra-gtk3.la
|
||||
|
||||
@@ -367,6 +367,9 @@ endif
|
||||
|
||||
if HAVE_GTK
|
||||
|
||||
+bin_PROGRAMS += \
|
||||
+ canberra-gtk-play
|
||||
+
|
||||
lib_LTLIBRARIES += \
|
||||
libcanberra-gtk.la
|
||||
|
||||
@@ -399,14 +402,17 @@ endif
|
||||
|
||||
if HAVE_GTK3
|
||||
|
||||
-canberra_gtk_play_LDADD = \
|
||||
+canberra_gtk3_play_LDADD = \
|
||||
$(GTK3_LIBS) \
|
||||
libcanberra.la \
|
||||
libcanberra-gtk3.la
|
||||
-canberra_gtk_play_CFLAGS = \
|
||||
+canberra_gtk3_play_CFLAGS = \
|
||||
$(GTK3_CFLAGS)
|
||||
|
||||
-else
|
||||
+canberra_gtk3_play_SOURCES = \
|
||||
+ canberra-gtk-play.c
|
||||
+
|
||||
+endif
|
||||
if HAVE_GTK
|
||||
|
||||
canberra_gtk_play_LDADD = \
|
||||
@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \
|
||||
canberra_gtk_play_CFLAGS = \
|
||||
$(GTK_CFLAGS)
|
||||
|
||||
-endif
|
||||
+canberra_gtk_play_SOURCES = \
|
||||
+ canberra-gtk-play.c
|
||||
+
|
||||
endif
|
||||
|
||||
if HAVE_GTK_ANY
|
||||
@@ -424,9 +432,6 @@ if HAVE_GTK_ANY
|
||||
dist_gsdgtkmodules_DATA = \
|
||||
canberra-gtk-module.desktop
|
||||
|
||||
-canberra_gtk_play_SOURCES = \
|
||||
- canberra-gtk-play.c
|
||||
-
|
||||
EXTRA_DIST += \
|
||||
libcanberra-login-sound.desktop.in \
|
||||
libcanberra-ready-sound.desktop.in \
|
||||
--
|
||||
1.7.6.5
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Meeks <michael.meeks@suse.com>
|
||||
Date: Fri, 9 Nov 2012 16:16:40 +0000
|
||||
Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
|
||||
broadway/wayland
|
||||
|
||||
---
|
||||
src/canberra-gtk-module.c | 15 +++++++++++++++
|
||||
src/canberra-gtk.c | 5 +++++
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
--- a/src/canberra-gtk-module.c
|
||||
+++ b/src/canberra-gtk-module.c
|
||||
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDispla
|
||||
guchar *data = NULL;
|
||||
gint ret = -1;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
|
||||
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
|
||||
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
|
||||
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDispl
|
||||
guchar *data = NULL;
|
||||
gint ret = -1;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
|
||||
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
|
||||
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
|
||||
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisp
|
||||
gboolean ret = FALSE;
|
||||
Atom xembed;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return FALSE;
|
||||
+#endif
|
||||
+
|
||||
/* Gnome Panel applets are XEMBED windows. We need to make sure we
|
||||
* ignore them */
|
||||
|
||||
--- a/src/canberra-gtk.c
|
||||
+++ b/src/canberra-gtk.c
|
||||
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDispla
|
||||
guchar *data = NULL;
|
||||
gint ret = -1;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
|
||||
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
|
||||
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
|
||||
@@ -0,0 +1,63 @@
|
||||
SUMMARY = "Implementation of XDG Sound Theme and Name Specifications"
|
||||
DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
|
||||
LICENSE = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03"
|
||||
|
||||
DEPENDS = "libtool libvorbis"
|
||||
|
||||
inherit autotools gtk-doc
|
||||
|
||||
SRC_URI = " \
|
||||
http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \
|
||||
file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
|
||||
file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072"
|
||||
SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72"
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--enable-null \
|
||||
--disable-oss \
|
||||
--disable-tdb \
|
||||
--disable-lynx \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk gtk3', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib"
|
||||
PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio"
|
||||
PACKAGECONFIG[gstreamer] = "--enable-gstreamer, --disable-gstreamer, gstreamer1.0"
|
||||
PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+"
|
||||
PACKAGECONFIG[gtk3] = "--enable-gtk3, --disable-gtk3, gtk+3"
|
||||
|
||||
python populate_packages:prepend() {
|
||||
plugindir = d.expand('${libdir}/${BPN}-${PV}/')
|
||||
do_split_packages(d, plugindir, r'^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' )
|
||||
do_split_packages(d, plugindir, r'^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' )
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd"
|
||||
PACKAGES_DYNAMIC += "^libcanberra-.*"
|
||||
|
||||
FILES:${PN} = "${bindir}/ ${libdir}/${BPN}.so.*"
|
||||
|
||||
FILES:${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la"
|
||||
|
||||
FILES:${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug"
|
||||
|
||||
FILES:${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \
|
||||
${libdir}/gtk-2.0/modules/*.so \
|
||||
${bindir}/canberra-gtk-play"
|
||||
|
||||
# -gtk3 ships a symlink to a .so
|
||||
INSANE_SKIP:${PN}-gtk3 = "dev-so"
|
||||
FILES:${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \
|
||||
${libdir}/gtk-3.0/modules/*.so \
|
||||
${bindir}/canberra-gtk3-play"
|
||||
|
||||
FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \
|
||||
${datadir}/gdm/ ${datadir}/gnome/"
|
||||
|
||||
FILES:${PN}-systemd = "${systemd_unitdir}/system/*.service"
|
||||
Reference in New Issue
Block a user