diff options
author | prlw1 <prlw1@pkgsrc.org> | 2018-11-29 11:20:18 +0000 |
---|---|---|
committer | prlw1 <prlw1@pkgsrc.org> | 2018-11-29 11:20:18 +0000 |
commit | 6b9cc97eca9b9addab10e03a6aa63b1faacf548c (patch) | |
tree | a07d2934a36e196e915c9d79bd04fc4549f37f1d /audio | |
parent | d0ccbd4bda8e9d5ba281082bdf87b1fba8344b5f (diff) | |
download | pkgsrc-6b9cc97eca9b9addab10e03a6aa63b1faacf548c.tar.gz |
Update libcanberra to 0.30
Motivation: Version 0.30 released; Port to GStreamer 1.0.
I believe the warning in doc/TODO:
o libcanberra-0.28 [drops support for GNOME2; don't update for now -- wiz]
comes from:
Version 0.28 released; Hook properly into GNOME 3.0 sessions; this
drops support for GNOME 2.0 sessions, but not applications.
which essentially comes from:
index aa0a3a3..210d2c1 100644
--- a/src/libcanberra-login-sound.desktop.in
+++ b/src/libcanberra-login-sound.desktop.in
@@ -4,6 +4,6 @@ Name=GNOME Login Sound
Comment=Plays a sound whenever you log in
Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
OnlyShowIn=GNOME;
-AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
+AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
X-GNOME-Autostart-Phase=Application
X-GNOME-Provides=login-sound
AFAICT, given that I have not found a desktop-login audio file anywhere
in pkgsrc (there is a login file), --id="desktop-login" will never match,
so we can't break something which doesn't work. If this analysis is wrong,
changing one line in 2 .desktop files is trivial. Relying on
gstreamer 0.10 working is worse.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/libcanberra/Makefile | 9 | ||||
-rw-r--r-- | audio/libcanberra/PLIST | 5 | ||||
-rw-r--r-- | audio/libcanberra/buildlink3.mk | 4 | ||||
-rw-r--r-- | audio/libcanberra/distinfo | 10 | ||||
-rw-r--r-- | audio/libcanberra/options.mk | 3 |
5 files changed, 14 insertions, 17 deletions
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 168e1928dfb..0fd2b0938b2 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2018/11/14 22:21:03 kleink Exp $ +# $NetBSD: Makefile,v 1.47 2018/11/29 11:20:18 prlw1 Exp $ -DISTNAME= libcanberra-0.27 -PKGREVISION= 13 +DISTNAME= libcanberra-0.30 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ @@ -26,8 +26,7 @@ PLIST_VARS+= oss .include "options.mk" .include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" -.include "../../multimedia/gstreamer0.10/buildlink3.mk" +.include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .if ${OSS_TYPE} != "none" diff --git a/audio/libcanberra/PLIST b/audio/libcanberra/PLIST index f95e2395b71..2b0e269d714 100644 --- a/audio/libcanberra/PLIST +++ b/audio/libcanberra/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.9 2014/04/08 06:40:50 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2018/11/29 11:20:18 prlw1 Exp $ ${PLIST.gtk-any}bin/canberra-gtk-play ${PLIST.gtk-any}include/canberra-gtk.h include/canberra.h +${PLIST.gtk-any}lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop ${PLIST.gtk}lib/gtk-2.0/modules/libcanberra-gtk-module.la ${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk-module.so ${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk3-module.la @@ -16,7 +17,6 @@ ${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc ${PLIST.gtk3}lib/pkgconfig/libcanberra-gtk3.pc lib/pkgconfig/libcanberra.pc share/doc/libcanberra/README -${PLIST.gtk-any}share/gconf/schemas/libcanberra.schemas ${PLIST.gtk-any}share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop ${PLIST.gtk-any}share/gnome/autostart/libcanberra-login-sound.desktop ${PLIST.gtk-any}share/gnome/shutdown/libcanberra-logout-sound.sh @@ -27,7 +27,6 @@ share/gtk-doc/html/libcanberra/index.sgml share/gtk-doc/html/libcanberra/left.png share/gtk-doc/html/libcanberra/libcanberra-canberra-gtk.html share/gtk-doc/html/libcanberra/libcanberra-canberra.html -share/gtk-doc/html/libcanberra/libcanberra.devhelp share/gtk-doc/html/libcanberra/libcanberra.devhelp2 share/gtk-doc/html/libcanberra/right.png share/gtk-doc/html/libcanberra/style.css diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk index 3cdc6ebaff3..0c3bef77888 100644 --- a/audio/libcanberra/buildlink3.mk +++ b/audio/libcanberra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.34 2018/11/14 22:21:03 kleink Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2018/11/29 11:20:18 prlw1 Exp $ BUILDLINK_TREE+= libcanberra @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libcanberra LIBCANBERRA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10 -BUILDLINK_ABI_DEPENDS.libcanberra+= libcanberra>=0.27nb13 +BUILDLINK_ABI_DEPENDS.libcanberra+= libcanberra>=0.30 BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra pkgbase := libcanberra diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo index 258a39bcc00..453b5c7979d 100644 --- a/audio/libcanberra/distinfo +++ b/audio/libcanberra/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2017/12/10 17:57:42 adam Exp $ +$NetBSD: distinfo,v 1.9 2018/11/29 11:20:18 prlw1 Exp $ -SHA1 (libcanberra-0.27.tar.gz) = b2dc2b23109f32a11217b71f87c044f1ef9b7977 -RMD160 (libcanberra-0.27.tar.gz) = 1003bedf3fd6025ad046645f9a88af3d8653a0e5 -SHA512 (libcanberra-0.27.tar.gz) = a5adc4e552c826cc62a507c37cc44f9c1b587a2028c352dd9501a3576af71198a71f8a6cd687b913f0168131071ec1dcd63ebeae303937f37ff46684579a550b -Size (libcanberra-0.27.tar.gz) = 490442 bytes +SHA1 (libcanberra-0.30.tar.xz) = fd4c16e341ffc456d688ed3462930d17ca6f6c20 +RMD160 (libcanberra-0.30.tar.xz) = f5a800f50ae185d9ec12c284298c20fd60f70a8c +SHA512 (libcanberra-0.30.tar.xz) = f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 +Size (libcanberra-0.30.tar.xz) = 318960 bytes SHA1 (patch-aa) = abef0e544f8d9789e971511c9b363b33dd2391ca SHA1 (patch-ab) = 2a5767e0aa29f5dc4f6b6fd15a0f2aaf1f5dd329 SHA1 (patch-config.h.in) = 26c549594db30b525cab345bb19c9455f52098d2 diff --git a/audio/libcanberra/options.mk b/audio/libcanberra/options.mk index 39a4b01c84b..84537faae14 100644 --- a/audio/libcanberra/options.mk +++ b/audio/libcanberra/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2013/08/12 07:09:59 obache Exp $ +# $NetBSD: options.mk,v 1.3 2018/11/29 11:20:18 prlw1 Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libcanberra PKG_SUPPORTED_OPTIONS= gtk gtk3 @@ -9,7 +9,6 @@ PKG_SUGGESTED_OPTIONS= gtk gtk3 PLIST_VARS+= gtk-any gtk gtk3 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgtk3) -GCONF_SCHEMAS+= libcanberra.schemas PLIST.gtk-any= yes .endif |