From owner-freebsd-ports Wed Jan 9 5:22:10 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4D63B37B41F for ; Wed, 9 Jan 2002 05:20:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g09DK0D76202; Wed, 9 Jan 2002 05:20:00 -0800 (PST) (envelope-from gnats) Received: from jochem.dyndns.org (cc40670-a.groni1.gr.nl.home.com [217.120.131.23]) by hub.freebsd.org (Postfix) with ESMTP id D00DC37B400; Wed, 9 Jan 2002 05:11:19 -0800 (PST) Received: (from jochem@localhost) by jochem.dyndns.org (8.11.6/8.11.6) id g09DChd64470; Wed, 9 Jan 2002 14:12:43 +0100 (CET) (envelope-from jochem) Message-Id: <200201091312.g09DChd64470@jochem.dyndns.org> Date: Wed, 9 Jan 2002 14:12:43 +0100 (CET) From: Jochem Kossen Reply-To: Jochem Kossen To: FreeBSD-gnats-submit@freebsd.org Cc: naddy@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/33729: update port: audio/libvorbis from 1.0rc2 to 1.0rc3 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: 33729 >Category: ports >Synopsis: update port: audio/libvorbis from 1.0rc2 to 1.0rc3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jan 09 05:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Jochem Kossen >Release: FreeBSD 4.5-PRERELEASE i386 >Organization: >Environment: System: FreeBSD lisa.jochem.dyndns.org 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #0: Sun Jan 6 14:21:22 CET 2002 root@lisa.jochem.dyndns.org:/usr/obj/usr/src/sys/LISA i386 >Description: libvorbis is now at 1.0rc3. This patch updates the port NOTE: the following files have been removed: files/patch_lib_floor1.c files/patch_lib_psy.c >How-To-Repeat: >Fix: --- update-libvorbis-1.0rc2_1.0rc3.diff begins here --- diff -urN audio/libvorbis.orig/Makefile audio/libvorbis/Makefile --- audio/libvorbis.orig/Makefile Sat Nov 3 23:22:33 2001 +++ audio/libvorbis/Makefile Wed Jan 9 13:38:40 2002 @@ -6,18 +6,18 @@ # PORTNAME= libvorbis -PORTVERSION= 1.0.r2 +PORTVERSION= 1.0.r3 PORTEPOCH= 2 CATEGORIES= audio -MASTER_SITES= http://www.vorbis.com/files/rc2/unix/ +MASTER_SITES= http://www.vorbis.com/files/rc3/unix/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= naddy@FreeBSD.org -LIB_DEPENDS= ogg.2:${PORTSDIR}/audio/libogg +LIB_DEPENDS= ogg.3:${PORTSDIR}/audio/libogg -USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-ogg-prefix=${LOCALBASE} +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ogg=${LOCALBASE} .if defined(NOPORTDOCS) MAKE_ENV= DOC="" diff -urN audio/libvorbis.orig/distinfo audio/libvorbis/distinfo --- audio/libvorbis.orig/distinfo Mon Aug 27 03:26:31 2001 +++ audio/libvorbis/distinfo Wed Jan 9 01:31:52 2002 @@ -1 +1 @@ -MD5 (libvorbis-1.0rc2.tar.gz) = e5dfe5c71ee451313ec11af1387bd8f7 +MD5 (libvorbis-1.0rc3.tar.gz) = e3a0ce7718f698326504c76562315df2 diff -urN audio/libvorbis.orig/files/patch-Makefile.in audio/libvorbis/files/patch-Makefile.in --- audio/libvorbis.orig/files/patch-Makefile.in Thu Jul 19 08:29:34 2001 +++ audio/libvorbis/files/patch-Makefile.in Wed Jan 9 01:33:30 2002 @@ -1,7 +1,6 @@ -$FreeBSD: ports/audio/libvorbis/files/patch-Makefile.in,v 1.1 2001/07/19 06:29:34 sf Exp $ ---- Makefile.in.orig Tue Jul 17 02:38:23 2001 -+++ Makefile.in Tue Jul 17 02:40:02 2001 -@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@ +--- Makefile.in.orig Wed Jan 9 01:32:45 2002 ++++ Makefile.in Wed Jan 9 01:33:08 2002 +@@ -92,7 +92,7 @@ AUTOMAKE_OPTIONS = foreign dist-zip diff -urN audio/libvorbis.orig/files/patch-configure audio/libvorbis/files/patch-configure --- audio/libvorbis.orig/files/patch-configure Thu Jul 19 08:29:34 2001 +++ audio/libvorbis/files/patch-configure Wed Jan 9 02:17:17 2002 @@ -1,7 +1,6 @@ -$FreeBSD: ports/audio/libvorbis/files/patch-configure,v 1.2 2001/07/19 06:29:34 sf Exp $ ---- configure.orig Mon Jun 18 18:12:43 2001 -+++ configure Tue Jul 17 00:26:16 2001 -@@ -1621,7 +1621,7 @@ if test -z "$GCC"; then +--- configure.orig Tue Jan 1 02:53:05 2002 ++++ configure Wed Jan 9 02:17:03 2002 +@@ -5337,7 +5337,7 @@ PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; *) DEBUG="-g" @@ -10,27 +9,27 @@ PROFILE="-g -p" ;; esac else -@@ -1712,9 +1712,9 @@ rm -f conftest* +@@ -5428,9 +5428,9 @@ CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; *) -- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" +- DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; + DEBUG="-g -Wall" + CFLAGS="" -+ PROFILE="-g -pg" ++ PROFILE="-g -pg" ;; esac fi CFLAGS="$CFLAGS $cflags_save" -@@ -1800,14 +1800,14 @@ else +@@ -5516,14 +5516,14 @@ LIBS="" fi -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:1805: checking for pthread_create in -lpthread" >&5 +-echo "configure:5521: checking for pthread_create in -lpthread" >&5 +echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6 -+echo "configure:1805: checking for pthread_create in -pthread" >&5 ++echo "configure:5521: checking for pthread_create in -pthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39,9 +38,9 @@ -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" cat > conftest.$ac_ext <&6 diff -urN audio/libvorbis.orig/files/patch-doc_Makefile.in audio/libvorbis/files/patch-doc_Makefile.in --- audio/libvorbis.orig/files/patch-doc_Makefile.in Fri Mar 23 23:21:39 2001 +++ audio/libvorbis/files/patch-doc_Makefile.in Wed Jan 9 01:41:16 2002 @@ -1,7 +1,6 @@ -$FreeBSD: ports/audio/libvorbis/files/patch-doc_Makefile.in,v 1.1 2001/03/23 22:21:39 trevor Exp $ ---- doc/Makefile.in.orig Wed Mar 21 15:53:20 2001 -+++ doc/Makefile.in Wed Mar 21 15:53:49 2001 -@@ -89,7 +89,7 @@ AUTOMAKE_OPTIONS = foreign +--- doc/Makefile.in.orig Wed Jan 9 01:40:18 2002 ++++ doc/Makefile.in Wed Jan 9 01:40:37 2002 +@@ -94,7 +94,7 @@ SUBDIRS = vorbisfile vorbisenc diff -urN audio/libvorbis.orig/files/patch-doc_vorbisenc_Makefile.in audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in --- audio/libvorbis.orig/files/patch-doc_vorbisenc_Makefile.in Fri Mar 23 23:21:39 2001 +++ audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in Wed Jan 9 01:43:18 2002 @@ -1,12 +1,11 @@ -$FreeBSD: ports/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in,v 1.1 2001/03/23 22:21:39 trevor Exp $ ---- doc/vorbisenc/Makefile.in.orig Wed Mar 21 15:54:02 2001 -+++ doc/vorbisenc/Makefile.in Wed Mar 21 15:54:16 2001 -@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@ +--- doc/vorbisenc/Makefile.in.orig Wed Jan 9 01:41:59 2002 ++++ doc/vorbisenc/Makefile.in Wed Jan 9 01:42:17 2002 +@@ -92,7 +92,7 @@ AUTOMAKE_OPTIONS = foreign -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc +docdir = $(datadir)/doc/$(PACKAGE)/vorbisenc - doc_DATA = index.html overview.html reference.html style.css vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html + doc_DATA = index.html overview.html reference.html style.css vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html vorbis_encode_init_vbr.html diff -urN audio/libvorbis.orig/files/patch-doc_vorbisfile_Makefile.in audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in --- audio/libvorbis.orig/files/patch-doc_vorbisfile_Makefile.in Fri Mar 23 23:21:39 2001 +++ audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in Wed Jan 9 01:44:47 2002 @@ -1,12 +1,11 @@ -$FreeBSD: ports/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in,v 1.1 2001/03/23 22:21:39 trevor Exp $ ---- doc/vorbisfile/Makefile.in.orig Wed Mar 21 15:54:31 2001 -+++ doc/vorbisfile/Makefile.in Wed Mar 21 15:54:47 2001 -@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@ +--- doc/vorbisfile/Makefile.in.orig Wed Jan 9 01:43:38 2002 ++++ doc/vorbisfile/Makefile.in Wed Jan 9 01:43:54 2002 +@@ -92,7 +92,7 @@ AUTOMAKE_OPTIONS = foreign -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile +docdir = $(datadir)/doc/$(PACKAGE)/vorbisfile - doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html datastructures.html decoding.html example.html exampleindex.html fileinfo.html index.html initialization.html ov_bitrate.html ov_bitrate_instant.html ov_callbacks.html ov_clear.html ov_comment.html ov_info.html ov_open.html ov_open_callbacks.html ov_pcm_seek.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html ov_raw_tell.html ov_raw_total.html ov_read.html ov_seekable.html ov_serialnumber.html ov_streams.html ov_time_seek.html ov_time_tell.html ov_time_total.html overview.html reference.html seekexample.html seeking.html seeking_test_c.html seekingexample.html style.css vorbis_comment.html vorbis_info.html vorbisfile_example_c.html + doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html datastructures.html decoding.html example.html exampleindex.html fileinfo.html index.html initialization.html ov_bitrate.html ov_bitrate_instant.html ov_callbacks.html ov_clear.html ov_comment.html ov_info.html ov_open.html ov_open_callbacks.html ov_pcm_seek.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html ov_raw_tell.html ov_raw_total.html ov_read.html ov_seekable.html ov_serialnumber.html ov_streams.html ov_time_seek.html ov_time_tell.html ov_time_total.html overview.html reference.html seekexample.html seeking.html seeking_test_c.html seekingexample.html style.css vorbis_comment.html vorbis_info.html vorbisfile_example_c.html ov_read_float.html ov_test.html ov_test_open.html ov_test_callbacks.html diff -urN audio/libvorbis.orig/files/patch-lib_floor1.c audio/libvorbis/files/patch-lib_floor1.c --- audio/libvorbis.orig/files/patch-lib_floor1.c Mon Aug 27 03:26:32 2001 +++ audio/libvorbis/files/patch-lib_floor1.c Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/libvorbis/files/patch-lib_floor1.c,v 1.1 2001/08/27 01:26:32 trevor Exp $ - ---- lib/floor1.c.orig Mon Aug 13 13:33:39 2001 -+++ lib/floor1.c Fri Aug 17 01:09:12 2001 -@@ -226,7 +226,7 @@ - - /* also store a sorted position index */ - for(i=0;ipostlist+i; -- qsort(sortpointer,n,sizeof(int),icomp); -+ qsort(sortpointer,n,sizeof(int *),icomp); - - /* points from sort order back to range number */ - for(i=0;iforward_index[i]=sortpointer[i]-info->postlist; diff -urN audio/libvorbis.orig/files/patch-lib_psy.c audio/libvorbis/files/patch-lib_psy.c --- audio/libvorbis.orig/files/patch-lib_psy.c Wed Aug 29 01:12:06 2001 +++ audio/libvorbis/files/patch-lib_psy.c Thu Jan 1 01:00:00 1970 @@ -1,167 +0,0 @@ - -$FreeBSD: ports/audio/libvorbis/files/patch-lib_psy.c,v 1.3 2001/08/28 23:12:06 trevor Exp $ - ---- lib/psy.c.orig Mon Aug 13 03:36:57 2001 -+++ lib/psy.c Tue Aug 28 01:47:19 2001 -@@ -594,95 +594,11 @@ - - } - --static void bark_noise_pointmp(int n,const long *b, -- const float *f, -- float *noise, -- const int fixed){ -- long i,hi=0,lo=0,hif=0,lof=0; -- double xa=0,xb=0; -- double ya=0,yb=0; -- double x2a=0,x2b=0; -- double y2a=0,y2b=0; -- double xya=0,xyb=0; -- double na=0,nb=0; -- -- for(i=0;i>16; -- for(;hi0){ -- int bi=i+fixed/2; -- if(bi>n)bi=n; -- for(;hif0){ -- double denomf=1./(nb*x2b-xb*xb); -- double af=(yb*x2b-xyb*xb)*denomf; -- double bf=(nb*xyb-xb*yb)*denomf; -- double vb=af+bf*i; -- if(va>vb)va=vb; -- } -- -- noise[i]=va-140.f; -- } -- } --} -- - static void bark_noise_hybridmp(int n,const long *b, -- const float *f, -- float *noise, -- const int fixed){ -+ const float *f, -+ float *noise, -+ const float offset, -+ const int fixed){ - long i,hi=0,lo=0,hif=0,lof=0; - double xa=0,xb=0; - double ya=0,yb=0; -@@ -699,7 +615,7 @@ - /* find new lo/hi */ - int bi=b[i]>>16; - for(;hi0.f){ - double nn= bin*bin; - nn*=nn; -@@ -716,7 +632,7 @@ - } - bi=b[i]&0xffff; - for(;lo0.f){ - double nn= bin*bin; - nn*=nn; -@@ -744,7 +660,7 @@ - if(bi>n)bi=n; - - for(;hif0.f){ - double nn= bin*bin; - nn*=nn; -@@ -762,7 +678,7 @@ - bi=i-(fixed+1)/2; - if(bi<0)bi=0; - for(;lof0.f){ - double nn= bin*bin; - nn*=nn; -@@ -817,7 +733,7 @@ - - } - -- noise[i]=va; -+ noise[i]=va-offset; - } - } - } -@@ -859,13 +775,13 @@ - if(p->vi->noisemaskp){ - float *work=alloca(n*sizeof(float)); - -- bark_noise_pointmp(n,p->bark,logmdct,logmask, -- -1); -+ bark_noise_hybridmp(n,p->bark,logmdct,logmask, -+ 140.,-1); - - for(i=0;ibark,work,logmask, -+ bark_noise_hybridmp(n,p->bark,work,logmask,0., - p->vi->noisewindowfixed); - - for(i=0;iRelease-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message