Attachment 113981 Details for Bug 155608 – 2011-03-16-libofa.diff

[patch] 2011-03-16-libofa.diff

2011-03-16-libofa.diff (text/plain), 5.61 KB, created by Jason E. Hale on 2011-03-16 15:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2011-03-16 15:40:10 UTC

Size: 5.61 KB

patch

obsolete

>diff -ruN libofa.orig/Makefile libofa/Makefile
>--- libofa.orig/Makefile	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/Makefile	2011-03-16 11:10:37.000000000 -0400
>@@ -7,28 +7,28 @@
> 
> PORTNAME=	libofa
> PORTVERSION=	0.9.3
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	audio
>-MASTER_SITES=	http://www.musicdns.org/files/
>+MASTER_SITES=	GOOGLE_CODE
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	bsdkaffee@gmail.com
> COMMENT=	The Open Fingerprint Architecture Library
> 
> LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3 \
> 		expat.6:${PORTSDIR}/textproc/expat2 \
> 		curl.6:${PORTSDIR}/ftp/curl
> 
>+PROJECTHOST=	musicip-libofa
>+USE_DOS2UNIX=	yes
> USE_AUTOTOOLS=	libtool
>-USE_GNOME=	pkgconfig
>+USE_GNOME=	gnomehack pkgconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib"
>+MAKE_JOBS_SAFE=	yes
> USE_LDCONFIG=	yes
> 
>-.include <bsd.port.pre.mk>
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-post-configure:
>-	@${REINPLACE_CMD} -e "s|pcdir =.*|pcdir = ${PREFIX}/libdata/pkgconfig|g" \
>-		${WRKSRC}/Makefile
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN libofa.orig/distinfo libofa/distinfo
>--- libofa.orig/distinfo	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/distinfo	2011-03-16 09:50:56.000000000 -0400
>@@ -1,3 +1,2 @@
>-MD5 (libofa-0.9.3.tar.gz) = 51507d2c4b432bd2755f48d58471696e
> SHA256 (libofa-0.9.3.tar.gz) = 0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0
> SIZE (libofa-0.9.3.tar.gz) = 384043
>diff -ruN libofa.orig/files/patch-examples_examples.cpp libofa/files/patch-examples_examples.cpp
>--- libofa.orig/files/patch-examples_examples.cpp	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/files/patch-examples_examples.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- examples/example.cpp.orig	Mon Jul 24 11:09:39 2006
>-+++ examples/example.cpp	Mon Jul 24 11:09:50 2006
>-@@ -7,6 +7,8 @@
>- 
>- -------------------------------------------------------------------*/
>- 
>-+#include <stdio.h>
>-+
>- #include "protocol.h"
>- 
>- AudioData* loadWaveFile(char *file);
>diff -ruN libofa.orig/files/patch-examples_uselame.cpp libofa/files/patch-examples_uselame.cpp
>--- libofa.orig/files/patch-examples_uselame.cpp	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/files/patch-examples_uselame.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- examples/uselame.cpp.orig	Mon Jul 24 11:11:58 2006
>-+++ examples/uselame.cpp	Mon Jul 24 11:12:09 2006
>-@@ -13,6 +13,8 @@
>- #include <sys/wait.h>
>- #endif
>- 
>-+#include <unistd.h>
>-+
>- AudioData *loadWaveFile(char *file);
>- 
>- //	loadDataUsingLAME
>diff -ruN libofa.orig/files/patch-examples_wavefile.cpp libofa/files/patch-examples_wavefile.cpp
>--- libofa.orig/files/patch-examples_wavefile.cpp	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/files/patch-examples_wavefile.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,10 +0,0 @@
>---- examples/wavefile.cpp.orig	Mon Jul 24 11:13:26 2006
>-+++ examples/wavefile.cpp	Mon Jul 24 11:13:05 2006
>-@@ -11,6 +11,7 @@
>- #include "io.h"
>- #endif
>- #include <fcntl.h>
>-+#include <unistd.h>
>- 
>- static bool readBytes(int fd, unsigned char *buf, int size) {
>-     int ct = 0;
>diff -ruN libofa.orig/files/patch-lib_JAMA_tnt__math_utils.h libofa/files/patch-lib_JAMA_tnt__math_utils.h
>--- libofa.orig/files/patch-lib_JAMA_tnt__math_utils.h	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/files/patch-lib_JAMA_tnt__math_utils.h	1969-12-31 19:00:00.000000000 -0500
>@@ -1,33 +0,0 @@
>---- lib/JAMA/tnt_math_utils.h.orig	Sat Sep 30 19:34:43 2006
>-+++ lib/JAMA/tnt_math_utils.h	Sat Sep 30 19:36:07 2006
>-@@ -20,6 +20,14 @@
>- namespace TNT
>- {
>- /**
>-+	@returns the absolute value of a real (no-complex) scalar.
>-+*/
>-+template <class Real>
>-+Real abs(const Real &a)
>-+{
>-+	return  (a > 0 ? a : -a);
>-+}
>-+/**
>- 	@returns hypotenuse of real (non-complex) scalars a and b by 
>- 	avoiding underflow/overflow
>- 	using (a * sqrt( 1 + (b/a) * (b/a))), rather than
>-@@ -55,15 +63,6 @@
>- 	return  a > b ? a : b;
>- }
>- */
>--
>--/**
>--	@returns the absolute value of a real (no-complex) scalar.
>--*/
>--template <class Real>
>--Real abs(const Real &a)
>--{
>--	return  (a > 0 ? a : -a);
>--}
>- 
>- }
>- #endif
>diff -ruN libofa.orig/files/patch-lib__JAMA__tnt_math_utils.h libofa/files/patch-lib__JAMA__tnt_math_utils.h
>--- libofa.orig/files/patch-lib__JAMA__tnt_math_utils.h	1969-12-31 19:00:00.000000000 -0500
>+++ libofa/files/patch-lib__JAMA__tnt_math_utils.h	2011-03-16 10:56:03.000000000 -0400
>@@ -0,0 +1,33 @@
>+--- ./lib/JAMA/tnt_math_utils.h.orig	2011-03-16 10:47:10.000000000 -0400
>++++ ./lib/JAMA/tnt_math_utils.h	2011-03-16 10:51:40.000000000 -0400
>+@@ -20,6 +20,14 @@
>+ namespace TNT
>+ {
>+ /**
>++	@returns the absolute value of a real (no-complex) scalar.
>++*/
>++template <class Real>
>++Real abs(const Real &a)
>++{
>++	return  (a > 0 ? a : -a);
>++}
>++/**	
>+ 	@returns hypotenuse of real (non-complex) scalars a and b by 
>+ 	avoiding underflow/overflow
>+ 	using (a * sqrt( 1 + (b/a) * (b/a))), rather than
>+@@ -56,15 +64,6 @@
>+ }
>+ */
>+ 
>+-/**
>+-	@returns the absolute value of a real (no-complex) scalar.
>+-*/
>+-template <class Real>
>+-Real abs(const Real &a)
>+-{
>+-	return  (a > 0 ? a : -a);
>+-}
>+-
>+ }
>+ #endif
>+ /* MATH_UTILS_H */
>diff -ruN libofa.orig/pkg-descr libofa/pkg-descr
>--- libofa.orig/pkg-descr	2011-03-16 09:11:15.000000000 -0400
>+++ libofa/pkg-descr	2011-03-16 11:01:14.000000000 -0400
>@@ -1,4 +1,5 @@
>-The Open Fingerprint normalizes, extracts frequencies, and creates an array 
>-representing the frequency data in an audio file.
>+The Open Fingerprint Architecture (OFA) Library normalizes, extracts
>+frequencies, and creates an array representing the frequency data in an audio
>+file.
> 
>-WWW:	http://www.musicdns.org
>+WWW: http://code.google.com/p/musicip-libofa/

Actions: View | Diff

Attachments on bug 155608: 113981