mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Fix build with gcc42.

Browse Source 
Approved by:	miwi (mentor)
This commit is contained in:
Edward Tomasz Napierala 2007-07-14 20:06:29 +00:00
parent 4437d2f0e8
commit 2233e76e98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=195604
3 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/funktrackergold/Makefile
View File

@ -23,10 +23,6 @@ MAKE_ARGS= EXTRA_CFLAGS="${PTHREAD_CFLAGS}" \
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Broken with gcc 4.2
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${PREFIX}/bin
.if !defined(NOPORTDOCS)

50
audio/funktrackergold/files/patch-dsp_mixxer.c Normal file
View File

@ -0,0 +1,50 @@
--- dsp_mixxer.c.orig Mon Jun 22 12:39:39 1998
+++ dsp_mixxer.c Sat Jul 14 21:55:28 2007
@@ -15,15 +15,11 @@
***************************************************************************/
#include <stdio.h>
#include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#ifdef Linux
- #include <sys/soundcard.h>
-#elif FreeBSD
- #include <machine/soundcard.h>
-#endif
+#include <sys/soundcard.h>
#include "funktracker_defs.h"
#include "funktracker.h"
#include "funkload.h"
@@ -301,12 +297,12 @@
for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
{
- if(chmix[chan_no].funkctrl & 0x2)
+ if(chmix[chan_no].funkctrl & 0x2) {
#pragma pack(1)
sam = *((sDB *)chmix[chan_no].sample_addr +
(unsigned long)chmix[chan_no].sample_ptr);
#pragma pack()
- else
+ } else
sam = 0;
#ifdef DIGITAL_ECHOING
@@ -363,12 +359,12 @@
shift_t = 8 + shift_table[funk_info.no_active_channels];
for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
{
- if(chmix[chan_no].funkctrl & 0x2)
+ if(chmix[chan_no].funkctrl & 0x2) {
#pragma pack(1)
sam = *((sDW *)chmix[chan_no].sample_addr +
(unsigned long)chmix[chan_no].sample_ptr);
#pragma pack()
- else
+ } else
sam = 0;
#ifdef DIGITAL_ECHOING
sam_reverb = *(chmix[chan_no].echo_buffer +

20
audio/funktrackergold/files/patch-headers
View File

@ -1,23 +1,3 @@
--- ../funkgold-orig/dsp_mixxer.c Mon Jun 22 20:09:39 1998
+++ dsp_mixxer.c Sun Apr 1 17:51:50 2001
@@ -15,15 +15,11 @@
***************************************************************************/
#include <stdio.h>
#include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#ifdef Linux
- #include <sys/soundcard.h>
-#elif FreeBSD
- #include <machine/soundcard.h>
-#endif
+#include <sys/soundcard.h>
#include "funktracker_defs.h"
#include "funktracker.h"
#include "funkload.h"
--- ../funkgold-orig/funkgold.c Sun Jun 21 22:10:54 1998
+++ funkgold.c Sun Apr 1 17:53:18 2001
@@ -23,7 +23,7 @@