Attachment #27479 for bug #46598

View | Details | Raw Unified | Return to bug 46598
Collapse All | Expand All




MAINTAINER=	ports@FreeBSD.org

BUILD_DEPENDS=	${LOCALBASE}/share/automake14/install-sh:${PORTSDIR}/devel/automake14
LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
		gtkmm:${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/${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 <bsd.port.mk>

Line 0 Link Here

(-)audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp (+11 lines)
	1	--- interface_gtk/interface_widget_envelope.cpp.orig Sun Jan 20 23:56:00 2002
	2	+++ interface_gtk/interface_widget_envelope.cpp Fri Dec 27 21:58:41 2002
	3	@@ -373,7 +373,7 @@
	4	node_x=get_point_x(i);
	5	node_y=get_point_y(i);
	6
	7	- dist=(int)sqrt((p_node_x-node_x)(p_node_x-node_x)+(p_node_y-node_y)(p_node_y-node_y));
	8	+ dist=(int)sqrt((double)((p_node_x-node_x)(p_node_x-node_x)+(p_node_y-node_y)(p_node_y-node_y)));
	9
	10	if (dist<6) {
	11




--- 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 <hash_map>
 #include <stdio.h>
+
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#include <ext/hash_map>  
+using namespace __gnu_cxx;
+#else
+#include <hash_map>  
+#endif
 
 
 /**

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::loader_it.cpp (+11 lines)
	1	--- trackercore/loader_it.cpp.orig Wed May 1 09:11:51 2002
	2	+++ trackercore/loader_it.cpp Fri Dec 27 21:53:21 2002
	3	@@ -192,7 +192,7 @@
	4
	5	}
	6
	7	-void Loader_IT::free_info(bool free_sampledata=false) {
	8	+void Loader_IT::free_info(bool free_sampledata) {
	9
	10	clear_structs(free_sampledata);
	11	}

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp (+11 lines)
	1	--- trackercore/loader_s3m.cpp.orig Thu Sep 6 14:37:45 2001
	2	+++ trackercore/loader_s3m.cpp Fri Dec 27 21:54:34 2002
	3	@@ -346,7 +346,7 @@
	4
	5	}
	6
	7	-void Loader_S3M::free_info(bool free_sampledata=false) {
	8	+void Loader_S3M::free_info(bool free_sampledata) {
	9
	10	int i;
	11




--- 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<samples.size();x++) {




--- trackercore/mixer_procedure.h.orig	Tue Apr 30 16:11:28 2002
+++ trackercore/mixer_procedure.h	Sun Dec 29 01:44:12 2002
@@ -19,7 +19,13 @@
 #define MIXER_PROCEDURE_H
 
 #include  "sample_data.h"
-#include <hash_map>
+
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#include <ext/hash_map>  
+using namespace __gnu_cxx;
+#else
+#include <hash_map>  
+#endif
 
 /**Mixer Procedure
 

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::nsf_export.cpp (+11 lines)
	1	--- trackercore/nsf_export.cpp.orig Mon Apr 22 10:40:35 2002
	2	+++ trackercore/nsf_export.cpp Fri Dec 27 21:57:08 2002
	3	@@ -72,7 +72,7 @@
	4	write_byte(0x8d); write_byte(p_register_addr&0xFF); write_byte(p_register_addr >> 8); // STA $p_register_addr
	5	}
	6
	7	-void NSF_Export::update_voice_data(Uint8 p_voice, bool write_chunk=false) {
	8	+void NSF_Export::update_voice_data(Uint8 p_voice, bool write_chunk) {
	9
	10	if ((p_voice<2) \|\| (p_voice==3)) {
	11




--- 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 <iostream>
 #include <map>
 #include <vector>
 
 #include "note.h"
 #include "mutex_lock.h"
+
+using namespace std;
 
 #define PATTERN_WIDTH 64
 #define MIN_PATTERN_LENGTH 32

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::player_data.cpp (+11 lines)
	1	--- trackercore/player_data.cpp.orig Mon Mar 4 10:02:51 2002
	2	+++ trackercore/player_data.cpp Fri Dec 27 21:17:07 2002
	3	@@ -32,7 +32,7 @@
	4	Player_Data::~Player_Data(){
	5	}
	6
	7	-void Player_Data::set_virtual_channels(int p_amount,bool p_lock = true) {
	8	+void Player_Data::set_virtual_channels(int p_amount,bool p_lock) {
	9
	10	if (p_amount<1) return;
	11	if (p_amount==control.max_voices) return;

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp (+11 lines)
	1	--- trackercore/player_data_effects.cpp.orig Tue Apr 30 14:58:11 2002
	2	+++ trackercore/player_data_effects.cpp Fri Dec 27 22:36:36 2002
	3	@@ -339,7 +339,7 @@
	4
	5	if (song->variables.use_linear_slides) {
	6
	7	- control.channel[p_track].period=control.channel[p_track].aux_period-abs(get_period((Uint16)46,0)-get_period((Uint16)44,0))*note;
	8	+ control.channel[p_track].period=control.channel[p_track].aux_period-abs((int)(get_period((Uint16)46,0)-get_period((Uint16)44,0)))*note;
	9	} else {
	10
	11	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);

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::sample.cpp (+11 lines)
	1	--- trackercore/sample.cpp.orig Wed May 9 22:43:01 2001
	2	+++ trackercore/sample.cpp Fri Dec 27 21:53:58 2002
	3	@@ -24,7 +24,7 @@
	4	Sample::~Sample(){
	5	}
	6
	7	-void Sample::reset(bool try_to_free_data=true) {
	8	+void Sample::reset(bool try_to_free_data) {
	9
	10	name="";
	11	filename="";




--- 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 <string>
+#include <iostream>
+
+using namespace std;
 
 typedef unsigned char byte;


Return to bug 46598

Lines 14-33 Link Here

(-)audio/cheesetracker/Makefile (-8 / +12 lines)
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15		15
16	BUILD_DEPENDS= ${LOCALBASE}/share/automake14/install-sh:${PORTSDIR}/devel/automake14	16	BUILD_DEPENDS= ${LOCALBASE}/share/automake14/install-sh:${PORTSDIR}/devel/automake14
17	LIB_DEPENDS= sigc:${PORTSDIR}/devel/libsigc++ \	17	LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
18	gtkmm:${PORTSDIR}/x11-toolkits/gtk--
19		18
20	GNU_CONFIGURE= yes
21	USE_GMAKE= yes
22	USE_REINPLACE= yes	19	USE_REINPLACE= yes
		20	USE_GNOMENG= yes
		21	USE_GNOME= gtk12
		22	USE_GMAKE= yes
		23	GNU_CONFIGURE= yes
		24	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
		25	AUTOHEADER="${TRUE}"
		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e 's\|[$$]CXXFLAGS_OPT \|\$$CXXFLAGS \|g' ${WRKSRC}/configure
		29	@${REINPLACE_CMD} -e 's\|AFMT_S16_NE\|AFMT_S16_LE\|g' ${WRKSRC}/waveout/sound_driver_oss.cpp
23		30
24	pre-configure:	31	pre-configure:
25	.for file in install-sh missing mkinstalldirs	32	.for file in install-sh missing mkinstalldirs
26	@${LN} -sf ${LOCALBASE}/share/automake14/automake/${file} ${WRKSRC}	33	@${LN} -sf ${LOCALBASE}/share/automake14/${file} ${WRKSRC}
27	.endfor	34	.endfor
28	@${RM} -f ${WRKSRC}/config.cache	35	@${RM} -f ${WRKSRC}/config.cache
29
30	post-patch:
31	@${REINPLACE_CMD} -e "s,AFMT_S16_NE,AFMT_S16_LE,g" ${WRKSRC}/waveout/sound_driver_oss.cpp
32		36
33	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/cheesetracker/files/patch-interface_gtk::properties.h (+18 lines)
	1	--- interface_gtk/properties.h.orig Thu Apr 11 02:39:58 2002
	2	+++ interface_gtk/properties.h Sun Dec 29 01:44:47 2002
	3	@@ -19,8 +19,14 @@
	4	#define PROPERTIES_H
	5
	6	#include "typedefs.h"
	7	-#include <hash_map>
	8	#include <stdio.h>
	9	+
	10	+#if defined(__GNUC__) && (__GNUC__ > 2)
	11	+#include <ext/hash_map>
	12	+using namespace __gnu_cxx;
	13	+#else
	14	+#include <hash_map>
	15	+#endif
	16
	17
	18	/**

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::loader_xm.cpp (+20 lines)
	1	--- trackercore/loader_xm.cpp.orig Wed Apr 24 12:33:40 2002
	2	+++ trackercore/loader_xm.cpp Fri Dec 27 22:44:16 2002
	3	@@ -387,7 +387,7 @@
	4	return FUNCTION_SUCCESS;
	5	}
	6
	7	-int Loader_XM::load_instrument_internal(Instrument *p_instr,bool p_xi,int p_cpos, int p_hsize, int p_sampnum=-1) {
	8	+int Loader_XM::load_instrument_internal(Instrument *p_instr,bool p_xi,int p_cpos, int p_hsize, int p_sampnum) {
	9
	10	int sampnum;
	11	Uint32 aux;
	12	@@ -807,7 +807,7 @@
	13
	14	}
	15
	16	-void Loader_XM::free_info(bool free_sampledata=false) {
	17	+void Loader_XM::free_info(bool free_sampledata) {
	18
	19	if (free_sampledata)
	20	for (int x=0;x<samples.size();x++) {

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::mixer_procedure.h (+17 lines)
	1	--- trackercore/mixer_procedure.h.orig Tue Apr 30 16:11:28 2002
	2	+++ trackercore/mixer_procedure.h Sun Dec 29 01:44:12 2002
	3	@@ -19,7 +19,13 @@
	4	#define MIXER_PROCEDURE_H
	5
	6	#include "sample_data.h"
	7	-#include <hash_map>
	8	+
	9	+#if defined(__GNUC__) && (__GNUC__ > 2)
	10	+#include <ext/hash_map>
	11	+using namespace __gnu_cxx;
	12	+#else
	13	+#include <hash_map>
	14	+#endif
	15
	16	/**Mixer Procedure
	17

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::pattern.h (+17 lines)
	1	--- trackercore/pattern.h.orig Wed May 9 22:43:05 2001
	2	+++ trackercore/pattern.h Fri Dec 27 21:14:20 2002
	3	@@ -18,11 +18,14 @@
	4	#ifndef PATTERN_H
	5	#define PATTERN_H
	6
	7	+#include <iostream>
	8	#include <map>
	9	#include <vector>
	10
	11	#include "note.h"
	12	#include "mutex_lock.h"
	13	+
	14	+using namespace std;
	15
	16	#define PATTERN_WIDTH 64
	17	#define MIN_PATTERN_LENGTH 32

Line 0 Link Here

(-)audio/cheesetracker/files/patch-trackercore::typedefs.h (+12 lines)
	1	--- trackercore/typedefs.h.orig Mon Jan 21 00:07:38 2002
	2	+++ trackercore/typedefs.h Fri Dec 27 22:41:08 2002
	3	@@ -19,6 +19,9 @@
	4	#define TYPEDEFS_H
	5
	6	#include <string>
	7	+#include <iostream>
	8	+
	9	+using namespace std;
	10
	11	typedef unsigned char byte;
	12