soundtracker 0.6.6 update.

- drop sun flavor.
- don't USE_GMAKE.
- use gettext module.

suggestions from naddy@.
ok naddy@, espie@.
This commit is contained in:
wcobb 2002-05-30 09:08:28 +00:00
parent 1870a5bcd4
commit ea9f23e0c1
22 changed files with 424 additions and 2090 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2002/05/13 18:50:37 espie Exp $
# $OpenBSD: Makefile,v 1.5 2002/05/30 09:08:28 wcobb Exp $
# Uses pthreads
COMMENT= "Music tracking tool for X11"
VERSION= 0.6.4
VERSION= 0.6.6
DISTNAME= soundtracker-${VERSION}
CATEGORIES= audio
NEED_VERSION= 1.504
@ -19,23 +19,24 @@ PERMIT_DISTFILES_FTP= Yes
V=v0.6
MASTER_SITES= http://www.soundtracker.org/dl/$V/ \
http://mirror.csoft.org/soundtracker/$V/
http://mirror.csoft.org/soundtracker/
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
intl.1::devel/gettext \
iconv.2::converters/libiconv \
audiofile::devel/libaudiofile
FLAVORS= gnome sun esd
FLAVOR?= sun
MODULES= gettext
FLAVORS= gnome esd
FLAVOR?=
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_STYLE= gnu autoconf
CONFIGURE_ARGS+= --with-audiofile-prefix=${LOCALBASE} \
--disable-alsa \
--disable-sgi \
--disable-oss
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.if ${FLAVOR:L:Mgnome}
LIB_DEPENDS+= gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs
@ -43,10 +44,6 @@ LIB_DEPENDS+= gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs
CONFIGURE_ARGS+= --disable-gnome
.endif
.if empty(FLAVOR:L:Msun)
CONFIGURE_ARGS+= --disable-sun
.endif
.if ${FLAVOR:L:Mesd}
LIB_DEPENDS+= esd.2::audio/esound
.else
@ -57,8 +54,11 @@ CONFIGURE_ARGS+= --disable-esd
CONFIGURE_ARGS+= --disable-assembler
.endif
DOCS= FAQ NEWS README TODO \
doc/hacking.txt doc/xi.txt doc/xm.txt
DOCS= FAQ NEWS README \
doc/xi.txt doc/xm.txt
post-configure:
cd ${WRKSRC}/po && cp -f Makefile.in Makefile
post-extract:
@ln -s ${FILESDIR}/sun-input.c ${WRKSRC}/app/drivers

View File

@ -1,3 +1,3 @@
MD5 (soundtracker-0.6.4.tar.gz) = 9208aca40dae30d17a15b0c5deb22a67
RMD160 (soundtracker-0.6.4.tar.gz) = 36e93a404bfb95de6a783e0f7c07eb028ab261ad
SHA1 (soundtracker-0.6.4.tar.gz) = 86e432756abca304fec1128fd7f62bc713d9f08e
MD5 (soundtracker-0.6.6.tar.gz) = 6014b06c999a82a227e4d1ba43ae026c
RMD160 (soundtracker-0.6.6.tar.gz) = e1de47cd9f0849814ccc5485c6c3b07f5b464b6b
SHA1 (soundtracker-0.6.6.tar.gz) = b07eb09603146996f384f060f594d9c516c933ac

View File

