Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/libmatemixer Re-enable the OSS backend. Patch ch...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a4beb9a8861
branches:  trunk
changeset: 437581:8a4beb9a8861
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Wed Aug 26 21:22:13 2020 +0000

description:
Re-enable the OSS backend. Patch cherry picked from upstream to fix the
mate-settings-daemon crash previously reported.

diffstat:

 audio/libmatemixer/Makefile                                 |  13 +++++------
 audio/libmatemixer/distinfo                                 |   3 +-
 audio/libmatemixer/patches/patch-backends_oss_oss-backend.c |  15 +++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r 665329181285 -r 8a4beb9a8861 audio/libmatemixer/Makefile
--- a/audio/libmatemixer/Makefile       Wed Aug 26 21:09:47 2020 +0000
+++ b/audio/libmatemixer/Makefile       Wed Aug 26 21:22:13 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2020/08/24 04:41:39 gutteridge Exp $
+# $NetBSD: Makefile,v 1.23 2020/08/26 21:22:13 jmcneill Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
-PKGREVISION=   3
+PKGREVISION=   4
 DISTNAME=      libmatemixer-${VERSION:R}.0
 CATEGORIES=    audio
 
@@ -10,11 +10,10 @@
 
 .include "../../mk/oss.buildlink3.mk"
 
-# see https://github.com/mate-desktop/libmatemixer/issues/28
 PLIST_VARS+=           oss
-#.if ${OSS_TYPE} != "none"
-#CONFIGURE_ARGS+=      --enable-oss
-#PLIST.oss=            yes
-#.endif
+.if ${OSS_TYPE} != "none"
+CONFIGURE_ARGS+=       --enable-oss
+PLIST.oss=             yes
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 665329181285 -r 8a4beb9a8861 audio/libmatemixer/distinfo
--- a/audio/libmatemixer/distinfo       Wed Aug 26 21:09:47 2020 +0000
+++ b/audio/libmatemixer/distinfo       Wed Aug 26 21:22:13 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2020/04/05 16:05:41 bsiegert Exp $
+$NetBSD: distinfo,v 1.7 2020/08/26 21:22:13 jmcneill Exp $
 
 SHA1 (libmatemixer-1.24.0.tar.xz) = e972bc0101ad299a264abb810035de275b415962
 RMD160 (libmatemixer-1.24.0.tar.xz) = 7764acc19b414757cbaa33b9228fc1592981c442
 SHA512 (libmatemixer-1.24.0.tar.xz) = bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf
 Size (libmatemixer-1.24.0.tar.xz) = 484808 bytes
+SHA1 (patch-backends_oss_oss-backend.c) = 5a4d7212af7730db8ae632a3f42535f09513051d
diff -r 665329181285 -r 8a4beb9a8861 audio/libmatemixer/patches/patch-backends_oss_oss-backend.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libmatemixer/patches/patch-backends_oss_oss-backend.c       Wed Aug 26 21:22:13 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-backends_oss_oss-backend.c,v 1.1 2020/08/26 21:22:13 jmcneill Exp $
+
+Fix for https://github.com/mate-desktop/libmatemixer/issues/28
+
+--- backends/oss/oss-backend.c.orig    2020-02-10 11:18:28.000000000 +0000
++++ backends/oss/oss-backend.c
+@@ -61,7 +61,7 @@ static void oss_backend_finalize       (
+ 
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wunused-function"
+-G_DEFINE_DYNAMIC_TYPE_EXTENDED (OssBackend, oss_backend, MATE_MIXER_TYPE_BACKEND, 0, G_ADD_PRIVATE (OssBackend))
++G_DEFINE_DYNAMIC_TYPE_EXTENDED (OssBackend, oss_backend, MATE_MIXER_TYPE_BACKEND, 0, G_ADD_PRIVATE_DYNAMIC (OssBackend))
+ #pragma clang diagnostic pop
+ 
+ static gboolean     oss_backend_open             (MateMixerBackend *backend);



Home | Main Index | Thread Index | Old Index