Attachment #82853 for bug #118466

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




MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	gahr@gahr.ch
COMMENT=	General sound interface

USE_BZIP2=	yes

MAN7=		gsi_overview.7
MAN8=		gsi_server.8

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 700042
BROKEN=		Broken with gcc 4.2
.endif

post-extract:
	@${RM} -f ${WRKSRC}/lib/include/gsi/gsisynth.h

post-patch:
.for f in lib/device/gsimixer/api/mixer_fbsd.c \
	lib/device/gsipcm/api/pcm_fbsd.c
	@${REINPLACE_CMD} -e \
		's|machine/soundcard.h|sys/soundcard.h|g' ${WRKSRC}/${f}
.endfor
.for f in server/FINISH_host_allow.c server/client.c server/conf.c
	@${REINPLACE_CMD} -e \
		's|"/etc/|"${PREFIX}/etc/|g' ${WRKSRC}/${f}
.endfor

do-configure:

	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>




--- lib/gsif/sample/convert_block.c.orig	2001-01-30 13:28:09.000000000 +0100
+++ lib/gsif/sample/convert_block.c	2007-12-06 17:04:45.000000000 +0100
@@ -122,9 +122,9 @@
 			break;
 		case GSI_16BIT:
 #ifdef SYSCONFIG_LITTLE_ENDIAN_MACHINE
-			input_val = (int) (int16) ( ((*input++) << 8) | (*input++) );
+			input_val = (int) (int16) ( (*input++ << 8) | *input++ );
 #else
-			input_val = *((int16 *)input)++;
+			input_val = *input++;
 #endif
 			break;
 		case GSI_8BIT_SIGNED:
@@ -132,9 +132,9 @@
 			break;
 		case GSI_16BIT_LE:
 #ifdef SYSCONFIG_LITTLE_ENDIAN_MACHINE
-			input_val = *((int16 *)input)++;
+			input_val = *input++;
 #else
-			input_val = (int) (int16) (*input++ | ((*input++) << 8) );
+			input_val = (int) (int16) (*(input++) | ((*input++) << 8) );
 #endif
 			break;
 		case GSI_24BIT:
@@ -170,7 +170,7 @@
 			*output++ = (input_val >> 8) & 255;
 			*output++ = (input_val & 255);
 #else
-			*((int16 *) output)++ = input_val;
+			*output++ = input_val;
 #endif
 			break;
 		case GSI_8BIT_SIGNED:
@@ -178,7 +178,7 @@
 			break;
 		case GSI_16BIT_LE:
 #ifdef SYSCONFIG_LITTLE_ENDIAN_MACHINE
-			*((int16 *) output)++ = input_val;
+			*output++ = input_val;
 #else
 			*output++ = (input_val >> 8) & 255;
 			*output++ = (input_val & 255);

Return to bug 118466

Lines 12-18 Link Here

(-)Makefile (-12 / +6 lines)
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= gahr@gahr.ch
16	COMMENT= General sound interface	16	COMMENT= General sound interface
17		17
18	USE_BZIP2= yes	18	USE_BZIP2= yes
Lines 28-51 Link Here
28	MAN7= gsi_overview.7	28	MAN7= gsi_overview.7
29	MAN8= gsi_server.8	29	MAN8= gsi_server.8
30		30
31	.include <bsd.port.pre.mk>
32
33	.if ${OSVERSION} >= 700042
34	BROKEN= Broken with gcc 4.2
35	.endif
36
37	post-extract:	31	post-extract:
38	@${RM} -f ${WRKSRC}/lib/include/gsi/gsisynth.h	32	@${RM} -f ${WRKSRC}/lib/include/gsi/gsisynth.h
39		33
40	post-patch:	34	post-patch:
41	.for file in lib/device/gsimixer/api/mixer_fbsd.c \	35	.for f in lib/device/gsimixer/api/mixer_fbsd.c \
42	lib/device/gsipcm/api/pcm_fbsd.c	36	lib/device/gsipcm/api/pcm_fbsd.c
43	@${REINPLACE_CMD} -e \	37	@${REINPLACE_CMD} -e \
44	's\|machine/soundcard.h\|sys/soundcard.h\|g' ${WRKSRC}/${file}	38	's\|machine/soundcard.h\|sys/soundcard.h\|g' ${WRKSRC}/${f}
45	.endfor	39	.endfor
46	.for file in server/FINISH_host_allow.c server/client.c server/conf.c	40	.for f in server/FINISH_host_allow.c server/client.c server/conf.c
47	@${REINPLACE_CMD} -e \	41	@${REINPLACE_CMD} -e \
48	's\|"/etc/\|"${PREFIX}/etc/\|g' ${WRKSRC}/${file}	42	's\|"/etc/\|"${PREFIX}/etc/\|g' ${WRKSRC}/${f}
49	.endfor	43	.endfor
50		44
51	do-configure:	45	do-configure:
Lines 63-66 Link Here
63	@${ECHO_MSG}	57	@${ECHO_MSG}
64	@${CAT} ${PKGMESSAGE}	58	@${CAT} ${PKGMESSAGE}
65		59
66	.include <bsd.port.post.mk>	60	.include <bsd.port.mk>

Added Link Here

(-)files/patch-lib-gsif-sample_convert_block.c (+44 lines)
1	--- lib/gsif/sample/convert_block.c.orig 2001-01-30 13:28:09.000000000 +0100
2	+++ lib/gsif/sample/convert_block.c 2007-12-06 17:04:45.000000000 +0100
3	@@ -122,9 +122,9 @@
4	break;
5	case GSI_16BIT:
6	#ifdef SYSCONFIG_LITTLE_ENDIAN_MACHINE
7	- input_val = (int) (int16) ( ((input++) << 8) \| (input++) );
8	+ input_val = (int) (int16) ( (input++ << 8) \| input++ );
9	#else
10	- input_val = ((int16 )input)++;
11	+ input_val = *input++;
12	#endif
13	break;
14	case GSI_8BIT_SIGNED:
15	@@ -132,9 +132,9 @@
16	break;
17	case GSI_16BIT_LE:
18	#ifdef SYSCONFIG_LITTLE_ENDIAN_MACHINE
19	- input_val = ((int16 )input)++;
20	+ input_val = *input++;
21	#else
22	- input_val = (int) (int16) (input++ \| ((input++) << 8) );
23	+ input_val = (int) (int16) ((input++) \| ((input++) << 8) );
24	#endif
25	break;
26	case GSI_24BIT:
27	@@ -170,7 +170,7 @@
28	*output++ = (input_val >> 8) & 255;
29	*output++ = (input_val & 255);
30	#else
31	- ((int16 ) output)++ = input_val;
32	+ *output++ = input_val;
33	#endif
34	break;
35	case GSI_8BIT_SIGNED:
36	@@ -178,7 +178,7 @@
37	break;
38	case GSI_16BIT_LE:
39	#ifdef SYSCONFIG_LITTLE_ENDIAN_MACHINE
40	- ((int16 ) output)++ = input_val;
41	+ *output++ = input_val;
42	#else
43	*output++ = (input_val >> 8) & 255;
44	*output++ = (input_val & 255);