@ -89,7 +89,6 @@ sun_poll_ready_playing (gpointer data,
GdkInputCondition condition)
{
sun_driver * const d = data;
static int w;
static int size;
static struct timeval tv;

View File

@ -1,6 +1,7 @@
--- FAQ.orig Wed Jul 25 11:22:56 2001
+++ FAQ Mon Feb 4 23:35:44 2002
@@ -2,39 +2,11 @@
$OpenBSD: patch-FAQ,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- FAQ.orig Tue May 21 19:23:27 2002
+++ FAQ Tue May 21 19:23:41 2002
@@ -2,12 +2,6 @@
FAQ
====
@ -9,45 +10,7 @@
-
-a: You don't have thread-safe X libraries (you have a libc5
-system). Read the INSTALL file.
-
-------------------------------------------------------------------------
-
-QQQQ: SoundTracker complains about not being able to open /dev/dsp.
-
-a: Either you have not configured a sound driver for your system (you
-could check that by running an MP3 player or something) - or you are
-running GNOME and your soundcard is kept busy by the E Sound Daemon,
-which you can get rid of by using "killall esd" in a shell.
-
-There's also an "ESD" driver in the Audio settings, but it's not
-possible to do any serious tracking work because of the delay
-introduced by it.
-
-------------------------------------------------------------------------
-
-QQQQ: SoundTracker crashes as soon as I use the menu bar.
-
-a: You have a too old gtk+. Read the INSTALL file.
-
------------------------------------------------------------------------
QQQQ: The sound output gets quite choppy under machine load.
-a1: Don't run the compiled executable directly, but do a full 'make
-install', this installs the executable setuid root and the audio
-thread gets a much higher priority. Read the notes in the INSTALL file
-about this subject.
+a1: Assign the soundtracker process a higher user priority (renice).
a2: Increase size of mixer buffer in the Preferences section.
@@ -47,9 +19,6 @@ scopes.
a5: Reduce scopes and patterns update frequency in the Preferences
section.
-
-a6: Install at least glibc2.1.1pre3, this fixed a strange sound bug
-for me.
------------------------------------------------------------------------
QQQQ: SoundTracker complains about not being able to open /dev/dsp.

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/05/30 09:08:28 wcobb Exp $
--- Makefile.in.orig Mon May 20 13:50:54 2002
+++ Makefile.in Tue May 21 19:12:41 2002
@@ -97,7 +97,7 @@ VERSION = @VERSION@
gnomepath = @gnomepath@
sedpath = @sedpath@
-SUBDIRS = intl po doc app
+SUBDIRS = intl po app
EXTRA_DIST = TODO FAQ ABOUT-NLS soundtracker.spec soundtracker.desktop soundtracker_splash.png

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-acconfig_h,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- acconfig.h.orig Mon Feb 4 12:37:14 2002
+++ acconfig.h Mon Feb 4 12:37:19 2002
@@ -6,6 +6,7 @@
$OpenBSD: patch-acconfig_h,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- acconfig.h.orig Mon May 20 13:26:33 2002
+++ acconfig.h Tue May 21 18:21:30 2002
@@ -8,6 +8,7 @@
#undef DRIVER_ALSA_050
#undef DRIVER_ESD
#undef DRIVER_SGI

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-app_Makefile_am,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/Makefile.am.orig Mon Sep 25 07:06:00 2000
+++ app/Makefile.am Mon Feb 4 21:59:26 2002
@@ -46,17 +46,6 @@ soundtracker_SOURCES = \
soundtracker_LDADD = drivers/libdrivers.a mixers/libmixers.a
-install-exec-local:
- chown root.root $(bindir)/soundtracker
- chmod +s $(bindir)/soundtracker
- @echo ""
- @echo "***"
- @echo "*** Installing SoundTracker suid root."
- @echo "*** This improves sound responsivity, but may be a security risk"
- @echo "*** if this is a multi-user machine. See file INSTALL."
- @echo "***"
- @echo ""
-
stdir = $(datadir)/soundtracker
#INCLUDES = -DDATADIR=\"$(stdir)\" \

View File

