From owner-freebsd-ports Sat Dec 28 13:13:12 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36BD337B640 for ; Sat, 28 Dec 2002 13:11:43 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5830844129 for ; Sat, 28 Dec 2002 13:10:08 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBSLA7NS066278 for ; Sat, 28 Dec 2002 13:10:07 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBSLA7J1066271; Sat, 28 Dec 2002 13:10:07 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24A5737B401 for ; Sat, 28 Dec 2002 13:03:11 -0800 (PST) Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9E2943EB2 for ; Sat, 28 Dec 2002 13:03:06 -0800 (PST) (envelope-from tkato@prontomail.com) Received: from localhost (localhost [127.0.0.1]) by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id 55E5125E for ; Sun, 29 Dec 2002 06:02:54 +0900 (JST) Message-Id: <20021229060048.4dca8f41.tkato@prontomail.com> Date: Sun, 29 Dec 2002 06:00:48 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46598: Update port: audio/cheesetracker Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46598 >Category: ports >Synopsis: Update port: audio/cheesetracker >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 28 13:10:07 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.7-RELEASE-p2 i386 >Organization: >Environment: >Description: - Fix build on 5-current New file: files/patch-interface_gtk::interface_widget_envelope.cpp files/patch-interface_gtk::properties.h files/patch-trackercore::loader_it.cpp files/patch-trackercore::loader_s3m.cpp files/patch-trackercore::loader_xm.cpp files/patch-trackercore::mixer_procedure.h files/patch-trackercore::nsf_export.cpp files/patch-trackercore::pattern.h files/patch-trackercore::player_data.cpp files/patch-trackercore::player_data_effects.cpp files/patch-trackercore::sample.cpp files/patch-trackercore::typedefs.h >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/cheesetracker/Makefile audio/cheesetracker/Makefile --- /usr/ports/audio/cheesetracker/Makefile Thu Dec 26 19:00:58 2002 +++ audio/cheesetracker/Makefile Sun Dec 29 01:22:42 2002 @@ -14,20 +14,24 @@ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/share/automake14/install-sh:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= sigc:${PORTSDIR}/devel/libsigc++ \ - gtkmm:${PORTSDIR}/x11-toolkits/gtk-- +LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- -GNU_CONFIGURE= yes -USE_GMAKE= yes USE_REINPLACE= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 +USE_GMAKE= yes +GNU_CONFIGURE= yes +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ + AUTOHEADER="${TRUE}" + +post-patch: + @${REINPLACE_CMD} -e 's|[$$]CXXFLAGS_OPT |\$$CXXFLAGS |g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|AFMT_S16_NE|AFMT_S16_LE|g' ${WRKSRC}/waveout/sound_driver_oss.cpp pre-configure: .for file in install-sh missing mkinstalldirs - @${LN} -sf ${LOCALBASE}/share/automake14/automake/${file} ${WRKSRC} + @${LN} -sf ${LOCALBASE}/share/automake14/${file} ${WRKSRC} .endfor @${RM} -f ${WRKSRC}/config.cache - -post-patch: - @${REINPLACE_CMD} -e "s,AFMT_S16_NE,AFMT_S16_LE,g" ${WRKSRC}/waveout/sound_driver_oss.cpp .include diff -urN /usr/ports/audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp --- /usr/ports/audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- interface_gtk/interface_widget_envelope.cpp.orig Sun Jan 20 23:56:00 2002 ++++ interface_gtk/interface_widget_envelope.cpp Fri Dec 27 21:58:41 2002 +@@ -373,7 +373,7 @@ + node_x=get_point_x(i); + node_y=get_point_y(i); + +- dist=(int)sqrt((p_node_x-node_x)*(p_node_x-node_x)+(p_node_y-node_y)*(p_node_y-node_y)); ++ dist=(int)sqrt((double)((p_node_x-node_x)*(p_node_x-node_x)+(p_node_y-node_y)*(p_node_y-node_y))); + + if (dist<6) { + diff -urN /usr/ports/audio/cheesetracker/files/patch-interface_gtk::properties.h audio/cheesetracker/files/patch-interface_gtk::properties.h --- /usr/ports/audio/cheesetracker/files/patch-interface_gtk::properties.h Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-interface_gtk::properties.h Sun Dec 29 01:44:57 2002 @@ -0,0 +1,18 @@ +--- interface_gtk/properties.h.orig Thu Apr 11 02:39:58 2002 ++++ interface_gtk/properties.h Sun Dec 29 01:44:47 2002 +@@ -19,8 +19,14 @@ + #define PROPERTIES_H + + #include "typedefs.h" +-#include + #include ++ ++#if defined(__GNUC__) && (__GNUC__ > 2) ++#include ++using namespace __gnu_cxx; ++#else ++#include ++#endif + + + /** diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::loader_it.cpp audio/cheesetracker/files/patch-trackercore::loader_it.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::loader_it.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::loader_it.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- trackercore/loader_it.cpp.orig Wed May 1 09:11:51 2002 ++++ trackercore/loader_it.cpp Fri Dec 27 21:53:21 2002 +@@ -192,7 +192,7 @@ + + } + +-void Loader_IT::free_info(bool free_sampledata=false) { ++void Loader_IT::free_info(bool free_sampledata) { + + clear_structs(free_sampledata); + } diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- trackercore/loader_s3m.cpp.orig Thu Sep 6 14:37:45 2001 ++++ trackercore/loader_s3m.cpp Fri Dec 27 21:54:34 2002 +@@ -346,7 +346,7 @@ + + } + +-void Loader_S3M::free_info(bool free_sampledata=false) { ++void Loader_S3M::free_info(bool free_sampledata) { + + int i; + diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::loader_xm.cpp audio/cheesetracker/files/patch-trackercore::loader_xm.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::loader_xm.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::loader_xm.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,20 @@ +--- trackercore/loader_xm.cpp.orig Wed Apr 24 12:33:40 2002 ++++ trackercore/loader_xm.cpp Fri Dec 27 22:44:16 2002 +@@ -387,7 +387,7 @@ + return FUNCTION_SUCCESS; + } + +-int Loader_XM::load_instrument_internal(Instrument *p_instr,bool p_xi,int p_cpos, int p_hsize, int p_sampnum=-1) { ++int Loader_XM::load_instrument_internal(Instrument *p_instr,bool p_xi,int p_cpos, int p_hsize, int p_sampnum) { + + int sampnum; + Uint32 aux; +@@ -807,7 +807,7 @@ + + } + +-void Loader_XM::free_info(bool free_sampledata=false) { ++void Loader_XM::free_info(bool free_sampledata) { + + if (free_sampledata) + for (int x=0;x ++ ++#if defined(__GNUC__) && (__GNUC__ > 2) ++#include ++using namespace __gnu_cxx; ++#else ++#include ++#endif + + /**Mixer Procedure + diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::nsf_export.cpp audio/cheesetracker/files/patch-trackercore::nsf_export.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::nsf_export.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::nsf_export.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- trackercore/nsf_export.cpp.orig Mon Apr 22 10:40:35 2002 ++++ trackercore/nsf_export.cpp Fri Dec 27 21:57:08 2002 +@@ -72,7 +72,7 @@ + write_byte(0x8d); write_byte(p_register_addr&0xFF); write_byte(p_register_addr >> 8); // STA $p_register_addr + } + +-void NSF_Export::update_voice_data(Uint8 p_voice, bool write_chunk=false) { ++void NSF_Export::update_voice_data(Uint8 p_voice, bool write_chunk) { + + if ((p_voice<2) || (p_voice==3)) { + diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::pattern.h audio/cheesetracker/files/patch-trackercore::pattern.h --- /usr/ports/audio/cheesetracker/files/patch-trackercore::pattern.h Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::pattern.h Sun Dec 29 01:22:42 2002 @@ -0,0 +1,17 @@ +--- trackercore/pattern.h.orig Wed May 9 22:43:05 2001 ++++ trackercore/pattern.h Fri Dec 27 21:14:20 2002 +@@ -18,11 +18,14 @@ + #ifndef PATTERN_H + #define PATTERN_H + ++#include + #include + #include + + #include "note.h" + #include "mutex_lock.h" ++ ++using namespace std; + + #define PATTERN_WIDTH 64 + #define MIN_PATTERN_LENGTH 32 diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::player_data.cpp audio/cheesetracker/files/patch-trackercore::player_data.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::player_data.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::player_data.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- trackercore/player_data.cpp.orig Mon Mar 4 10:02:51 2002 ++++ trackercore/player_data.cpp Fri Dec 27 21:17:07 2002 +@@ -32,7 +32,7 @@ + Player_Data::~Player_Data(){ + } + +-void Player_Data::set_virtual_channels(int p_amount,bool p_lock = true) { ++void Player_Data::set_virtual_channels(int p_amount,bool p_lock) { + + if (p_amount<1) return; + if (p_amount==control.max_voices) return; diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- trackercore/player_data_effects.cpp.orig Tue Apr 30 14:58:11 2002 ++++ trackercore/player_data_effects.cpp Fri Dec 27 22:36:36 2002 +@@ -339,7 +339,7 @@ + + if (song->variables.use_linear_slides) { + +- control.channel[p_track].period=control.channel[p_track].aux_period-abs(get_period((Uint16)46,0)-get_period((Uint16)44,0))*note; ++ control.channel[p_track].period=control.channel[p_track].aux_period-abs((int)(get_period((Uint16)46,0)-get_period((Uint16)44,0)))*note; + } else { + + control.channel[p_track].period=get_period( (((Uint16)control.channel[p_track].note+control.channel[p_track].sample_ptr->data.note_offset)+note)<<1,control.channel[p_track].sample_ptr->data.finetune); diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::sample.cpp audio/cheesetracker/files/patch-trackercore::sample.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::sample.cpp Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::sample.cpp Sun Dec 29 01:22:42 2002 @@ -0,0 +1,11 @@ +--- trackercore/sample.cpp.orig Wed May 9 22:43:01 2001 ++++ trackercore/sample.cpp Fri Dec 27 21:53:58 2002 +@@ -24,7 +24,7 @@ + Sample::~Sample(){ + } + +-void Sample::reset(bool try_to_free_data=true) { ++void Sample::reset(bool try_to_free_data) { + + name=""; + filename=""; diff -urN /usr/ports/audio/cheesetracker/files/patch-trackercore::typedefs.h audio/cheesetracker/files/patch-trackercore::typedefs.h --- /usr/ports/audio/cheesetracker/files/patch-trackercore::typedefs.h Thu Jan 1 09:00:00 1970 +++ audio/cheesetracker/files/patch-trackercore::typedefs.h Sun Dec 29 01:22:41 2002 @@ -0,0 +1,12 @@ +--- trackercore/typedefs.h.orig Mon Jan 21 00:07:38 2002 ++++ trackercore/typedefs.h Fri Dec 27 22:41:08 2002 +@@ -19,6 +19,9 @@ + #define TYPEDEFS_H + + #include ++#include ++ ++using namespace std; + + typedef unsigned char byte; + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message