From c7e750896a74012c761720582346f914f83dbe41 Mon Sep 17 00:00:00 2001 From: landry Date: Sun, 18 Sep 2011 13:27:53 +0000 Subject: [PATCH] Fix cmus configuration on arm and documentation about sndio backend, from maintainer Donovan Watteau. That was somewhat missing from the import. --- audio/cmus/Makefile | 9 +++------ audio/cmus/patches/patch-Doc_cmus_txt | 12 ++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 audio/cmus/patches/patch-Doc_cmus_txt diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 5ad86ba6688..8fa612af2c0 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2011/09/16 08:26:10 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2011/09/18 13:27:53 landry Exp $ COMMENT-main= ncurses-based music player COMMENT-flac= FLAC input plugin for cmus @@ -10,7 +10,7 @@ PKGNAME-main= cmus-$(V) PKGNAME-flac= cmus-flac-$(V) PKGNAME-wavpack= cmus-wavpack-$(V) -REVISION-main= 0 +REVISION-main= 1 REVISION-flac= 1 REVISION-wavpack= 1 @@ -63,13 +63,10 @@ CONFIGURE_ARGS= prefix=${PREFIX} \ CONFIG_SNDIO=y .if ${MACHINE_ARCH} == "arm" -CONFIGURE_ARGS+= CONFIG_TREMOR=y \ - CONFIG_VORBIS=n +CONFIGURE_ARGS+= CONFIG_TREMOR=y LIB_DEPENDS+= audio/tremor WANTLIB-main+= vorbisidec>=1 .else -CONFIGURE_ARGS+= CONFIG_TREMOR=n \ - CONFIG_VORBIS=y LIB_DEPENDS+= audio/libvorbis WANTLIB-main+= ogg vorbis>=0 vorbisfile>=1 .endif diff --git a/audio/cmus/patches/patch-Doc_cmus_txt b/audio/cmus/patches/patch-Doc_cmus_txt new file mode 100644 index 00000000000..a85120660dc --- /dev/null +++ b/audio/cmus/patches/patch-Doc_cmus_txt @@ -0,0 +1,12 @@ +$OpenBSD: patch-Doc_cmus_txt,v 1.1 2011/09/18 13:27:53 landry Exp $ +--- Doc/cmus.txt.orig Sun Jul 24 11:42:22 2011 ++++ Doc/cmus.txt Sun Sep 4 22:55:19 2011 +@@ -860,7 +860,7 @@ id3_default_charset (ISO-8859-1) + lib_sort (artist album discnumber tracknumber title filename) [`Sort Keys`] + Sort keys for the sorted library view (2). + +-output_plugin [roar, pulse, alsa, arts, oss, sun] ++output_plugin [roar, pulse, alsa, arts, sndio, oss, sun] + Name of output plugin. + + pl_sort () [`Sort Keys`]