@ -1,192 +1,7 @@
$OpenBSD: patch-app_Makefile_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/Makefile.in.orig Sun Aug 12 07:07:24 2001
+++ app/Makefile.in Mon Feb 4 22:01:15 2002
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,9 +57,12 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
AUDIOFILE_CFLAGS = @AUDIOFILE_CFLAGS@
AUDIOFILE_CONFIG = @AUDIOFILE_CONFIG@
AUDIOFILE_LIBS = @AUDIOFILE_LIBS@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -69,18 +72,18 @@ ESD_CONFIG = @ESD_CONFIG@
ESD_LIBS = @ESD_LIBS@
GASPPATH = @GASPPATH@
GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
GTK_LIBS = @GTK_LIBS@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
+INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LIBICONV = @LIBICONV@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -92,7 +95,6 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
USE_NLS = @USE_NLS@
VERSION = @VERSION@
gnomepath = @gnomepath@
-l = @l@
sedpath = @sedpath@
SUBDIRS = drivers mixers
@@ -238,7 +240,8 @@ maintainer-clean-recursive:
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
- test "$$subdir" = "." && dot_seen=yes; \
+ test "$$subdir" != "." || dot_seen=yes; \
+ true; \
done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
@@ -299,7 +302,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -316,112 +319,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
-audio.o: audio.c ../config.h poll.h i18n.h audio.h mixer.h driver-out.h \
- driver.h preferences.h time-buffer.h event-waiter.h main.h xm.h \
- xm-player.h endian-conv.h scope-group.h sample-display.h \
- errors.h gui-settings.h
-audioconfig.o: audioconfig.c ../config.h i18n.h audioconfig.h gui-subs.h \
- audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h sample-editor.h xm.h driver-in.h \
- gui.h
-cheat-sheet.o: cheat-sheet.c ../config.h i18n.h
-clavier.o: clavier.c clavier.h
-endian-conv.o: endian-conv.c ../config.h endian-conv.h
-envelope-box.o: envelope-box.c ../config.h i18n.h gui-subs.h \
- envelope-box.h xm.h mixer.h gui-settings.h
-errors.o: errors.c audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h
-event-waiter.o: event-waiter.c event-waiter.h
-extspinbutton.o: extspinbutton.c extspinbutton.h gui.h gui-subs.h \
- audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h
-file-operations.o: file-operations.c ../config.h i18n.h \
- file-operations.h keys.h track-editor.h tracker.h xm.h mixer.h \
- tracker-settings.h gui-subs.h gui.h audio.h driver-out.h \
- driver.h preferences.h time-buffer.h event-waiter.h errors.h
-gui-settings.o: gui-settings.c ../config.h i18n.h gui.h gui-subs.h \
- audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h gui-settings.h scope-group.h \
- sample-display.h track-editor.h tracker.h xm.h \
- tracker-settings.h extspinbutton.h
-gui-subs.o: gui-subs.c ../config.h i18n.h gui.h gui-subs.h audio.h \
- mixer.h driver-out.h driver.h preferences.h time-buffer.h \
- event-waiter.h extspinbutton.h
-gui.o: gui.c ../config.h poll.h i18n.h gui.h gui-subs.h audio.h mixer.h \
- driver-out.h driver.h preferences.h time-buffer.h \
- event-waiter.h xm.h st-subs.h xm-player.h tracker.h main.h \
- keys.h instrument-editor.h sample-editor.h driver-in.h \
- track-editor.h tracker-settings.h scope-group.h \
- sample-display.h module-info.h menubar.h tips-dialog.h \
- gui-settings.h file-operations.h playlist.h extspinbutton.h
-instrument-editor.o: instrument-editor.c i18n.h ../config.h \
- instrument-editor.h xm.h mixer.h envelope-box.h st-subs.h gui.h \
- gui-subs.h audio.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h keys.h track-editor.h tracker.h \
- tracker-settings.h clavier.h errors.h sample-editor.h \
- driver-in.h gui-settings.h module-info.h file-operations.h
-keys.o: keys.c ../config.h i18n.h keys.h gui-subs.h gui.h audio.h \
- mixer.h driver-out.h driver.h preferences.h time-buffer.h \
- event-waiter.h menubar.h
-main.o: main.c ../config.h i18n.h gui.h gui-subs.h audio.h mixer.h \
- driver-out.h driver.h preferences.h time-buffer.h \
- event-waiter.h xm.h keys.h gui-settings.h audioconfig.h \
- tips-dialog.h menubar.h track-editor.h tracker.h \
- tracker-settings.h midi.h midi-settings.h
-menubar.o: menubar.c ../config.h i18n.h menubar.h gui.h gui-subs.h \
- audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h main.h xm.h st-subs.h keys.h \
- module-info.h scope-group.h sample-display.h track-editor.h \
- tracker.h tracker-settings.h audioconfig.h gui-settings.h \
- tips-dialog.h transposition.h cheat-sheet.h file-operations.h \
- instrument-editor.h midi-settings.h
-midi-settings.o: midi-settings.c ../config.h
-midi-utils.o: midi-utils.c ../config.h
-midi.o: midi.c ../config.h
-module-info.o: module-info.c i18n.h ../config.h module-info.h gui.h \
- gui-subs.h audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h xm.h st-subs.h main.h \
- sample-editor.h driver-in.h instrument-editor.h keys.h \
- track-editor.h tracker.h tracker-settings.h
-playlist.o: playlist.c ../config.h i18n.h playlist.h gui-subs.h
-poll.o: poll.c ../config.h
-preferences.o: preferences.c ../config.h i18n.h gui-subs.h preferences.h \
- menubar.h scope-group.h sample-display.h track-editor.h \
- tracker.h xm.h mixer.h tracker-settings.h errors.h
-recode.o: recode.c recode.h
-sample-display.o: sample-display.c sample-display.h
-sample-editor.o: sample-editor.c ../config.h i18n.h sample-editor.h xm.h \
- mixer.h driver-in.h driver.h preferences.h st-subs.h gui.h \
- gui-subs.h audio.h driver-out.h time-buffer.h event-waiter.h \
- instrument-editor.h sample-display.h endian-conv.h keys.h \
- track-editor.h tracker.h tracker-settings.h errors.h \
- module-info.h file-operations.h gui-settings.h
-scope-group.o: scope-group.c ../config.h scope-group.h sample-display.h \
- audio.h mixer.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h gui-subs.h gui-settings.h
-st-subs.o: st-subs.c st-subs.h xm.h mixer.h gui-settings.h
-time-buffer.o: time-buffer.c time-buffer.h
-tips-dialog.o: tips-dialog.c ../config.h i18n.h tips-dialog.h \
- preferences.h
-track-editor.o: track-editor.c i18n.h ../config.h track-editor.h \
- tracker.h xm.h mixer.h tracker-settings.h gui.h gui-subs.h \
- audio.h driver-out.h driver.h preferences.h time-buffer.h \
- event-waiter.h st-subs.h keys.h xm-player.h main.h \
- gui-settings.h menubar.h
-tracker-settings.o: tracker-settings.c ../config.h tracker-settings.h \
- tracker.h xm.h mixer.h i18n.h gui-subs.h preferences.h
-tracker.o: tracker.c tracker.h xm.h mixer.h main.h gui-settings.h
-transposition.o: transposition.c i18n.h ../config.h transposition.h \
- main.h xm.h mixer.h gui-subs.h gui.h audio.h driver-out.h \
- driver.h preferences.h time-buffer.h event-waiter.h st-subs.h \
- track-editor.h tracker.h tracker-settings.h
-xm-player.o: xm-player.c ../config.h i18n.h xm-player.h xm.h mixer.h \
- main.h audio.h driver-out.h driver.h preferences.h \
- time-buffer.h event-waiter.h
-xm.o: xm.c i18n.h ../config.h gui-settings.h xm.h mixer.h xm-player.h \
- endian-conv.h st-subs.h recode.h errors.h audio.h driver-out.h \
- driver.h preferences.h time-buffer.h event-waiter.h
-
info-am:
info: info-recursive
dvi-am:
@@ -430,7 +327,7 @@ check-am: all-am
$OpenBSD: patch-app_Makefile_in,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- app/Makefile.in.orig Mon May 20 13:51:13 2002
+++ app/Makefile.in Tue May 21 19:22:46 2002
@@ -436,7 +436,7 @@ check-am: all-am
check: check-recursive
installcheck-am:
installcheck: installcheck-recursive
@ -195,17 +10,17 @@ $OpenBSD: patch-app_Makefile_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
install-exec: install-exec-recursive
install-data-am:
@@ -492,24 +389,12 @@ all-recursive check-recursive installche
dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
@@ -499,23 +499,12 @@ dvi-recursive mostlyclean-recursive dist
maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck \
dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-local install-exec-am install-exec install-data-am \
-install-data install-am install uninstall-am uninstall all-redirect \
-all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
+install-exec-am install-exec install-data-am \
install-data install-am install uninstall-am uninstall all-redirect \
all-am all installdirs-am installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
-
-install-exec-local:
- chown root.root $(bindir)/soundtracker
@ -217,12 +32,6 @@ $OpenBSD: patch-app_Makefile_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
- @echo "*** if this is a multi-user machine. See file INSTALL."
- @echo "***"
- @echo ""
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@ -1,106 +1,35 @@
$OpenBSD: patch-app_drivers_Makefile_in,v 1.1.1.1 2002/02/05 18:04:11 espie Exp $
--- app/drivers/Makefile.in.orig Sun Aug 12 07:07:27 2001
+++ app/drivers/Makefile.in Mon Feb 4 22:01:15 2002
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,9 +57,12 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
AUDIOFILE_CFLAGS = @AUDIOFILE_CFLAGS@
AUDIOFILE_CONFIG = @AUDIOFILE_CONFIG@
AUDIOFILE_LIBS = @AUDIOFILE_LIBS@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -69,18 +72,18 @@ ESD_CONFIG = @ESD_CONFIG@
ESD_LIBS = @ESD_LIBS@
GASPPATH = @GASPPATH@
GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
GTK_LIBS = @GTK_LIBS@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
+INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LIBICONV = @LIBICONV@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -92,12 +95,11 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
USE_NLS = @USE_NLS@
VERSION = @VERSION@
gnomepath = @gnomepath@
-l = @l@
sedpath = @sedpath@
$OpenBSD: patch-app_drivers_Makefile_in,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- app/drivers/Makefile.in.orig Mon May 27 03:32:10 2002
+++ app/drivers/Makefile.in Mon May 27 03:33:48 2002
@@ -99,8 +99,7 @@ sedpath = @sedpath@
noinst_LIBRARIES = libdrivers.a
-libdrivers_a_SOURCES = alsa-output.c alsa-input.c alsa2-output.c alsa2-input.c dsound-output.c dummy-drivers.c esd-output.c file-output.c irix-output.c oss-output.c oss-input.c
+libdrivers_a_SOURCES = alsa-output.c alsa-input.c alsa2-output.c alsa2-input.c dsound-output.c dummy-drivers.c esd-output.c file-output.c irix-output.c oss-output.c oss-input.c sun-output.c sun-input.c
-
+libdrivers_a_SOURCES = alsa-output.c alsa-input.c alsa2-output.c alsa2-input.c dsound-output.c dummy-drivers.c esd-output.c file-output.c irix-output.c oss-output.c oss-input.c sun-output.c sun-input.c
INCLUDES = -I..
@@ -114,7 +116,8 @@ LIBS = @LIBS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -116,7 +115,7 @@ LIBS = @LIBS@
libdrivers_a_LIBADD =
libdrivers_a_OBJECTS = alsa-output.o alsa-input.o alsa2-output.o \
alsa2-input.o dsound-output.o dummy-drivers.o esd-output.o \
-file-output.o irix-output.o oss-output.o oss-input.o
+file-output.o irix-output.o oss-output.o oss-input.o sun-output.o \
+sun-input.o
+file-output.o irix-output.o oss-output.o oss-input.o sun-output.o sun-input.o
AR = ar
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -211,32 +214,13 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-alsa-input.o: alsa-input.c ../../config.h
-alsa-output.o: alsa-output.c ../../config.h
-alsa2-input.o: alsa2-input.c ../../config.h
-alsa2-output.o: alsa2-output.c ../../config.h
-dsound-output.o: dsound-output.c ../../config.h
-dummy-drivers.o: dummy-drivers.c ../../config.h ../i18n.h ../driver-in.h \
- ../driver.h ../preferences.h ../driver-out.h
-esd-output.o: esd-output.c ../../config.h
-file-output.o: file-output.c ../../config.h ../i18n.h ../driver-out.h \
- ../driver.h ../preferences.h ../mixer.h ../errors.h \
- ../gui-subs.h
-irix-output.o: irix-output.c ../../config.h
-oss-input.o: oss-input.c ../../config.h ../i18n.h ../driver-in.h \
- ../driver.h ../preferences.h ../mixer.h ../errors.h \
- ../gui-subs.h
-oss-output.o: oss-output.c ../../config.h ../i18n.h ../driver-out.h \
- ../driver.h ../preferences.h ../mixer.h ../errors.h \
- ../gui-subs.h
-
info-am:
info: info-am
dvi-am:
@@ -242,6 +241,12 @@ oss-input.o: oss-input.c ../../config.h
../driver.h ../preferences.h ../mixer.h ../errors.h \
../gui-subs.h
oss-output.o: oss-output.c ../../config.h ../i18n.h ../driver-out.h \
+ ../driver.h ../preferences.h ../mixer.h ../errors.h \
+ ../gui-subs.h
+sun-input.o: sun-input.c ../../config.h ../i18n.h ../driver-in.h \
+ ../driver.h ../preferences.h ../mixer.h ../errors.h \
+ ../gui-subs.h
+sun-output.o: sun-output.c ../../config.h ../i18n.h ../driver-out.h \
../driver.h ../preferences.h ../mixer.h ../errors.h \
../gui-subs.h

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-app_drivers_oss_input_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/drivers/oss-input.c.orig Sat Aug 4 07:14:49 2001
+++ app/drivers/oss-input.c Mon Feb 4 04:10:05 2002
@@ -32,7 +32,13 @@
#include <sys/ioctl.h>
#include <sys/types.h>
#include <unistd.h>
-#include <sys/soundcard.h>
+#ifdef HAVE_SYS_SOUNDCARD_H
+# include <sys/soundcard.h>
+#elif HAVE_MACHINE_SOUNDCARD_H
+# include <machine/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+# include <soundcard.h>
+#endif
#include <sys/time.h>
#include <glib.h>
@@ -54,7 +60,7 @@ typedef struct oss_driver {
int fragsize;
int mf;
- GMutex *configmutex;
+ pthread_mutex_t configmutex;
int soundfd;
void *sndbuf;
@@ -150,7 +156,9 @@ oss_new (void)
d->soundfd = -1;
d->sndbuf = NULL;
d->polltag = 0;
- d->configmutex = g_mutex_new();
+ if (pthread_mutex_init(&d->configmutex, NULL) != 0) {
+ return NULL;
+ }
oss_make_config_widgets(d);
@@ -163,7 +171,7 @@ oss_destroy (void *dp)
oss_driver * const d = dp;
gtk_widget_destroy(d->configwidget);
- g_mutex_free(d->configmutex);
+ pthread_mutex_destroy(&d->configmutex);
g_free(dp);
}

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-app_drivers_oss_output_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/drivers/oss-output.c.orig Sat Aug 4 07:06:18 2001
+++ app/drivers/oss-output.c Mon Feb 4 04:17:56 2002
@@ -32,7 +32,13 @@
#include <sys/ioctl.h>
#include <sys/types.h>
#include <unistd.h>
-#include <sys/soundcard.h>
+#ifdef HAVE_SYS_SOUNDCARD_H
+# include <sys/soundcard.h>
+#elif HAVE_MACHINE_SOUNDCARD_H
+# include <machine/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+# include <soundcard.h>
+#endif
#include <sys/time.h>
#include <glib.h>
@@ -61,7 +67,7 @@ typedef struct oss_driver {
int mf;
gboolean realtimecaps;
- GMutex *configmutex;
+ pthread_mutex_t configmutex;
int soundfd;
void *sndbuf;
@@ -307,7 +313,9 @@ oss_new (void)
d->soundfd = -1;
d->sndbuf = NULL;
d->polltag = NULL;
- d->configmutex = g_mutex_new();
+ if (pthread_mutex_init(&d->configmutex, NULL) != 0) {
+ return (NULL);
+ }
oss_make_config_widgets(d);
@@ -320,7 +328,7 @@ oss_destroy (void *dp)
oss_driver * const d = dp;
gtk_widget_destroy(d->configwidget);
- g_mutex_free(d->configmutex);
+ pthread_mutex_destroy(&d->configmutex);
g_free(dp);
}

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-app_file-operations_c,v 1.1 2002/05/30 09:08:28 wcobb Exp $
--- app/file-operations.c.orig Tue May 28 23:38:51 2002
+++ app/file-operations.c Tue May 28 23:39:04 2002
@@ -25,6 +25,7 @@
#include <errno.h>
#include <dirent.h>
+#include <unistd.h>
#include "i18n.h"
#include <gdk/gdktypes.h>

