From 1612b04a0ed20137309501ddd5a1607a87e6c255 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 22 Nov 2007 12:52:34 +0000 Subject: [PATCH] - add a xaw FLAVOR - reformat DESCR - fix WANTLIB based on a submission from Bryan Linton "go for it" landry@ --- audio/timidity/Makefile | 28 +++++++++++++------ .../patches/patch-TiMidity++-2_13_2_configure | 8 +++--- audio/timidity/pkg/DESCR | 23 ++++++++++++--- audio/timidity/pkg/PFRAG.xaw | 14 ++++++++++ audio/timidity/pkg/PLIST | 3 +- 5 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 audio/timidity/pkg/PFRAG.xaw diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 7b70f282dc5..22ca19d344c 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.31 2007/09/15 21:26:03 simon Exp $ +# $OpenBSD: Makefile,v 1.32 2007/11/22 12:52:34 ajacoutot Exp $ COMMENT= MIDI to WAV renderer and player -DISTNAME= TiMidity++-2.13.2 -PKGNAME= ${DISTNAME:L:S/++//}p0 + +V= 2.13.2 +DISTNAME= TiMidity++-${V} +PKGNAME= timidity-${V}p1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/} @@ -17,6 +19,7 @@ PERMIT_PACKAGE_CDROM= copyrighted patches PERMIT_PACKAGE_FTP= copyrighted patches PERMIT_DISTFILES_CDROM= copyrighted patches PERMIT_DISTFILES_FTP= copyrighted patches + WANTLIB= c m ncurses CONFIGURE_STYLE=gnu @@ -28,7 +31,7 @@ CONFIGURE_ARGS= --enable-audio=sun \ --enable-server \ --with-default-path=${SYSCONFDIR} -FLAVORS= gtk2 +FLAVORS= gtk2 xaw FLAVOR?= .if ${FLAVOR:L:Mgtk2} @@ -36,10 +39,19 @@ CONFIGURE_ARGS+=--enable-gtk MODULES= devel/gettext USE_X11= Yes LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 -WANTLIB+= X11 Xext Xrender atk-1.0 fontconfig freetype \ - glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 \ - pangoft2-1.0 pangocairo-1.0 glitz cairo png z -.else +WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \ + fontconfig freetype glib-2.0 glitz gmodule-2.0 \ + gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 png z +.endif + +.if ${FLAVOR:L:Mxaw} +CONFIGURE_ARGS+=--enable-xaw +USE_X11= Yes +WANTLIB+= ICE SM X11 Xaw Xext Xmu Xt +.endif + +.if ! ${FLAVOR:L:Mgtk2} && ! ${FLAVOR:L:Mxaw} CONFIGURE_ARGS+=--without-x .endif diff --git a/audio/timidity/patches/patch-TiMidity++-2_13_2_configure b/audio/timidity/patches/patch-TiMidity++-2_13_2_configure index 2d5e42ffc56..2685601283b 100644 --- a/audio/timidity/patches/patch-TiMidity++-2_13_2_configure +++ b/audio/timidity/patches/patch-TiMidity++-2_13_2_configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-TiMidity++-2_13_2_configure,v 1.1 2006/01/30 10:13:11 jsg Exp $ ---- TiMidity++-2.13.2/configure.orig Sun Oct 3 22:39:51 2004 -+++ TiMidity++-2.13.2/configure Sat Jan 21 01:07:46 2006 -@@ -16190,7 +16190,7 @@ if test "${ac_cv_lib_slang_SLang_init_tt +$OpenBSD: patch-TiMidity++-2_13_2_configure,v 1.2 2007/11/22 12:52:34 ajacoutot Exp $ +--- TiMidity++-2.13.2/configure.orig Sun Oct 3 14:39:51 2004 ++++ TiMidity++-2.13.2/configure Thu Nov 22 09:30:30 2007 +@@ -16190,7 +16190,7 @@ if test "${ac_cv_lib_slang_SLang_init_tty+set}" = set; echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS diff --git a/audio/timidity/pkg/DESCR b/audio/timidity/pkg/DESCR index 3a7f6945bdd..c5f0ee13a7b 100644 --- a/audio/timidity/pkg/DESCR +++ b/audio/timidity/pkg/DESCR @@ -1,8 +1,23 @@ TiMidity is a MIDI to WAVE converter using Gravis Ultrasound-compatible patch files or soundfonts to generate digital audio data from General -MIDI files. The data can be stored in a file for processing, or played -in real time through an audio device. +MIDI (GM) files. The data can be stored in a file for processing, or +played in real time through an audio device. -FLAVORs: +TiMidity has several different interfaces which can be chosen by appending +a character to the "-i" interface command line switch. +The defaults are: + -in ncurses interface + -iT vt100 interface + -id dumb interface + -ir remote interface - gtk2 - build gtk+2 interface which may be used via 'timidity -ig' +Some of the interfaces support "play tracing" which shows you the notes +being played in realtime. This can be enabled by appending a 't' to the +respective interface switch, e.g. to enable play tracing on the ncurses +interface use 'timidity -int '. + +Available flavors: + gtk2 - Build gtk+2 interface which may be used via 'timidity -ig' + (does not support play tracing) + xaw - Build Xaw interface which may be used via 'timidity -ia' + (support play tracing) diff --git a/audio/timidity/pkg/PFRAG.xaw b/audio/timidity/pkg/PFRAG.xaw new file mode 100644 index 00000000000..af35c073e62 --- /dev/null +++ b/audio/timidity/pkg/PFRAG.xaw @@ -0,0 +1,14 @@ +@comment $OpenBSD: PFRAG.xaw,v 1.1 2007/11/22 12:52:34 ajacoutot Exp $ +lib/timidity/ +lib/timidity/bitmaps/ +lib/timidity/bitmaps/back.xbm +lib/timidity/bitmaps/fwrd.xbm +lib/timidity/bitmaps/next.xbm +lib/timidity/bitmaps/pause.xbm +lib/timidity/bitmaps/play.xbm +lib/timidity/bitmaps/prev.xbm +lib/timidity/bitmaps/quit.xbm +lib/timidity/bitmaps/random.xbm +lib/timidity/bitmaps/repeat.xbm +lib/timidity/bitmaps/stop.xbm +lib/timidity/bitmaps/timidity.xbm diff --git a/audio/timidity/pkg/PLIST b/audio/timidity/pkg/PLIST index 0c6fd472b74..5328c06d645 100644 --- a/audio/timidity/pkg/PLIST +++ b/audio/timidity/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2006/01/30 10:13:11 jsg Exp $ +@comment $OpenBSD: PLIST,v 1.6 2007/11/22 12:52:34 ajacoutot Exp $ bin/timidity @man man/man1/timidity.1 @man man/man5/timidity.cfg.5 @@ -261,3 +261,4 @@ share/timidity/goemon/woodblk.pat share/timidity/goemon/woodblk1.pat share/timidity/goemon/woodblk2.pat share/timidity/goemon/woodflut.pat +%%xaw%%