pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/xanalyser Update to 1.24. No changelog available...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4fcc56b70e10
branches: trunk
changeset: 487100:4fcc56b70e10
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sun Jan 09 08:37:48 2005 +0000
description:
Update to 1.24. No changelog available. Most visible change is
incorporation of most of our build patches.
diffstat:
audio/xanalyser/Makefile | 5 ++---
audio/xanalyser/distinfo | 16 ++++------------
audio/xanalyser/patches/patch-aa | 22 ----------------------
audio/xanalyser/patches/patch-ab | 19 -------------------
audio/xanalyser/patches/patch-ad | 20 ++++++++++----------
audio/xanalyser/patches/patch-ae | 27 ---------------------------
audio/xanalyser/patches/patch-af | 13 -------------
audio/xanalyser/patches/patch-ag | 33 ---------------------------------
audio/xanalyser/patches/patch-ah | 12 ------------
audio/xanalyser/patches/patch-ai | 13 -------------
audio/xanalyser/patches/patch-aj | 12 ------------
11 files changed, 16 insertions(+), 176 deletions(-)
diffs (264 lines):
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/Makefile
--- a/audio/xanalyser/Makefile Sun Jan 09 07:13:31 2005 +0000
+++ b/audio/xanalyser/Makefile Sun Jan 09 08:37:48 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:10 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/09 08:37:48 schmonz Exp $
#
-DISTNAME= xanalyser-1.21
-PKGREVISION= 2
+DISTNAME= xanalyser-1.24
CATEGORIES= audio
MASTER_SITES= ftp://ftp.suse.com/pub/people/arvin/private/
EXTRACT_SUFX= .tar.bz2
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/distinfo
--- a/audio/xanalyser/distinfo Sun Jan 09 07:13:31 2005 +0000
+++ b/audio/xanalyser/distinfo Sun Jan 09 08:37:48 2005 +0000
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/05/03 17:00:42 minskim Exp $
+$NetBSD: distinfo,v 1.7 2005/01/09 08:37:48 schmonz Exp $
-SHA1 (xanalyser-1.21.tar.bz2) = abdc1ddaffcb7dd4074672a54798b4b1ec4b0061
-Size (xanalyser-1.21.tar.bz2) = 58542 bytes
-SHA1 (patch-aa) = 29651c643550679f647b54726fb8d25579cdaaf7
-SHA1 (patch-ab) = 838c49ff3e15cbcd798aea0b3caec59b09f5c482
-SHA1 (patch-ad) = 835948759070cfab385e52e78a92494fe96ea140
-SHA1 (patch-ae) = 26fd8129f6283672d43e68163c372459e8cb93dc
-SHA1 (patch-af) = bf6af0c140a802fb98e82e82ecbfb7240696db09
-SHA1 (patch-ag) = 0ae5680df966e534d76d04cddf6a78259d87cbfe
-SHA1 (patch-ah) = a8bae5da6db1098ce1520cc49e167fc5999b0dda
-SHA1 (patch-ai) = 6805fc79e0c3135f6f22eb0b91c68cacd96c483c
-SHA1 (patch-aj) = 2a6549638be3d3d25126b0938a11572ffe1c6564
+SHA1 (xanalyser-1.24.tar.bz2) = 0b261568b8573d81b7e99980c2ffede6be683bdb
+Size (xanalyser-1.24.tar.bz2) = 73451 bytes
+SHA1 (patch-ad) = 46d15c6ff4ddc236de7d424dee667088dd693062
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-aa
--- a/audio/xanalyser/patches/patch-aa Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $
-
---- src/Analyser.cc.orig Wed Dec 12 16:41:57 2001
-+++ src/Analyser.cc
-@@ -8,7 +8,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
--#include <values.h>
-+#include <limits.h>
- #include <assert.h>
-
- #include <X11/Xlib.h>
-@@ -559,7 +559,7 @@
- void
- Analyser::snd2u (const int32_t* buffer, int channel)
- {
-- const double norm = (channel == MONO ? 0.5 : 1.0) / (double) MAXINT;
-+ const double norm = (channel == MONO ? 0.5 : 1.0) / (double) INT_MAX;
-
- switch (channel) {
-
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-ab
--- a/audio/xanalyser/patches/patch-ab Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/05/03 17:00:42 minskim Exp $
-
---- src/DSP.cc.orig 2001-12-01 19:05:15.000000000 -0600
-+++ src/DSP.cc
-@@ -14,8 +14,13 @@
- #include <math.h>
- #include <errno.h>
- #include <string.h>
--#include <values.h>
-+#include <limits.h>
-+#ifdef __linux__
- #include <byteswap.h>
-+#else
-+#include <sys/bswap.h>
-+#define bswap_16 bswap16
-+#endif
-
- #include "DSP.h"
-
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-ad
--- a/audio/xanalyser/patches/patch-ad Sun Jan 09 07:13:31 2005 +0000
+++ b/audio/xanalyser/patches/patch-ad Sun Jan 09 08:37:48 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2004/05/03 17:00:42 minskim Exp $
+$NetBSD: patch-ad,v 1.4 2005/01/09 08:37:48 schmonz Exp $
---- src/Makefile.in.orig 2002-01-23 13:49:25.000000000 -0600
+--- src/Makefile.in.orig 2004-08-28 17:06:57.000000000 -0400
+++ src/Makefile.in
-@@ -73,7 +73,7 @@ bin_PROGRAMS = xanalyser
- xanalyser_SOURCES = Analyser.cc Analyser.h DSP.cc DSP.h Sample.cc Sample.h Scope.cc Scope.h XAnalyser.ad.h
control.cc control.h fft.cc fft.h help.cc help.h help.txt.h main.cc main.h utils.cc
utils.h Trans.h
+@@ -107,7 +107,7 @@ xanalyser_SOURCES = \
--xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 # -ldfftw -ldrfftw
-+xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 ${LIBOSSAUDIO}# -ldfftw -ldrfftw
+ xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 \
+- $(FFTWLDADD) $(ALSALDADD)
++ ${LIBOSSAUDIO} $(FFTWLDADD) $(ALSALDADD)
+
EXTRA_DIST = XAnalyser.ad help.txt *.xpm
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -302,8 +302,8 @@ mostlyclean distclean maintainer-clean
+@@ -375,8 +375,8 @@ uninstall-am: uninstall-binPROGRAMS unin
main.cc: XAnalyser.ad.h
@@ -22,7 +22,7 @@
help.cc: help.txt.h
-@@ -311,8 +311,8 @@ help.txt.h: help.txt
+@@ -384,8 +384,8 @@ help.txt.h: help.txt
txt2c help.txt > help.txt.h
install-data-hook:
@@ -30,6 +30,6 @@
- cp XAnalyser.ad $(DESTDIR)/usr/X11R6/lib/X11/app-defaults/XAnalyser
+ mkdir -p $(DESTDIR)$(prefix)/lib/X11/app-defaults
+ cp XAnalyser.ad $(DESTDIR)$(prefix)/lib/X11/app-defaults/XAnalyser
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-ae
--- a/audio/xanalyser/patches/patch-ae Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/05/03 17:00:42 minskim Exp $
-
---- src/Sample.cc.orig 2001-12-12 15:36:27.000000000 -0600
-+++ src/Sample.cc
-@@ -10,8 +10,12 @@
- #include <math.h>
- #include <string.h>
- #include <errno.h>
--#include <values.h>
-+#include <limits.h>
-+#ifdef __linux__
- #include <endian.h>
-+#else
-+#include <machine/endian.h>
-+#endif
-
- #include <X11/Xlib.h>
- #include <Xm/Xm.h>
-@@ -116,7 +120,7 @@ Sample::shot ()
- if (j == 0 || j != length) // EOF
- return false;
-
--#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#if BYTE_ORDER == LITTLE_ENDIAN
- dsp.swapbuffer (buffer, 4 * length);
- #endif
-
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-af
--- a/audio/xanalyser/patches/patch-af Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $
-
---- src/Sample.h.orig Wed Dec 12 16:36:27 2001
-+++ src/Sample.h
-@@ -10,7 +10,7 @@
-
-
- #include <stdio.h>
--#include <stdint.h>
-+//#include <stdint.h>
-
- #include "DSP.h"
-
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-ag
--- a/audio/xanalyser/patches/patch-ag Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $
-
---- src/Scope.cc.orig Wed Dec 12 16:39:48 2001
-+++ src/Scope.cc
-@@ -8,7 +8,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
--#include <values.h>
-+#include <limits.h>
-
- #include <X11/Xlib.h>
- #ifdef DBE
-@@ -250,15 +250,15 @@
- if (sample.frame_count % num_count == 0)
- clear (0);
-
-- const double dx = xanalyser.dcadjust ? sample.dc[0] / MAXINT : 0;
-- const double dy = xanalyser.dcadjust ? sample.dc[1] / MAXINT : 0;
-+ const double dx = xanalyser.dcadjust ? sample.dc[0] / INT_MAX : 0;
-+ const double dy = xanalyser.dcadjust ? sample.dc[1] / INT_MAX : 0;
-
- const double sf = M_LOG2E * exp (0.05 * zoom * log (10.0));
-
- for (unsigned int i = 0; i < sample.length; i++) {
-
-- double x = (double)(buffer[2 * i + 0]) / (double)(MAXINT) - dx;
-- double y = (double)(buffer[2 * i + 1]) / (double)(MAXINT) - dy;
-+ double x = (double)(buffer[2 * i + 0]) / (double)(INT_MAX) - dx;
-+ double y = (double)(buffer[2 * i + 1]) / (double)(INT_MAX) - dy;
-
- double h = hypot (x, y);
- double rdh = h == 0.0 ? 0.0 : sf * log (h + 1.0) / h;
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-ah
--- a/audio/xanalyser/patches/patch-ah Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $
-
---- src/XAnalyser.ad.h.orig Sat Dec 1 20:07:38 2001
-+++ src/XAnalyser.ad.h
-@@ -1,6 +1,6 @@
- "XAnalyser.SampleSpeed: 44100",
- "XAnalyser.SampleLength: 2048",
--"XAnalyser.SampleDevice: /dev/dsp",
-+"XAnalyser.SampleDevice: /dev/audio",
- "XAnalyser.DCAdjust: True",
- "XAnalyser.Source: Soundcard",
- "XAnalyser.Filename: test.cdr",
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-ai
--- a/audio/xanalyser/patches/patch-ai Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $
-
---- src/XAnalyser.ad.orig Sat Dec 1 20:07:37 2001
-+++ src/XAnalyser.ad
-@@ -1,7 +1,7 @@
-
- XAnalyser.SampleSpeed: 44100
- XAnalyser.SampleLength: 2048
--XAnalyser.SampleDevice: /dev/dsp
-+XAnalyser.SampleDevice: /dev/audio
-
- XAnalyser.DCAdjust: True
-
diff -r 4f3813189ee9 -r 4fcc56b70e10 audio/xanalyser/patches/patch-aj
--- a/audio/xanalyser/patches/patch-aj Sun Jan 09 07:13:31 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/05/12 14:47:12 schmonz Exp $
-
---- src/utils.cc.orig Sat Dec 1 19:37:13 2001
-+++ src/utils.cc
-@@ -7,6 +7,7 @@
-
- #include <stdio.h>
- #include <math.h>
-+#include <ctype.h>
-
- #include <X11/Xlib.h>
- #include <Xm/Xm.h>
Home |
Main Index |
Thread Index |
Old Index