View File

@ -1,7 +1,26 @@
$OpenBSD: patch-app_main_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/main.c.orig Sun Aug 12 06:52:17 2001
+++ app/main.c Mon Feb 4 22:04:53 2002
@@ -79,6 +79,9 @@ main (int argc,
$OpenBSD: patch-app_main_c,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- app/main.c.orig Sun Feb 17 11:02:22 2002
+++ app/main.c Tue May 21 21:10:04 2002
@@ -47,18 +47,6 @@
XM *xm = NULL;
int pipea[2], pipeb[2];
-static void
-sigsegv_handler (int parameter)
-{
- signal(SIGSEGV, SIG_DFL);
-
- if(xm != NULL) {
- int retval = XM_Save(xm, "crash-save.xm", FALSE);
- printf("*** SIGSEGV caught.\n*** Saved current XM to 'crash-save.xm' in current directory.\n (status %d)\n", retval);
- exit(1);
- }
-}
-
int
main (int argc,
char *argv[])
@@ -80,6 +68,9 @@ main (int argc,
#ifdef DRIVER_SGI
driver_out_irix,
#endif
@ -11,7 +30,7 @@ $OpenBSD: patch-app_main_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
#ifndef NO_AUDIOFILE
// driver_out_file,
#endif
@@ -91,7 +94,9 @@ main (int argc,
@@ -92,7 +83,9 @@ main (int argc,
mixer_kbfloat,
mixer_integer32;
@ -21,17 +40,26 @@ $OpenBSD: patch-app_main_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
if(pipe(pipea) || pipe(pipeb)) {
fprintf(stderr, "Cränk. Can't pipe().\n");
@@ -168,6 +173,13 @@ main (int argc,
#ifdef DRIVER_SGI
drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT],
@@ -178,6 +171,13 @@ main (int argc,
&driver_out_irix);
+#endif
+
#endif
+#ifdef DRIVER_SUN
+ drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT],
+ &driver_out_sun);
+ drivers[DRIVER_INPUT] = g_list_append(drivers[DRIVER_INPUT],
+ &driver_in_sun);
#endif
+#endif
+
#ifdef _WIN32
drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT],
&driver_out_dsound);
@@ -215,8 +215,6 @@ main (int argc,
midi_load_config();
midi_init();
#endif
-
- signal(SIGSEGV, sigsegv_handler);
gtk_main();

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-app_sample_editor_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/sample-editor.c.orig Wed Jul 25 11:46:45 2001
+++ app/sample-editor.c Mon Feb 4 04:38:32 2002
@@ -183,7 +183,7 @@ static void sample_editor_reverse_clicke
$OpenBSD: patch-app_sample_editor_c,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- app/sample-editor.c.orig Thu May 16 11:55:24 2002
+++ app/sample-editor.c Tue May 21 18:21:30 2002
@@ -186,7 +186,7 @@ static void sample_editor_reverse_clicke
static void
sample_editor_lock_sample (void)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-app_sample_editor_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
}
static void
@@ -192,7 +192,7 @@ sample_editor_unlock_sample (void)
@@ -195,7 +195,7 @@ sample_editor_unlock_sample (void)
if(gui_playing_mode) {
mixer->updatesample(&current_sample->sample);
}
@ -19,7 +19,7 @@ $OpenBSD: patch-app_sample_editor_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
}
void
@@ -462,7 +462,7 @@ sample_editor_page_create (GtkNotebook *
@@ -465,7 +465,7 @@ sample_editor_page_create (GtkNotebook *
#if !defined(NO_AUDIOFILE) && HAVE_DLFCN_H
{ // hack, hack
void *handle, *function;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-app_xm_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- app/xm.c.orig Mon Feb 4 04:08:11 2002
+++ app/xm.c Mon Feb 4 04:39:22 2002
@@ -760,7 +760,8 @@ xm_init_locks (XM *xm)
$OpenBSD: patch-app_xm_c,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- app/xm.c.orig Mon May 20 10:21:08 2002
+++ app/xm.c Tue May 21 18:21:30 2002
@@ -765,7 +765,8 @@ xm_init_locks (XM *xm)
for(i = 0; i < sizeof(xm->instruments) / sizeof(xm->instruments[0]); i++) {
STInstrument *ins = &xm->instruments[i];
for(j = 0; j < sizeof(ins->samples) / sizeof(ins->samples[0]); j++) {
@ -11,7 +11,7 @@ $OpenBSD: patch-app_xm_c,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
}
}
}
@@ -1089,7 +1090,9 @@ XM_Free (XM *xm)
@@ -1094,7 +1095,9 @@ XM_Free (XM *xm)
STInstrument *ins = &xm->instruments[i];
st_clean_instrument(ins, NULL);
for(j = 0; j < sizeof(ins->samples) / sizeof(ins->samples[0]); j++) {

View File

@ -1,17 +1,58 @@
$OpenBSD: patch-config_h_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- config.h.in.orig Mon Feb 4 12:36:39 2002
+++ config.h.in Mon Feb 4 12:37:24 2002
@@ -25,9 +25,6 @@
/* Define to `long' if <sys/types.h> doesn't define. */
#undef off_t
$OpenBSD: patch-config_h_in,v 1.2 2002/05/30 09:08:28 wcobb Exp $
--- config.h.in.orig Mon May 20 13:41:08 2002
+++ config.h.in Tue May 21 18:43:43 2002
@@ -1,6 +1,48 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-#undef PACKAGE
-#undef VERSION
+
+/* Define if using alloca.c. */
+#undef C_ALLOCA
+
+/* Define to empty if the keyword does not work. */
+#undef const
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+ This function is required for alloca.c support on those systems. */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+#undef HAVE_ALLOCA_H
+
+/* Define if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define as __inline if that's what the C compiler calls it. */
+#undef inline
+
+/* Define to `long' if <sys/types.h> doesn't define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> doesn't define. */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+ automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if your processor stores words with the most significant
+ byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
-/* Define if you need to in order for stat and other things to work. */
-#undef _POSIX_SOURCE
-
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
#undef PREFIX
@@ -52,17 +49,12 @@
@@ -9,207 +51,146 @@
#undef DRIVER_ALSA_050
#undef DRIVER_ESD
#undef DRIVER_SGI
@ -20,107 +61,268 @@ $OpenBSD: patch-config_h_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
#undef NO_AUDIOFILE
#undef NO_GASP
#undef NO_ASM
#undef NO_GDK_PIXBUF
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-
/* Define if you have the __argz_count function. */
#undef HAVE___ARGZ_COUNT
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
-
-/* Define if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if translation of program messages to the user's native
- language is requested. */
-#undef ENABLE_NLS
-
-/* Define if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
+/* Define if you have the __argz_count function. */
+#undef HAVE___ARGZ_COUNT
@@ -78,12 +70,33 @@
/* Define if you have the esd_play_stream function. */
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
+/* Define if you have the __argz_next function. */
+#undef HAVE___ARGZ_NEXT
-/* Define if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
+/* Define if you have the __argz_stringify function. */
+#undef HAVE___ARGZ_STRINGIFY
-/* Define if you have the `dcgettext' function. */
+/* Define if you have the dcgettext function. */
#undef HAVE_DCGETTEXT
-/* Define if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if you have the `esd_play_stream' function. */
+/* Define if you have the esd_play_stream function. */
#undef HAVE_ESD_PLAY_STREAM
-/* Define if you have the `feof_unlocked' function. */
+/* Define if you have the feof_unlocked function. */
+#undef HAVE_FEOF_UNLOCKED
+
#undef HAVE_FEOF_UNLOCKED
-/* Define if you have the `fgets_unlocked' function. */
+/* Define if you have the fgets_unlocked function. */
+#undef HAVE_FGETS_UNLOCKED
+
/* Define if you have the getcwd function. */
#undef HAVE_FGETS_UNLOCKED
-/* Define if you have the `getcwd' function. */
+/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
+/* Define if you have the getegid function. */
+#undef HAVE_GETEGID
+
+/* Define if you have the geteuid function. */
+#undef HAVE_GETEUID
+
+/* Define if you have the getgid function. */
+#undef HAVE_GETGID
+
/* Define if you have the getpagesize function. */
-/* Define if you have the `getpagesize' function. */
+/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE
+/* Define if you have the getuid function. */
+#undef HAVE_GETUID
+
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <machine/soundcard.h> header file. */
-#undef HAVE_MACHINE_SOUNDCARD_H
-
-/* Define if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the `mempcpy' function. */
+/* Define if you have the mempcpy function. */
+#undef HAVE_MEMPCPY
+
/* Define if you have the munmap function. */
#undef HAVE_MEMPCPY
-/* Define if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define if you have the `munmap' function. */
+/* Define if you have the munmap function. */
#undef HAVE_MUNMAP
@@ -117,6 +130,12 @@
/* Define if you have the strdup function. */
-/* Define if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the `poll' function. */
+/* Define if you have the poll function. */
#undef HAVE_POLL
-/* Define if you have the `putenv' function. */
+/* Define if you have the putenv function. */
#undef HAVE_PUTENV
-/* Define if you have the `select' function. */
+/* Define if you have the select function. */
#undef HAVE_SELECT
-/* Define if you have the `setenv' function. */
+/* Define if you have the setenv function. */
#undef HAVE_SETENV
-/* Define if you have the `setlocale' function. */
+/* Define if you have the setlocale function. */
#undef HAVE_SETLOCALE
-/* Define if you have the `setresuid' function. */
+/* Define if you have the setresuid function. */
#undef HAVE_SETRESUID
-/* Define if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the `stpcpy' function. */
+/* Define if you have the stpcpy function. */
#undef HAVE_STPCPY
-/* Define if you have the `strcasecmp' function. */
+/* Define if you have the strcasecmp function. */
#undef HAVE_STRCASECMP
-/* Define if you have the `strchr' function. */
+/* Define if you have the strchr function. */
#undef HAVE_STRCHR
-/* Define if you have the `strdup' function. */
+/* Define if you have the strdup function. */
#undef HAVE_STRDUP
+/* Define if you have the strtoul function. */
+#undef HAVE_STRTOUL
+
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+/* Define if you have the tsearch function. */
+#undef HAVE_TSEARCH
+
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
@@ -138,9 +157,21 @@
/* Define if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define if you have the <argz.h> header file. */
+#undef HAVE_ARGZ_H
+/* Define if you have the <soundcard.h> header file. */
+#undef HAVE_SOUNDCARD_H
+
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Define if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
+/* Define if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-/* Define if you have the <sys/soundcard.h> header file. */
-#undef HAVE_SYS_SOUNDCARD_H
+/* Define if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
-/* Define if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+/* Define if you have the <machine/soundcard.h> header file. */
+#undef HAVE_MACHINE_SOUNDCARD_H
-/* Define if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+/* Define if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
-/* Define if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
+/* Define if you have the <nl_types.h> header file. */
+#undef HAVE_NL_TYPES_H
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* Define if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
-/* Define if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Define if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
+/* Define if you have the <sys/audioio.h> header file. */
+#undef HAVE_SYS_AUDIOIO_H
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-/* Name of package */
-#undef PACKAGE
+/* Define if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
+/* Define if you have the <sys/soundcard.h> header file. */
+#undef HAVE_SYS_SOUNDCARD_H
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* Define if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
@@ -153,12 +184,28 @@
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define if you have the i library (-li). */
-#undef HAVE_LIBI
-
/* Name of package */
#undef PACKAGE
+/* Name of package */
+#undef PACKAGE
/* Version number of package */
#undef VERSION
+
-/* Define if your processor stores words with the most significant byte first
- (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
-#undef inline
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
@ -131,3 +333,5 @@ $OpenBSD: patch-config_h_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +1,17 @@
--- configure.in.orig Wed Jul 25 11:07:33 2001
+++ configure.in Tue Feb 5 05:54:53 2002
@@ -61,10 +61,17 @@
--- configure.in.orig Mon May 20 13:47:38 2002
+++ configure.in Tue May 21 18:43:29 2002
@@ -61,10 +61,19 @@ dnl ------------------------------------
dnl Test for GTK+ / GNOME
dnl -----------------------------------------------------------------------
+gtk_threads="gthreads"
+case `uname` in
+ OpenBSD*)
+ OpenBSD)
+ gtk_threads=""
+ LIBS="$LIBS -pthread -lintl"
+ ;;
+ ;;
+ *)
+ gtk_threads="gthreads"
+ ;;
+esac
AM_PATH_GTK(1.2.2,
,
@ -19,7 +21,7 @@
gnome=yes
AC_ARG_ENABLE(gnome,
@@ -76,7 +83,7 @@
@@ -76,7 +85,7 @@ if test "$gnome" = yes; then
AC_MSG_CHECKING(for Gnome compile flags)
GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null`
GNOME_VER=`$gnomepath --version |$sedpath 's/gnome-libs //'`
@ -28,29 +30,12 @@
if test "_$GNOME_MAJOR" = "_0"; then
gnome=no
AC_MSG_RESULT([old Gnome found, building without it.])
@@ -133,9 +140,15 @@
oss_support=no)
if test x$oss_support != xno; then
- AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
+ AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h soundcard.h)
if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \
- test "${ac_cv_header_machine_soundcard_h}" = "yes"; then
+ test "${ac_cv_header_machine_soundcard_h}" = "yes" || \
+ test "${ac_cv_header_soundcard_h}" = "yes"; then
+ case `uname` in
+ OpenBSD*)
+ LIBS="$LIBS -lossaudio"
+ ;;
+ esac
AC_DEFINE(DRIVER_OSS)
fi
fi
@@ -204,6 +217,22 @@
@@ -218,6 +227,22 @@ case `uname` in
fi
;;
esac
+
+
+dnl -----------------------------------------------------------------------
+dnl Test for Sun audio
+dnl -----------------------------------------------------------------------
@ -65,7 +50,6 @@
+ AC_DEFINE(DRIVER_SUN)
+ fi
+fi
+
dnl -----------------------------------------------------------------------
dnl Other tests

View File

@ -1,51 +0,0 @@
$OpenBSD: patch-intl_Makefile_in,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
--- intl/Makefile.in.orig Wed Aug 11 09:59:15 1999
+++ intl/Makefile.in Thu Jan 31 08:55:03 2002
@@ -62,11 +62,11 @@ SOURCES = $(COMSRCS) intl-compat.c cat-c
COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
explodename.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
+OBJECTS = @INTLOBJS@ bindtextdom.o dcgettext.o dgettext.o gettext.o \
+finddomain.o loadmsgcat.o localealias.o textdomain.o l10nflist.o \
+explodename.o
+CATOBJS = cat-compat.o ../po/cat-id-tbl.o
+GETTOBJS = intl-compat.o
DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
xopen-msg.sed $(HEADERS) $(SOURCES)
DISTFILES.normal = VERSION
@@ -83,7 +83,7 @@ INCLUDES = -I.. -I. -I$(top_srcdir)/intl
all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la intlh.inst
+all-yes: libintl.a
all-no:
libintl.a: $(OBJECTS)
@@ -95,8 +95,8 @@ libintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-version-info 1:0 -rpath $(libdir)
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
- cd ../po && $(MAKE) cat-id-tbl.$lo
+../po/cat-id-tbl.o: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
+ cd ../po && $(MAKE) cat-id-tbl.o
check: all
@@ -151,8 +151,8 @@ uninstall:
info dvi:
$(OBJECTS): ../config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
+bindtextdom.o finddomain.o loadmsgcat.o: gettextP.h gettext.h loadinfo.h
+dcgettext.o: gettextP.h gettext.h hash-string.h loadinfo.h
tags: TAGS

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2002/02/05 18:04:11 espie Exp $
--- po/Makefile.in.in.orig Sat Feb 17 04:46:32 2001
+++ po/Makefile.in.in Sun May 20 16:47:27 2001
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -123,7 +123,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +171,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

View File

@ -6,8 +6,6 @@ Packages can be built with additional FLAVORs:
gnome: SoundTracker built with gnome libraries. This is required
by the graphical volume/panning envelope editors.
sun: SoundTracker built with our native audio driver.
esd: SoundTracker built with the esound package.
WWW: ${HOMEPAGE}

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/02/05 18:04:10 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/05/30 09:08:28 wcobb Exp $
bin/soundtracker
share/doc/soundtracker/FAQ
share/doc/soundtracker/NEWS
share/doc/soundtracker/README
share/doc/soundtracker/hacking.txt
share/doc/soundtracker/xi.txt
share/doc/soundtracker/xm.txt
share/locale/de/LC_MESSAGES/soundtracker.mo