cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* quit building audio(4) backend

Browse Source 
* fix compilation of xaw FLAVOR
* REVISION and bump
* fix and new style LIB_DEPENDS/WANTLIB
ok ajacoutot
This commit is contained in:
jakemsr 2010-08-27 00:52:01 +00:00
parent e8e4be4765
commit 257b6a89b7
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
audio/timidity/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.36 2010/08/23 11:17:17 sthen Exp $
# $OpenBSD: Makefile,v 1.37 2010/08/27 00:52:01 jakemsr Exp $
COMMENT= MIDI to WAV renderer and player
V= 2.13.2
DISTNAME= TiMidity++-${V}
PKGNAME= timidity-${V}p2
PKGNAME= timidity-${V}
REVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/}
@ -25,7 +26,7 @@ WANTLIB= c m ncurses sndio
CONFIGURE_STYLE=autoconf automake gnu
AUTOCONF_VERSION = 2.59
AUTOMAKE_VERSION = 1.9
CONFIGURE_ARGS= --enable-audio=sndio,sun \
CONFIGURE_ARGS= --enable-audio=sndio \
--with-default-output=sndio \
--enable-vt100 \
--enable-ncurses \
@ -39,18 +40,20 @@ FLAVOR?=
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
LIB_DEPENDS+= ::x11/gtk+2
WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \
fontconfig freetype glib-2.0 glitz gio-2.0 gmodule-2.0 \
gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png pthread-stubs xcb z
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
glib-2.0 glitz gio-2.0 gmodule-2.0 gobject-2.0 \
gtk-x11-2.0 gthread-2.0 pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \
xcb-render xcb-render-util z
.endif
.if ${FLAVOR:L:Mxaw}
CONFIGURE_ARGS+=--enable-xaw
USE_X11= Yes
WANTLIB+= ICE SM X11 Xaw Xext Xmu Xt pthread-stubs xcb
WANTLIB+= ICE SM X11 Xaw Xext Xmu Xt
.endif
.if ! ${FLAVOR:L:Mgtk2} && ! ${FLAVOR:L:Mxaw}

30
audio/timidity/patches/patch-TiMidity++-2_13_2_interface_xaw_i_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-TiMidity++-2_13_2_interface_xaw_i_c,v 1.1 2010/08/27 00:52:01 jakemsr Exp $
--- TiMidity++-2.13.2/interface/xaw_i.c.orig Wed Aug 25 19:07:52 2010
+++ TiMidity++-2.13.2/interface/xaw_i.c Wed Aug 25 19:08:36 2010
@@ -261,7 +261,7 @@ int amplitude = DEFAULT_AMPLIFICATION;
String bitmapdir = XAW_BITMAP_DIR;
Boolean arrangetitle,savelist;
static char **current_flist = NULL;
-static int voices = 0, last_voice = 0, voices_num_width;
+static int nvoices = 0, last_voice = 0, voices_num_width;
static int maxentry_on_a_menu = 0,submenu_n = 0;
#define OPTIONS_WINDOW 1
#define FLIST_WINDOW 2
@@ -1329,7 +1329,7 @@ static void handle_input(XtPointer data,int *source,Xt
c= *(local_buf+1);
n= atoi(local_buf+2);
if(c == 'L')
- voices = n;
+ nvoices = n;
else
last_voice = n;
if(IsTracePlaying()) drawVoices();
@@ -2070,7 +2070,7 @@ static void drawVoices(void) {
XSetForeground(disp, gct, tracecolor);
XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);
- sprintf(local_buf, "%3d/%d", last_voice, voices);
+ sprintf(local_buf, "%3d/%d", last_voice, nvoices);
XSetForeground(disp, gct, capcolor);
XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));