CVS commit: pkgsrc/audio/solfege

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jul  8 13:57:43 UTC 2020

Modified Files:
        pkgsrc/audio/solfege: Makefile distinfo
Added Files:
        pkgsrc/audio/solfege/patches: patch-topdocs_AUTHORS.texi
            patch-topdocs_README.texi

Log Message:
- Specify ISO-8859-1 encoding on a couple Texinfo docs that aren't UTF8.
  Fixes `utf8 "\\xF6" does not map to Unicode` that was breaking SmartOS bulk builds.
- Use afplay(1) on macOS (included since 2007) instead of deprecated audio/qtplay.
  Other platforms still need to define default audio players.
- Include librsvg to get the gdk-pixbuf SVG loader for solvege.svg.
- Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/audio/solfege/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/solfege/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/solfege/patches/patch-topdocs_AUTHORS.texi \
    pkgsrc/audio/solfege/patches/patch-topdocs_README.texi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/solfege/Makefile
diff -u pkgsrc/audio/solfege/Makefile:1.75 pkgsrc/audio/solfege/Makefile:1.76
--- pkgsrc/audio/solfege/Makefile:1.75  Tue Jun  2 08:23:14 2020
+++ pkgsrc/audio/solfege/Makefile       Wed Jul  8 13:57:42 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2020/06/02 08:23:14 adam Exp $
+# $NetBSD: Makefile,v 1.76 2020/07/08 13:57:42 schmonz Exp $
 
 DISTNAME=              solfege-3.22.2
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_GNU:=solfege/}
 EXTRACT_SUFX=          .tar.xz
@@ -53,11 +53,11 @@ MIDIPLAYER= /usr/bin/midiplay
 MP3PLAYER=     ${PREFIX}/bin/mpg123
 OGGPLAYER=     ${PREFIX}/bin/ogg123
 .elif ${OPSYS} == "Darwin"
-WAVPLAYER=     ${PREFIX}/bin/qtplay
-MIDIPLAYER=    ${PREFIX}/bin/qtplay
-MP3PLAYER=     ${PREFIX}/bin/qtplay
-OGGPLAYER=     ${PREFIX}/bin/qtplay
-DEPENDS+=      qtplay-[0-9]*:../../audio/qtplay
+WAVPLAYER=     /usr/bin/afplay
+MIDIPLAYER=    /usr/bin/afplay
+MP3PLAYER=     /usr/bin/afplay
+OGGPLAYER=     ${PREFIX}/bin/ogg123
+DEPENDS+=      vorbis-tools-[0-9]*:../../audio/vorbis-tools
 .endif
 
 post-install:
@@ -66,6 +66,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/solfege/src
 
 .include "../../lang/python/application.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.14

Index: pkgsrc/audio/solfege/distinfo
diff -u pkgsrc/audio/solfege/distinfo:1.11 pkgsrc/audio/solfege/distinfo:1.12
--- pkgsrc/audio/solfege/distinfo:1.11  Thu Jul 11 04:51:14 2019
+++ pkgsrc/audio/solfege/distinfo       Wed Jul  8 13:57:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2019/07/11 04:51:14 schmonz Exp $
+$NetBSD: distinfo,v 1.12 2020/07/08 13:57:42 schmonz Exp $
 
 SHA1 (solfege-3.22.2.tar.xz) = d46e67d2f64c943fbdfa3858f077b49186a60a66
 RMD160 (solfege-3.22.2.tar.xz) = 0832a8b75c913af0f7d7124b339e70a6cc82fb23
@@ -7,3 +7,5 @@ Size (solfege-3.22.2.tar.xz) = 4107232 b
 SHA1 (patch-Makefile.in) = 24cf0755877f53bef9687019e6b493d115709347
 SHA1 (patch-default.config) = b8cb381b348b4e2c2201e7ab9666006b40cbd4ce
 SHA1 (patch-po_Makefile) = 5c7ceec962593afc80f23aa8059c32642a456be3
+SHA1 (patch-topdocs_AUTHORS.texi) = f4c29b218a60c5dbf3d90c4bf01f7f547b6c97eb
+SHA1 (patch-topdocs_README.texi) = f2048b20e00bc47e4401d5bdb68a46f340788193

Added files:

Index: pkgsrc/audio/solfege/patches/patch-topdocs_AUTHORS.texi
diff -u /dev/null pkgsrc/audio/solfege/patches/patch-topdocs_AUTHORS.texi:1.1
--- /dev/null   Wed Jul  8 13:57:43 2020
+++ pkgsrc/audio/solfege/patches/patch-topdocs_AUTHORS.texi     Wed Jul  8 13:57:42 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-topdocs_AUTHORS.texi,v 1.1 2020/07/08 13:57:42 schmonz Exp $
+
+Specify encoding to avoid UTF8-to-Unicode conversion error.
+
+--- topdocs/AUTHORS.texi.orig  2013-10-05 20:57:48.000000000 +0000
++++ topdocs/AUTHORS.texi
+@@ -3,6 +3,7 @@
+ @settitle AUTHORS
+ @node Top, , , (dir)
+ @chapter AUTHORS - who wrote what on GNU Solfege?
++@documentencoding ISO-8859-1
+ 
+ @itemize @bullet
+ 
Index: pkgsrc/audio/solfege/patches/patch-topdocs_README.texi
diff -u /dev/null pkgsrc/audio/solfege/patches/patch-topdocs_README.texi:1.1
--- /dev/null   Wed Jul  8 13:57:43 2020
+++ pkgsrc/audio/solfege/patches/patch-topdocs_README.texi      Wed Jul  8 13:57:42 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-topdocs_README.texi,v 1.1 2020/07/08 13:57:42 schmonz Exp $
+
+Specify encoding to avoid UTF8-to-Unicode conversion error.
+
+--- topdocs/README.texi.orig   2013-10-05 20:57:48.000000000 +0000
++++ topdocs/README.texi
+@@ -2,6 +2,7 @@
+ @setfilename README.info
+ @include topdocs/defs.texi
+ @settitle README
++@documentencoding ISO-8859-1
+ 
+ @contents 
+