summaryrefslogtreecommitdiff
path: root/media-libs/libcanberra
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libcanberra')
-rw-r--r--media-libs/libcanberra/Manifest7
-rw-r--r--media-libs/libcanberra/files/libcanberra-0.30-wayland.patch64
-rw-r--r--media-libs/libcanberra/files/libcanberra-gtk-module.sh16
-rw-r--r--media-libs/libcanberra/libcanberra-0.30-r7.ebuild88
-rw-r--r--media-libs/libcanberra/libcanberra-0.30-r8.ebuild4
-rw-r--r--media-libs/libcanberra/metadata.xml11
6 files changed, 4 insertions, 186 deletions
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 90d539b1f45b..ab98d812148e 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,6 +1,3 @@
-AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
-AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r7.ebuild 2498 BLAKE2B 725ac6409ec1079218ea2f15c6d18eb7e024bdd53bc58514247cfd72eb959d7a6c46df6125ddebe2b4770966ca7a5e2ddfa8483ccf17941e54ad3dc9db5ce338 SHA512 857715b1aa992baa2313188419f19f09457d8c36cf25fadf22b4918a0269856b06fcc800680b07e28602705c7816e373aacb089c57c3e34165c4387dd2538140
-EBUILD libcanberra-0.30-r8.ebuild 1807 BLAKE2B 0c3d075cc2146d9d8b04056c6f3a105b7015e50527b3007ec8ad20bc37fd57bbee48096ababad8ed6fefb3cd19c7e6d0c3b19d3cdd39bbfea2f4aaf1fa37336c SHA512 9547ef10f23ec55605d70038689916e083c7befe1263d6ca0ff5c5a6f0838393ced785335fd2dfd577c831af934f0cd64dedf2593870c1f472af5e5d38dbc88a
-MISC metadata.xml 1744 BLAKE2B 26312a41cefdc053215cb2a6ff704a3934f806df80d340a7766f9994ffb07118ed2647ead627197ffc8810627c00e220eec683e987bcb374b626c5508c70d7f2 SHA512 423e9ad57ce8d636c2d05b802c9cb6391d2794eeb9924009ae265c7de68165af664964c3a4f6b435bb88ffe5f37cd5d4f55addc62e1ff1b9e073c75817f0ea13
+EBUILD libcanberra-0.30-r8.ebuild 1804 BLAKE2B ed2b67a18234371db649f181724ad91d22fdefbe7c9cadacce659a9f3c1702a1388654673be2e0756aeeab042c82a2df9bdf69197f72486dcf8f229de8ef51b9 SHA512 788180de755b18809b7c9416edf1ba1692aa90a82b0fdf1ef9253f8f51c76905046706b5277847b73c22e49bc4a454571cee028702fa6d646014a786fd289c57
+MISC metadata.xml 1068 BLAKE2B 2c3d5b176ac688e33cc39344097a2135cdc5687e8718a2f856df1c6248fa4d5d902693297c493a32e048169b56685bb128794e16fa23158606f761a06d802b8f SHA512 a3b7e8a994a656f860a2482478fc3ff53b2c0d39c328cb001b235324170b994b253c1b0aa4659cec1491784e466adb8177de22defc35965724e3f5651fbd3cf3
diff --git a/media-libs/libcanberra/files/libcanberra-0.30-wayland.patch b/media-libs/libcanberra/files/libcanberra-0.30-wayland.patch
deleted file mode 100644
index e51cfe00c0df..000000000000
--- a/media-libs/libcanberra/files/libcanberra-0.30-wayland.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
-From: Michael Meeks <michael.meeks@suse.com>
-Date: Fri, 09 Nov 2012 16:16:40 +0000
-Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland
-
----
-diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
-index 67791f0..c1532ab 100644
---- a/src/canberra-gtk-module.c
-+++ b/src/canberra-gtk-module.c
-@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
- 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(GdkDisplay *d) {
- 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(GdkDisplay *d, GdkWindow *w) {
- 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 */
-
-diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
-index 34446f5..08cb668 100644
---- a/src/canberra-gtk.c
-+++ b/src/canberra-gtk.c
-@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
- 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,
---
-cgit v0.9.2
diff --git a/media-libs/libcanberra/files/libcanberra-gtk-module.sh b/media-libs/libcanberra/files/libcanberra-gtk-module.sh
deleted file mode 100644
index 63c16af71861..000000000000
--- a/media-libs/libcanberra/files/libcanberra-gtk-module.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# to be sourced
-
-case "$SESSION" in
- GNOME)
- # Done by gnome-settings-daemon
- ;;
- *)
- if [ -z "$GTK_MODULES" ] ; then
- GTK_MODULES="canberra-gtk-module"
- else
- GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
- fi
- export GTK_MODULES
- ;;
-esac
diff --git a/media-libs/libcanberra/libcanberra-0.30-r7.ebuild b/media-libs/libcanberra/libcanberra-0.30-r7.ebuild
deleted file mode 100644
index 9500c2604b9d..000000000000
--- a/media-libs/libcanberra/libcanberra-0.30-r7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal systemd
-
-DESCRIPTION="Portable sound event library"
-HOMEPAGE="https://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev"
-
-DEPEND="
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- media-libs/libvorbis[${MULTILIB_USEDEP}]
- alsa? (
- media-libs/alsa-lib:=[${MULTILIB_USEDEP}]
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) )
- gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] )
- gtk2? (
- >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-2.20.0:2[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}] )
- gtk3? (
- >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[X,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
- tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
- gnome? (
- gnome-base/dconf
- gnome-base/gsettings-desktop-schemas )
- sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
-"
-
-REQUIRED_USE="udev? ( alsa )"
-
-PATCHES=(
- # gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
- "${FILESDIR}/${PN}-0.30-wayland.patch"
-)
-
-src_prepare() {
- default
- elibtoolize
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable alsa) \
- $(use_enable oss) \
- $(use_enable pulseaudio pulse) \
- $(use_enable gstreamer) \
- $(use_enable gtk2 gtk) \
- $(use_enable gtk3) \
- $(use_enable tdb) \
- $(use_enable udev) \
- --disable-lynx \
- --disable-gtk-doc \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/gtkdoc/html gtkdoc/html || die
- fi
-}
-
-multilib_src_install() {
- # Disable parallel installation until bug #253862 is solved
- emake DESTDIR="${D}" -j1 install
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
-
- # This is needed for desktops different than GNOME, bug #520550
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/libcanberra-gtk-module.sh 40-libcanberra-gtk-module
-}
diff --git a/media-libs/libcanberra/libcanberra-0.30-r8.ebuild b/media-libs/libcanberra/libcanberra-0.30-r8.ebuild
index 24cb1672ffab..392d9e55c24d 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r8.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="alsa gstreamer oss pulseaudio tdb udev"
DEPEND="
diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index 854ff75b3c80..f3ff514df4e0 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -17,21 +17,10 @@
<flag name="alsa">Enables ALSA sound driver.</flag>
<flag name="gstreamer">Enables gstreamer sound driver. Not useful when
alsa or pulseaudio is available.</flag>
- <flag name="gtk2">Enables building of gtk+ helper library, gtk+ runtime
- sound effects and the canberra-gtk-play utility. To enable the gtk+
- sound effects add canberra-gtk-module to the colon separated list of
- modules in the GTK_MODULES environment variable.</flag>
- <flag name="gtk3">Enables building of gtk+3 helper library, gtk+3
- runtime sound effects and the canberra-gtk-play utility. To enable
- the gtk+3 sound effects add canberra-gtk-module to the colon
- separated list of modules in the GTK_MODULES environment
- variable.</flag>
<flag name="pulseaudio">Enables PulseAudio sound driver that should be
able to support positional event sounds. This is the preferred
choice for best sound events experience and picked by default if
compiled in and possible to use at runtime.</flag>
- <flag name="sound">Install <pkg>x11-themes/sound-theme-freedesktop</pkg> to get
- sounds on Gnome and Xfce.</flag>
<flag name="tdb">Enables Trivial Database support for caching
purposes.</flag>
</use>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 08:53:30 +0000