From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 3 18:40:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A56016A468 for ; Sun, 3 Jun 2007 18:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 4D75D13C46A for ; Sun, 3 Jun 2007 18:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l53Ie2Wl014674 for ; Sun, 3 Jun 2007 18:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l53Ie2SC014673; Sun, 3 Jun 2007 18:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 3 Jun 2007 18:40:02 GMT Resent-Message-Id: <200706031840.l53Ie2SC014673@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87B0816A41F for ; Sun, 3 Jun 2007 18:30:49 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa05.dion.ne.jp (msa05.dion.ne.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 250F913C45B for ; Sun, 3 Jun 2007 18:30:49 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (ZT066083.ppp.dion.ne.jp [59.128.66.83]) by msa105.dion.ne.jp (DION MAIL) with ESMTP id 621F8538037 for ; Mon, 4 Jun 2007 03:30:40 +0900 (JST) Message-Id: <20070604033008.0c616551.tkato432@yahoo.com> Date: Mon, 4 Jun 2007 03:30:08 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org X-Mailman-Approved-At: Sun, 03 Jun 2007 18:40:59 +0000 Cc: Subject: ports/113297: Update port: audio/alienwah X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 18:40:02 -0000 >Number: 113297 >Category: ports >Synopsis: Update port: audio/alienwah >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 03 18:40:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.2-RELEASE-p3 i386 >Organization: >Environment: >Description: - Fix build with gcc4 New file: files/patch-aw.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/alienwah/Makefile audio/alienwah/Makefile --- /usr/ports/audio/alienwah/Makefile Sat May 26 07:59:37 2007 +++ audio/alienwah/Makefile Sat May 26 21:22:16 2007 @@ -17,17 +17,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa USE_GMAKE= yes -USE_LDCONFIG= yes -PLIST_FILES= lib/ladspa/aw.so MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -fPIC" -.include - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif +PLIST_FILES= lib/ladspa/aw.so do-install: - @${INSTALL_DATA} ${WRKSRC}/aw.so ${LOCALBASE}/lib/ladspa + ${INSTALL_DATA} ${WRKSRC}/aw.so ${LOCALBASE}/lib/ladspa -.include +.include diff -urN /usr/ports/audio/alienwah/files/patch-aw.cpp audio/alienwah/files/patch-aw.cpp --- /usr/ports/audio/alienwah/files/patch-aw.cpp Thu Jan 1 09:00:00 1970 +++ audio/alienwah/files/patch-aw.cpp Sat May 26 22:34:01 2007 @@ -0,0 +1,199 @@ +--- aw.cpp.orig Sat Jan 26 02:51:03 2002 ++++ aw.cpp Sat May 26 22:33:51 2007 +@@ -85,6 +85,8 @@ + #define AW_INPUT2 6 + #define AW_OUTPUT2 7 + ++#define AW_NUMPORTS 8 ++ + /*****************************************************************************/ + /* Make number of samples represented by 'delay' proportional to + * the sample rate, such that delay=1 is 1 sample buffer at +@@ -139,21 +141,57 @@ + c2(float_complex(0,0)) { + } + ++friend LADSPA_Handle instantiateAW(const LADSPA_Descriptor *, ++ unsigned long SampleRate); ++friend void connectPortToAW(LADSPA_Handle instance, unsigned long port, ++ LADSPA_Data * datalocation); ++friend void activateAW(void * pvHandle); ++friend void runAW_Mono(LADSPA_Handle instance, unsigned long samplecount); ++friend void runAW_Stereo(LADSPA_Handle instance, unsigned long samplecount); ++friend void cleanupAW(void *pvHandle); ++ + /* +- * simply calls the constructor ++ * Munge some things based upon the settings passed. Set ++ * initial state. + */ +-friend LADSPA_Handle instantiateAW(const LADSPA_Descriptor *, +- unsigned long SampleRate) { ++void initState(int chans) { ++ inited = true; ++ freq = (float)lfreq; ++ feedback = ((float)lfeedback)/4 + 0.74; // whyfor? ++ if (feedback>0.999) feedback=0.999; ++ if (ldelay < 0) ldelay = 1; ++ // swh I think this is wrong delay = (unsigned int) (ldelay * samplerate * NORM); ++ delay = (unsigned int) ldelay; ++printf("delay %d\n", delay); ++ if (delay < 1) delay = 1; ++ if (delay > MAX_DELAY) delay = MAX_DELAY; ++ delaybuf = new float_complex[delay]; ++ if (chans == 2) { ++ delaybuf2 = new float_complex[MAX_DELAY+1]; ++ } ++ for (unsigned int i =0; ilfreq = *datalocation; +@@ -182,38 +220,16 @@ + * connect_port may be called before of after here, so we + * cannot rely upon port data for initialization + */ +-friend void activateAW(void * pvHandle) { +-} +- +-/* +- * Munge some things based upon the settings passed. Set +- * initial state. +- */ +-void initState(int chans) { +- inited = true; +- freq = (float)lfreq; +- feedback = ((float)lfeedback)/4 + 0.74; // whyfor? +- if (feedback>0.999) feedback=0.999; +- if (ldelay < 0) ldelay = 1; +- // swh I think this is wrong delay = (unsigned int) (ldelay * samplerate * NORM); +- delay = (unsigned int) ldelay; +-printf("delay %d\n", delay); +- if (delay < 1) delay = 1; +- if (delay > MAX_DELAY) delay = MAX_DELAY; +- delaybuf = new float_complex[delay]; +- if (chans == 2) { +- delaybuf2 = new float_complex[MAX_DELAY+1]; +- } +- for (unsigned int i =0; iPortCount + = 6; + portdesc +- = new LADSPA_PortDescriptor[6]; ++ = new LADSPA_PortDescriptor[AW_NUMPORTS]; + desc[plug]->PortDescriptors + = (const LADSPA_PortDescriptor *)portdesc; + portdesc[AW_FREQ] +@@ -358,7 +373,7 @@ + portdesc[AW_OUTPUT1] + = LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO; + pnames +- = new char_ptr[6]; ++ = new char_ptr[AW_NUMPORTS]; + desc[plug]->PortNames + = (const char **)pnames; + pnames[AW_FREQ] +@@ -376,7 +391,7 @@ + + /* range hints */ + rangehints +- = new LADSPA_PortRangeHint[6]; ++ = new LADSPA_PortRangeHint[AW_NUMPORTS]; + desc[plug]->PortRangeHints + = (const LADSPA_PortRangeHint *)rangehints; + +@@ -417,7 +432,7 @@ + desc[plug]->PortCount + = 8; + portdesc +- = new LADSPA_PortDescriptor[8]; ++ = new LADSPA_PortDescriptor[AW_NUMPORTS]; + desc[plug]->PortDescriptors + = (const LADSPA_PortDescriptor *)portdesc; + portdesc[AW_FREQ] +@@ -437,7 +452,7 @@ + portdesc[AW_OUTPUT1] + = LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO; + pnames +- = new char_ptr[8]; ++ = new char_ptr[AW_NUMPORTS]; + desc[plug]->PortNames + = (const char **)pnames; + pnames[AW_FREQ] +@@ -459,7 +474,7 @@ + + /* range hints */ + rangehints +- = new LADSPA_PortRangeHint[8]; ++ = new LADSPA_PortRangeHint[AW_NUMPORTS]; + desc[plug]->PortRangeHints + = (const LADSPA_PortRangeHint *)rangehints; + >Release-Note: >Audit-Trail: >Unformatted: