From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 13 23:30:31 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A553016A4CE for ; Sat, 13 Nov 2004 23:30:31 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4527F43D55 for ; Sat, 13 Nov 2004 23:30:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) iADNUTSo033713 for ; Sat, 13 Nov 2004 23:30:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iADNUTHx033704; Sat, 13 Nov 2004 23:30:29 GMT (envelope-from gnats) Resent-Date: Sat, 13 Nov 2004 23:30:29 GMT Resent-Message-Id: <200411132330.iADNUTHx033704@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Peter Johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE7CF16A4CE for ; Sat, 13 Nov 2004 23:26:02 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D87243D54 for ; Sat, 13 Nov 2004 23:26:02 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.11/8.12.11) with ESMTP id iADNQ2YQ011425 for ; Sat, 13 Nov 2004 23:26:02 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.11/8.12.11/Submit) id iADNQ2BI011408; Sat, 13 Nov 2004 23:26:02 GMT (envelope-from nobody) Message-Id: <200411132326.iADNQ2BI011408@www.freebsd.org> Date: Sat, 13 Nov 2004 23:26:02 GMT From: Peter Johnson To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/73917: [PATCH] Update audio/cheesetracker to 0.9.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 23:30:31 -0000 >Number: 73917 >Category: ports >Synopsis: [PATCH] Update audio/cheesetracker to 0.9.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Nov 13 23:30:29 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Peter Johnson >Release: 5.3-STABLE >Organization: >Environment: 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Nov6 18:13:18 PST 2004 >Description: Cheesetracker 0.9.9 was released on 4-22-04. >How-To-Repeat: audio/cheesetracker port is still at 0.9.1. >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/cheesetracker/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 26 Feb 2004 21:08:47 -0000 1.20 +++ Makefile 13 Nov 2004 23:10:23 -0000 @@ -7,8 +7,7 @@ # PORTNAME= cheesetracker -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.9.9 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cheesetronic @@ -17,25 +16,20 @@ COMMENT= An Impulse Tracker clone BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \ - qmake:${PORTSDIR}/devel/qmake + scons:${PORTSDIR}/devel/scons LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 USE_QT_VER= 3 -MAKE_ENV= QTDIR="${QT_PREFIX}" -post-patch: - @${CP} ${FILESDIR}/cheesetracker.pro ${WRKSRC} - -do-configure: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \ - -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ cheesetracker.pro +do-build: + @cd ${WRKSRC} && scons do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker/program__QT/cheesetracker_qt ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.it ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.xm ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.it ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.xm ${EXAMPLESDIR} .endif .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/audio/cheesetracker/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 27 Jan 2004 20:50:48 -0000 1.7 +++ distinfo 13 Nov 2004 23:10:23 -0000 @@ -1,2 +1,2 @@ -MD5 (cheesetracker-0.9.1.tar.gz) = 3bf109b9733485ad760b636e4791e0c5 -SIZE (cheesetracker-0.9.1.tar.gz) = 960168 +MD5 (cheesetracker-0.9.9.tar.gz) = d2cb55cd35eaaaef48454a5aad41a08d +SIZE (cheesetracker-0.9.9.tar.gz) = 842246 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/cheesetracker/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 30 Jan 2004 12:36:05 -0000 1.3 +++ pkg-plist 13 Nov 2004 23:10:23 -0000 @@ -1,4 +1,4 @@ -bin/cheesetracker +bin/cheesetracker_qt %%PORTDOCS%%%%EXAMPLESDIR%%/beek-dolphinisland.it %%PORTDOCS%%%%EXAMPLESDIR%%/ll-globule.it %%PORTDOCS%%%%EXAMPLESDIR%%/reduz-maschizo.it Index: files/cheesetracker.pro =================================================================== RCS file: files/cheesetracker.pro diff -N files/cheesetracker.pro --- files/cheesetracker.pro 31 Oct 2003 21:55:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,202 +0,0 @@ -TEMPLATE = app -CONFIG = qt warn_on thread release -TERGET = cheesetracker - -DEFINES = POSIX_ENABLED OSS_ENABLED LADSPA_ENABLED -LIBS = -L${LOCALBASE}/lib -lsigc-1.2 -INCLUDEPATH = common \ - common/components/audio \ - common/components/data \ - common/components/midi \ - common/defines \ - trackercore \ - loaders \ - savers \ - ${LOCALBASE}/lib/sigc++-1.2/include \ - ${LOCALBASE}/include/sigc++-1.2 \ - ${LOCALBASE}/include - -HEADERS = \ - common/interface__QT/helpers/property_bridge_edit.h \ - common/interface__QT/helpers/cspinbutton.h \ - common/interface__QT/helpers/ccolor_bridge.h \ - common/interface__QT/helpers/ccolor_list.h \ - common/interface__QT/helpers/font_bridge.h \ - common/interface__QT/helpers/keyboard_input_config.h \ - common/interface__QT/audio/audio_config.h \ - common/interface__QT/audio/sample_editor.h \ - common/interface__QT/audio/sample_editor_format.h \ - common/interface__QT/audio/sample_viewer.h \ - common/interface__QT/audio/sample_viewer_zoom.h \ - common/interface__QT/audio/envelope_point_editor.h \ - common/interface__QT/audio/envelope_editor.h \ - common/interface__QT/audio/resampler_config.h \ - common/interface__QT/audio/note_bridge.h \ - common/interface__QT/audio/sample_editor_clipboard.h \ - common/interface__QT/audio/sample_editor_effects.h \ - common/interface__QT/audio/mixer_effects_manager.h \ - common/interface__QT/audio/effect_chain_editor.h \ - common/interface__QT/popups/effect_select_popup.h \ - interface__QT/pattern_edit.h \ - interface__QT/pattern_edit_widget.h \ - interface__QT/sample_edit.h \ - interface__QT/instrument_edit.h \ - interface__QT/interface.h \ - interface__QT/order_and_defaults_editor.h \ - interface__QT/variables_edit.h \ - interface__QT/mdi_main_window.h \ - interface__QT/sample_player_fdialog.h - -SOURCES = \ - common/plugins/effects/custom/dummy_effect.cpp \ - common/plugins/effects/custom/chorus_effect.cpp \ - common/plugins/effects/custom/freeverb_effect.cpp \ - common/plugins/effects/custom/effect_amp.cpp \ - common/plugins/effects/custom/effect_distort.cpp \ - common/plugins/effects/custom/effect_echo.cpp \ - common/plugins/effects/custom/effect_stereo_enhancer.cpp \ - common/plugins/effects/freeverb/allpass.cpp \ - common/plugins/effects/freeverb/comb.cpp \ - common/plugins/effects/freeverb/revmodel.cpp \ - common/plugins/effects/ladspa/ladspa_effect_source.cpp \ - common/plugins/effects/ladspa/ladspa_effect.cpp \ - common/plugins/edit_effects/simple_edit_effects.cpp \ - common/plugins/resamplers/resampler_raw.cpp \ - common/plugins/resamplers/resampler_linear.cpp \ - common/plugins/resamplers/resampler_dummy.cpp \ - common/os/mutex_lock.cpp \ - common/os/threaded_class.cpp \ - common/os/path_data.cpp \ - common/os/timer.cpp \ - common/components/audio/sound_driver_manager.cpp \ - common/components/audio/effect.cpp \ - common/components/audio/sound_driver.cpp \ - common/components/audio/mixer.cpp \ - common/components/audio/voice.cpp \ - common/components/audio/lfo.cpp \ - common/components/audio/envelope.cpp \ - common/components/audio/midi_voice.cpp \ - common/components/audio/resampler.cpp \ - common/components/audio/resampler_manager.cpp \ - common/components/audio/resampler_instance.cpp \ - common/components/audio/sample_data.cpp \ - common/components/audio/sample_conversion.cpp \ - common/components/audio/mixer_base.cpp \ - common/components/audio/mixer__buffers.cpp \ - common/components/audio/ring_buffer.cpp \ - common/components/audio/tables.cpp \ - common/components/audio/edit_effect.cpp \ - common/components/audio/effect_source_internal.cpp \ - common/components/audio/effect_source_manager.cpp \ - common/components/audio/effect_chain.cpp \ - common/components/audio/sound_driver_dummy.cpp \ - common/components/audio/dds_helpers.cpp \ - common/components/midi/midi_client.cpp \ - common/components/midi/midi_out_device.cpp \ - common/components/midi/midioutdevicemanager.cpp \ - common/components/midi/engine.cpp \ - common/components/midi/engine_manager.cpp \ - common/components/midi/midi_control.cpp \ - common/components/midi/midi_control_base.cpp \ - common/components/file/file_access.cpp \ - common/components/file/file_browser.cpp \ - common/components/data/property_bridges.cpp \ - common/components/data/config_handler.cpp \ - common/components/data/keyboard_input.cpp \ - common/components/data/selection.cpp \ - common/components/data/dds.cpp \ - common/components/data/dds_packer.cpp \ - common/drivers/posix/timer_rtc.cpp \ - common/drivers/posix/timer_sigalarm.cpp \ - common/drivers/posix/sound_driver_jack.cpp \ - common/drivers/posix/sound_driver_oss.cpp \ - common/drivers/posix/midi_out_device_alsa.cpp \ - common/drivers/posix/midi_out_device_oss.cpp \ - common/drivers/rtaudio/rt_audio.cpp \ - common/drivers/rtaudio/sound_driver_rtaudio.cpp \ - common/interface__QT/helpers/property_bridge_edit.cpp \ - common/interface__QT/helpers/cspinbutton.cpp \ - common/interface__QT/helpers/clist_manager.cpp \ - common/interface__QT/helpers/vertical_scrolled_window.cpp \ - common/interface__QT/helpers/ccolor_panel.cpp \ - common/interface__QT/helpers/ccolor_bridge.cpp \ - common/interface__QT/helpers/ccolor_list.cpp \ - common/interface__QT/helpers/font_bridge.cpp \ - common/interface__QT/helpers/keyboard_input_config.cpp \ - common/interface__QT/helpers/property_bridge_edit_list.cpp \ - common/interface__QT/audio/audio_config.cpp \ - common/interface__QT/audio/sample_viewer.cpp \ - common/interface__QT/audio/sample_viewer_zoom.cpp \ - common/interface__QT/audio/sample_editor.cpp \ - common/interface__QT/audio/sample_editor_format.cpp \ - common/interface__QT/audio/envelope_point_editor.cpp \ - common/interface__QT/audio/envelope_editor.cpp \ - common/interface__QT/audio/resampler_config.cpp \ - common/interface__QT/audio/note_bridge.cpp \ - common/interface__QT/audio/sample_editor_clipboard.cpp \ - common/interface__QT/audio/sample_editor_effects.cpp \ - common/interface__QT/audio/mixer_effects_manager.cpp \ - common/interface__QT/audio/effect_chain_editor.cpp \ - common/interface__QT/popups/cspindialog.cpp \ - common/interface__QT/popups/text_area_popup.cpp \ - common/interface__QT/popups/effect_select_popup.cpp \ - trackercore/file_format_manager.cpp \ - trackercore/file_reader.cpp \ - trackercore/file_writer.cpp \ - trackercore/instrument.cpp \ - trackercore/loader.cpp \ - trackercore/pattern.cpp \ - trackercore/player_data.cpp \ - trackercore/player_data_control.cpp \ - trackercore/player_data_effects.cpp \ - trackercore/player_data_envelopes.cpp \ - trackercore/player_data_events.cpp \ - trackercore/player_data_nna.cpp \ - trackercore/player_data_notes.cpp \ - trackercore/player_data_reserved.cpp \ - trackercore/player_data_utils.cpp \ - trackercore/sample.cpp \ - trackercore/saver.cpp \ - trackercore/song.cpp \ - trackercore/player_data_filter.cpp \ - trackercore/tracker_voice.cpp \ - trackercore/voice_control.cpp \ - trackercore/freq_conversion.cpp \ - trackercore/channel_control.cpp \ - loaders/loader_it.cpp \ - loaders/loader_it_info.cpp \ - loaders/loader_it_instruments.cpp \ - loaders/loader_it_patterns.cpp \ - loaders/loader_it_samples.cpp \ - loaders/loader_s3m.cpp \ - loaders/loader_wav.cpp \ - loaders/loader_xm.cpp \ - loaders/loader_ct.cpp \ - savers/saver_ct.cpp \ - savers/saver_it.cpp \ - savers/saver_raw.cpp \ - savers/saver_wav.cpp \ - interface_binds/editor_commands.cpp \ - interface_binds/editor.cpp \ - interface_binds/editor_insertion.cpp \ - interface_binds/editor_orderlist.cpp \ - interface_binds/editor_selection.cpp \ - interface_binds/editor_undo.cpp \ - interface_binds/tracker_instance.cpp \ - interface_binds/player_rt_keyboard.cpp \ - interface__QT/sample_edit.cpp \ - interface__QT/instrument_edit.cpp \ - interface__QT/interface.cpp \ - interface__QT/variables_edit.cpp \ - interface__QT/order_and_defaults_editor.cpp \ - interface__QT/mdi_main_window.cpp \ - interface__QT/settings_window.cpp \ - interface__QT/pattern_edit.cpp \ - interface__QT/pattern_edit__keys.cpp \ - interface__QT/orderlist_edit.cpp \ - interface__QT/sample_instrument_table.cpp \ - interface__QT/pattern_edit_widget.cpp \ - interface__QT/table_base.cpp \ - interface__QT/sample_player_fdialog.cpp \ - program__QT/cheesetracker_qt.cpp - Index: files/patch-SConstruct =================================================================== RCS file: files/patch-SConstruct diff -N files/patch-SConstruct --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-SConstruct 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,20 @@ +--- SConstruct.orig Thu Apr 22 22:51:57 2004 ++++ SConstruct Sat Nov 13 13:25:12 2004 +@@ -70,7 +70,6 @@ + #env.gtkmm_libs=gtkmm_libs; + + env.Append(CXXFLAGS=env.detect.sigc_flags); +-env.Append(CXXFLAGS=env.detect.dl_flags); + + #detect OSS + +@@ -141,9 +140,6 @@ + + env.common_libs=[]; + env.process_moc_list=process_moc_list; +-env.dl_flags = env.detect.dl_flags +-env.dl_libs = env.detect.dl_libs +-env.dl_link_flags = env.detect.dl_link_flags + env.qt_flags = env.detect.qt_flags + env.qt_libs = env.detect.qt_libs + env.sigc_flags=env.detect.sigc_flags Index: files/patch-cheesetracker::program__QT::SCsub =================================================================== RCS file: files/patch-cheesetracker::program__QT::SCsub diff -N files/patch-cheesetracker::program__QT::SCsub --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-cheesetracker::program__QT::SCsub 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,14 @@ +--- cheesetracker/program__QT/SCsub.orig Thu Apr 22 20:21:33 2004 ++++ cheesetracker/program__QT/SCsub Sat Nov 13 13:26:27 2004 +@@ -33,11 +33,6 @@ + env2.Append(LIBS=env2.detect.sigc_libs); + env2.Append(CXXFLAGS = env2.detect.sigc_flags); + +-# libdl +-env2.Append(CXXFLAGS=env2.detect.dl_flags); +-env2.Append(LIBS=env2.detect.dl_libs); +-env2.Append(LINKFLAGS=env2.detect.dl_link_flags); +- + # JACK + if (env2.detect.has_jack): + env2.Append(LIBS=env2.detect.jack_libs); Index: files/patch-common::components::audio::sample_conversion.cpp =================================================================== RCS file: files/patch-common::components::audio::sample_conversion.cpp diff -N files/patch-common::components::audio::sample_conversion.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common::components::audio::sample_conversion.cpp 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,12 @@ +--- common/components/audio/sample_conversion.cpp.orig Thu Apr 22 20:21:22 2004 ++++ common/components/audio/sample_conversion.cpp Sat Nov 13 14:20:41 2004 +@@ -18,6 +18,9 @@ + + #include + ++#if defined(__FreeBSD__) ++ #define lrintf(flt) ((int) (flt)) ++#endif + + void convert_32s_stereo_to_16s_stereo(sample_16s_t * p_dst, sample_32s_t *p_src, int p_amount) { + Index: files/patch-common::components::audio::sample_data.cpp =================================================================== RCS file: files/patch-common::components::audio::sample_data.cpp diff -N files/patch-common::components::audio::sample_data.cpp --- files/patch-common::components::audio::sample_data.cpp 17 Sep 2004 07:08:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- common/components/audio/sample_data.cpp.orig Thu Sep 16 18:34:33 2004 -+++ common/components/audio/sample_data.cpp Thu Sep 16 18:40:05 2004 -@@ -325,7 +325,7 @@ - - if (is_16bits) { - -- (void*)new_sample_8bits=malloc(size); -+ new_sample_8bits=(Sint8*)malloc(size); - if (new_sample_8bits==NULL) { - - ERROR("Cannot convert sample! not enough memory?"); -@@ -339,7 +339,7 @@ - } else { - - Sint8 *sample_8bits_ptr=(Sint8*)data_ptr; -- (void*)new_sample_16bits=malloc(size*2); -+ new_sample_16bits=(Sint16*)malloc(size*2); - if (new_sample_16bits==NULL) { - - ERROR("Cannot convert sample! not enough memory?"); Index: files/patch-common::components::file::file_access.cpp =================================================================== RCS file: files/patch-common::components::file::file_access.cpp diff -N files/patch-common::components::file::file_access.cpp --- files/patch-common::components::file::file_access.cpp 17 Sep 2004 07:08:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- common/components/file/file_access.cpp.orig Fri Sep 17 10:37:01 2004 -+++ common/components/file/file_access.cpp Fri Sep 17 10:37:23 2004 -@@ -164,7 +164,7 @@ - - for (i=0;i -+#include - - /** - *@author Juan Linietsky Index: files/patch-common::drivers::posix::sound_driver_oss.cpp =================================================================== RCS file: files/patch-common::drivers::posix::sound_driver_oss.cpp diff -N files/patch-common::drivers::posix::sound_driver_oss.cpp --- files/patch-common::drivers::posix::sound_driver_oss.cpp 17 Sep 2004 07:08:13 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ ---- common/drivers/posix/sound_driver_oss.cpp.orig Mon Jun 23 10:06:42 2003 -+++ common/drivers/posix/sound_driver_oss.cpp Fri Jul 11 11:49:31 2003 -@@ -40,6 +40,14 @@ - - #define DEFAULT_AUDIO_DEVICE "/dev/dsp" - -+#if !defined(AFMT_S16_NE) -+#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN) -+#define AFMT_S16_NE AFMT_S16_BE -+#else -+#define AFMT_S16_NE AFMT_S16_LE -+#endif -+#endif -+ - - bool Sound_Driver_OSS::does_perform_disk_write() { - -@@ -154,7 +162,7 @@ - - - -- (void*)audiobuffer=calloc(1,buffinf.fragsize); -+ audiobuffer=(Sint8*)calloc(1,buffinf.fragsize); - - if ( audiobuffer==NULL ) { - Index: files/patch-common::drivers::posix::tcp_client_posix.cpp =================================================================== RCS file: files/patch-common::drivers::posix::tcp_client_posix.cpp diff -N files/patch-common::drivers::posix::tcp_client_posix.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common::drivers::posix::tcp_client_posix.cpp 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,27 @@ +--- common/drivers/posix/tcp_client_posix.cpp.orig Thu Apr 22 20:21:26 2004 ++++ common/drivers/posix/tcp_client_posix.cpp Sat Nov 13 14:30:57 2004 +@@ -2,6 +2,10 @@ + + #include "tcp_client_posix.h" + ++#if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL) ++#define MSG_NOSIGNAL 0 ++#endif ++ + #define INFO(a,b) WARN(a b) + + void TcpClientPosix::connect_to_host(string p_host,int p_port) { +@@ -33,6 +37,13 @@ + return; + } + fcntl(sockfd, F_SETFL, O_NONBLOCK); ++#ifdef SO_NOSIGPIPE ++ { ++ int onoff = 1; ++ if (setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&onoff, sizeof(onoff)) < 0) ++ INFO("TCP Client Posix","Could not set SO_NOSIGPIPE"); ++ } ++#endif + INFO("TCP Client Posix","Connected!\n"); + } + Index: files/patch-common::drivers::posix::tcp_server_posix.cpp =================================================================== RCS file: files/patch-common::drivers::posix::tcp_server_posix.cpp diff -N files/patch-common::drivers::posix::tcp_server_posix.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common::drivers::posix::tcp_server_posix.cpp 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,28 @@ +--- common/drivers/posix/tcp_server_posix.cpp.orig Thu Apr 22 20:21:26 2004 ++++ common/drivers/posix/tcp_server_posix.cpp Sat Nov 13 14:33:23 2004 +@@ -2,6 +2,10 @@ + + #include "tcp_server_posix.h" + ++#if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL) ++#define MSG_NOSIGNAL 0 ++#endif ++ + bool TcpServerPosix::start_listening() { + + int yes=1; +@@ -34,7 +38,13 @@ + return false; + } + fcntl(listen_fd, F_SETFL, O_NONBLOCK); +- ++#ifdef SO_NOSIGPIPE ++ { ++ int onoff = 1; ++ if (setsockopt(listen_fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&onoff, sizeof(onoff)) < 0) ++ printf("Server: Could not set SO_NOSIGPIPE\n"); ++ } ++#endif + return true; + } + Index: files/patch-common::drivers::posix::timer_sigalarm.cpp =================================================================== RCS file: files/patch-common::drivers::posix::timer_sigalarm.cpp diff -N files/patch-common::drivers::posix::timer_sigalarm.cpp --- files/patch-common::drivers::posix::timer_sigalarm.cpp 17 Sep 2004 07:08:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- common/drivers/posix/timer_sigalarm.cpp.orig Fri Sep 17 10:49:31 2004 -+++ common/drivers/posix/timer_sigalarm.cpp Fri Sep 17 10:50:25 2004 -@@ -67,7 +67,7 @@ - - Timer_SigAlarm *dangit; - -- (void*)dangit=data; -+ dangit=(Timer_SigAlarm*)data; - - dangit->callback(); - Index: files/patch-common::drivers::rtaudio::rt_audio.cpp =================================================================== RCS file: files/patch-common::drivers::rtaudio::rt_audio.cpp diff -N files/patch-common::drivers::rtaudio::rt_audio.cpp --- files/patch-common::drivers::rtaudio::rt_audio.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- common/drivers/rtaudio/rt_audio.cpp.orig Mon Jun 30 12:29:43 2003 -+++ common/drivers/rtaudio/rt_audio.cpp Thu Oct 30 12:04:02 2003 -@@ -68,6 +68,10 @@ - #define MUTEX_UNLOCK(A) pthread_mutex_unlock(A) - #endif - -+#if defined(__FreeBSD__) -+ #define O_SYNC O_FSYNC -+#endif -+ - // *************************************************** // - // - // Public common (OS-independent) methods. Index: files/patch-common::interface__QT::audio::sample_editor_format.cpp =================================================================== RCS file: files/patch-common::interface__QT::audio::sample_editor_format.cpp diff -N files/patch-common::interface__QT::audio::sample_editor_format.cpp --- files/patch-common::interface__QT::audio::sample_editor_format.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- common/interface__QT/audio/sample_editor_format.cpp.orig Fri Oct 24 06:29:26 2003 -+++ common/interface__QT/audio/sample_editor_format.cpp Thu Oct 30 12:05:50 2003 -@@ -36,6 +36,11 @@ - #include "interface__QT/icons/transp_semitone_up.xpm" - #include - #include -+#include -+ -+#if defined(__FreeBSD__) -+ #define round(c) rint(c) -+#endif - - void Sample_Editor_Format::transpose_up_1_4_cbk() { - Index: files/patch-common::plugins::edit_effects::simple_edit_effects.cpp =================================================================== RCS file: files/patch-common::plugins::edit_effects::simple_edit_effects.cpp diff -N files/patch-common::plugins::edit_effects::simple_edit_effects.cpp --- files/patch-common::plugins::edit_effects::simple_edit_effects.cpp 17 Sep 2004 07:08:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- common/plugins/edit_effects/simple_edit_effects.cpp.orig Thu Sep 16 18:31:23 2004 -+++ common/plugins/edit_effects/simple_edit_effects.cpp Thu Sep 16 18:32:09 2004 -@@ -27,6 +27,7 @@ - // - - #include "simple_edit_effects.h" -+#include - - /*********************************** - REVERSE Index: files/patch-common::plugins::effects::custom::chorus_effect.cpp =================================================================== RCS file: /home/ncvs/ports/audio/cheesetracker/files/patch-common::plugins::effects::custom::chorus_effect.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-common::plugins::effects::custom::chorus_effect.cpp --- files/patch-common::plugins::effects::custom::chorus_effect.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ files/patch-common::plugins::effects::custom::chorus_effect.cpp 13 Nov 2004 23:10:23 -0000 @@ -1,19 +1,17 @@ ---- common/plugins/effects/custom/chorus_effect.cpp.orig Sun Oct 26 05:07:38 2003 -+++ common/plugins/effects/custom/chorus_effect.cpp Thu Oct 30 12:00:04 2003 -@@ -10,10 +10,16 @@ +--- common/plugins/effects/custom/chorus_effect.cpp.orig Thu Apr 22 20:21:14 2004 ++++ common/plugins/effects/custom/chorus_effect.cpp Sat Nov 13 14:16:40 2004 +@@ -10,10 +10,14 @@ // // #include "chorus_effect.h" +#include - #define FRACTIONAL_BITS 13 #define MIX_CALCULATE_INCREMENT_INTERVAL 8 -+ + +#if defined(__FreeBSD__) + #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) +#endif - inline static double get_msecs_from_samples(double p_samples,double p_mixfreq) { + Index: files/patch-common::plugins::effects::custom::effect_distortion.cpp =================================================================== RCS file: files/patch-common::plugins::effects::custom::effect_distortion.cpp diff -N files/patch-common::plugins::effects::custom::effect_distortion.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common::plugins::effects::custom::effect_distortion.cpp 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,13 @@ +--- common/plugins/effects/custom/effect_distortion.cpp.orig Thu Apr 22 20:21:14 2004 ++++ common/plugins/effects/custom/effect_distortion.cpp Sat Nov 13 14:19:05 2004 +@@ -11,6 +11,10 @@ + // + #include "effect_distortion.h" + ++#if defined(__FreeBSD__) ++ #define lrintf(flt) ((int) (flt)) ++#endif ++ + inline static double get_samples_from_msecs(double p_msecs,double p_mixfreq) { + + return (p_msecs*p_mixfreq)/1000.0; Index: files/patch-common::plugins::effects::custom::effect_pshift.cpp =================================================================== RCS file: files/patch-common::plugins::effects::custom::effect_pshift.cpp diff -N files/patch-common::plugins::effects::custom::effect_pshift.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common::plugins::effects::custom::effect_pshift.cpp 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,13 @@ +--- common/plugins/effects/custom/effect_pshift.cpp.orig Thu Apr 22 23:20:03 2004 ++++ common/plugins/effects/custom/effect_pshift.cpp Sat Nov 13 14:18:00 2004 +@@ -12,6 +12,10 @@ + #include "effect_pshift.h" + #include "math.h" + ++#if defined(__FreeBSD__) ++ #define lrint(flt) ((int) (flt)) ++ #define lrintf(flt) ((int) (flt)) ++#endif + + void Effect_PShift::reset() { + Index: files/patch-common::plugins::effects::custom::freeverb_effect.cpp =================================================================== RCS file: files/patch-common::plugins::effects::custom::freeverb_effect.cpp diff -N files/patch-common::plugins::effects::custom::freeverb_effect.cpp --- files/patch-common::plugins::effects::custom::freeverb_effect.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- common/plugins/effects/custom/freeverb_effect.cpp.orig Sun Oct 26 05:07:38 2003 -+++ common/plugins/effects/custom/freeverb_effect.cpp Thu Oct 30 12:00:43 2003 -@@ -14,6 +14,11 @@ - - #define REVERB_SOFT_BITS 16 - -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif -+ - void Freeverb_Effect::check_params_changed() { - - if ( Index: files/patch-common::plugins::effects::ladspa::SCsub =================================================================== RCS file: files/patch-common::plugins::effects::ladspa::SCsub diff -N files/patch-common::plugins::effects::ladspa::SCsub --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common::plugins::effects::ladspa::SCsub 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,11 @@ +--- common/plugins/effects/ladspa/SCsub.orig Thu Apr 22 20:21:13 2004 ++++ common/plugins/effects/ladspa/SCsub Sat Nov 13 13:26:02 2004 +@@ -2,8 +2,4 @@ + Import('env'); + env2=env.Copy(); + +-env2.Append(CXXFLAGS=env2.dl_flags); +-env2.Append(LIBS=env2.dl_libs); +-env2.Append(LINKFLAGS=env2.dl_link_flags); +- + env2.make_targets(env.common_objects) Index: files/patch-common::plugins::effects::ladspa::ladspa_effect.cpp =================================================================== RCS file: files/patch-common::plugins::effects::ladspa::ladspa_effect.cpp diff -N files/patch-common::plugins::effects::ladspa::ladspa_effect.cpp --- files/patch-common::plugins::effects::ladspa::ladspa_effect.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- common/plugins/effects/ladspa/ladspa_effect.cpp.orig Sun Oct 26 05:07:38 2003 -+++ common/plugins/effects/ladspa/ladspa_effect.cpp Thu Oct 30 12:01:23 2003 -@@ -18,6 +18,11 @@ - #include - #include - -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif -+ - - void LADSPA_Effect::reset() { - Index: files/patch-common::plugins::effects::ladspa::ladspa_effect_source.cpp =================================================================== RCS file: files/patch-common::plugins::effects::ladspa::ladspa_effect_source.cpp diff -N files/patch-common::plugins::effects::ladspa::ladspa_effect_source.cpp --- files/patch-common::plugins::effects::ladspa::ladspa_effect_source.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- common/plugins/effects/ladspa/ladspa_effect_source.cpp.orig Fri Oct 24 12:47:05 2003 -+++ common/plugins/effects/ladspa/ladspa_effect_source.cpp Wed Oct 29 22:14:50 2003 -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - - int LADSPA_Effect_Source::get_effect_count() { Index: files/patch-common::plugins::resamplers::helpers.h =================================================================== RCS file: files/patch-common::plugins::resamplers::helpers.h diff -N files/patch-common::plugins::resamplers::helpers.h --- files/patch-common::plugins::resamplers::helpers.h 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- common/plugins/resamplers/helpers.h.orig Sun Oct 26 04:16:26 2003 -+++ common/plugins/resamplers/helpers.h Thu Oct 30 12:02:04 2003 -@@ -17,6 +17,11 @@ - #define HELPERS_H - - -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif -+ - //hardcoded for now! - #define FILTER_BITS 12 - #define RAMP_BITS 11 Index: files/patch-detect.py =================================================================== RCS file: files/patch-detect.py diff -N files/patch-detect.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-detect.py 13 Nov 2004 23:10:23 -0000 @@ -0,0 +1,51 @@ +--- detect.py.orig Thu Apr 22 20:21:08 2004 ++++ detect.py Sat Nov 13 13:25:02 2004 +@@ -47,38 +47,6 @@ + return 0; + + +-def check_libdl(libdata): +- +- print "Checking for libdl..."; +- dl_search_dirs=[ \ +- "/sw", \ +- "/usr", \ +- "/usr/local", \ +- ]; +- +- # search for extra include dirs to add +- for x in dl_search_dirs: +- if (os.path.isfile(x + "/include/dlfcn.h")): +- print "Found dlfcn.h in " + x + "/include"; +- libdata.dl_flags=["-I" + x + "/include"]; +- break; +- +- f=open("test.cpp","w"); +- f.write("#include \n#include \nint main() { printf(\"Testing dlfcn.\"); return 0; }\n"); +- f.close(); +- +- for x in dl_search_dirs: +- execline="c++ -L" + x + "/lib " + libdata.dl_flags[0] + " test.cpp -o test -ldl 2>>config_errors.log"; +- res=os.system(execline); +- +- if (res == 0): +- libdata.dl_libs=['dl']; +- libdata.dl_link_flags=["-L" + x + "/lib"]; +- os.system("rm test.cpp"); +- os.system("rm test"); +- return 0; +- return 1; +- + def check_alsa(libdata): + + print "Checking for ALSA..."; +@@ -371,9 +339,6 @@ + + if (read_dep_cache(libdata)): + return 0; +- +- if ( check_libdl(libdata) ): +- return 1; + + if ( check_pkg_config() ): + return 1; Index: files/patch-interface_binds::editor.cpp =================================================================== RCS file: files/patch-interface_binds::editor.cpp diff -N files/patch-interface_binds::editor.cpp --- files/patch-interface_binds::editor.cpp 17 Sep 2004 07:08:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- interface_binds/editor.cpp.orig Fri Sep 17 11:15:06 2004 -+++ interface_binds/editor.cpp Fri Sep 17 11:30:35 2004 -@@ -358,7 +358,7 @@ - - void Editor::set_note_increment_table(Uint8* p_table) { - -- (Uint8*)note_increments=p_table; -+ note_increments=(char*)p_table; - - } - Index: files/patch-trackercore::tracker_voice.cpp =================================================================== RCS file: files/patch-trackercore::tracker_voice.cpp diff -N files/patch-trackercore::tracker_voice.cpp --- files/patch-trackercore::tracker_voice.cpp 31 Oct 2003 21:55:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- trackercore/tracker_voice.cpp.orig Sun Oct 26 05:00:37 2003 -+++ trackercore/tracker_voice.cpp Thu Oct 30 12:02:37 2003 -@@ -16,6 +16,11 @@ - - #include "tracker_voice.h" - -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif -+ - - int Tracker_Voice::get_current_freq() { - >Release-Note: >Audit-Trail: >Unformatted: