Update to version 2.0.7 after repo-copy from ports/audio/libsidplay.

This commit is contained in:
Anders Nordby 2002-11-18 05:08:19 +00:00
parent 98f0dd74b6
commit 728184c6e1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70374
7 changed files with 114 additions and 53 deletions

View file

@ -1,25 +1,27 @@
# New ports collection makefile for: libsidplay # New ports collection makefile for: libsidplay2
# Date created: 31 October 1996 # Date created: 6 October 2002
# Whom: Stefan Zehl <sec@42.org> # Whom: Anders Nordby <anders@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# #
PORTNAME= libsidplay PORTNAME= libsidplay2
PORTVERSION= 1.36.57 PORTVERSION= 2.0.7
CATEGORIES= audio emulators CATEGORIES= audio emulators
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sidplay2
DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}-5
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tgz
MAINTAINER= sec@42.org MAINTAINER= ports@FreeBSD.org
USE_LIBTOOL= yes LIB_DEPENDS= resid.2:${PORTSDIR}/audio/resid
WRKSRC= ${WRKDIR}/${PORTNAME:S/2//}-${PORTVERSION}
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if (${ARCH} == i386)
CONFIGURE_ARGS+= --enable-optendian --enable-optfixpoint
.endif
.include <bsd.port.post.mk>

View file

@ -1 +1 @@
MD5 (libsidplay-1.36.57.tgz) = a935ec67d5600b079e22ecac58cc19d5 MD5 (libsidplay-2.0.7-5.tgz) = 3c2d7e5b8f733a131a03fe14a97d76a0

View file

@ -1,11 +1,11 @@
--- configure.orig Sat Jan 12 02:17:19 2002 --- configure.orig Mon May 7 19:23:11 2001
+++ configure Sat Jan 12 02:18:08 2002 +++ configure Mon Nov 18 05:04:02 2002
@@ -6159,7 +6159,7 @@ @@ -1841,7 +1841,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
# Always use our own libtool. # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool' -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='libtool' +LIBTOOL='libtool'
# Prevent multiple expansion # Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.

View file

@ -0,0 +1,73 @@
--- src/player.cpp.orig Mon May 7 17:09:39 2001
+++ src/player.cpp Sun Oct 6 20:53:45 2002
@@ -580,34 +580,49 @@
int player::loadFilter (const sid_fc_t *cutoffs, uint_least16_t points)
{
#ifndef HAVE_HARDSID
- fc_point fc[0x800];
-
- // Make sure there are enough filter points and they are legal
- if ((points < 2) || (points > 0x800))
- goto player_loadFilter_error;
+ fc_point fc[0x802];
+ const fc_point *f0 = fc;
+ int pnts = 0;
+ if (cutoffs == NULL)
+ { // Select default filter
+ sid.fc_default (f0, pnts);
+ sid2.fc_default (f0, pnts);
+ }
+ else
{
- const sid_fc_t *val, *valp, vals = {-1, 0};
- // Last check, make sure they are list in numerical order
- // for both axis
- val = &vals; // (start)
- for (int i = 0; i < points; i++)
+ pnts = points;
+ // Make sure there are enough filter points and they are legal
+ if ((pnts < 2) || (pnts > 0x800))
+ goto player_loadFilter_error;
+
{
- valp = val;
- val = &cutoffs[i];
- if ((*valp)[0] > (*val)[0])
- goto player_loadFilter_error;
-// if ((*valp)[1] >= (*val)[1])
-// goto player_loadFilter_error;
- fc[i][0] = (sound_sample) (*val)[0];
- fc[i][1] = (sound_sample) (*val)[1];
+ const sid_fc_t fstart = {-1, 0};
+ const sid_fc_t *fprev = &fstart, *fin = cutoffs;
+ fc_point *fout = fc;
+ // Last check, make sure they are list in numerical order
+ // for both axis
+ while (pnts-- > 0)
+ {
+ if ((*fprev)[0] >= (*fin)[0])
+ goto player_loadFilter_error;
+ fout++;
+ (*fout)[0] = (sound_sample) (*fin)[0];
+ (*fout)[1] = (sound_sample) (*fin)[1];
+ fprev = fin++;
+ }
+ // Updated ReSID interpolate requires we
+ // repeat the end pnts
+ *(fout+1) = *fout;
+ fc[0] = fc[1];
+ pnts = points + 2;
}
}
// function from reSID
- points--;
- interpolate (fc, fc, fc + points, fc + points, sid.fc_plotter (), 1.0);
- interpolate (fc, fc, fc + points, fc + points, sid2.fc_plotter(), 1.0);
+ pnts--;
+ interpolate (f0, f0 + pnts, sid.fc_plotter (), 1.0);
+ interpolate (f0, f0 + pnts, sid2.fc_plotter (), 1.0);
return 0;
player_loadFilter_error:

View file

@ -1 +1 @@
A Commodore SID-chip emulator library to play SID music files Library to play Commodore 64 SID-tunes cycle accurate

View file

@ -1,17 +1,6 @@
Basically, SIDPLAY is just an ordinary music player software. More Sidplay 2 is the second in the Sidplay series originally developed by Michael
specifically, it emulates the Sound Interface Device chip (MOS 6581, Schwendt. This version is written by Simon White and is cycle accurate for
known as SID) and the Micro Processor Unit (MOS 6510) of the improved sound reproduction. Sidplay 2 is capable of playing all C64 mono and
Commodore 64 on your computer. Its platform-independent software stereo file formats.
emulates hardware components. Therefore it is able to load and execute
C64 machine code programs which produce music or sound. In general,
these are independent fragments of code and data which have been
ripped from games and demonstration programs and were transferred
directly from the C64. All you need is a supported operating system and
audio hardware with average PCM waveform playback capabilities. A
fast CPU and a 16-bit sound card are recommended for better
performance.
This is just the library. To actually use it, you need one of the WWW: http://sidplay2.sourceforge.net/
front-ends like 'sidplay' or 'xsidplay'.
WWW: http://www.geocities.com/SiliconValley/Lakes/5147/index.html

View file

@ -1,15 +1,12 @@
include/sidplay/compconf.h include/sidplay/Buffer.h
include/sidplay/emucfg.h include/sidplay/SidTune.h
include/sidplay/fformat.h include/sidplay/SmartPtr.h
include/sidplay/fixpoint.h include/sidplay/sidconfig.h
include/sidplay/libcfg.h include/sidplay/sidendian.h
include/sidplay/myendian.h include/sidplay/sidplay2.h
include/sidplay/mytypes.h include/sidplay/sidtypes.h
include/sidplay/player.h lib/libsidplay2.a
include/sidplay/sidtune.h lib/libsidplay2.la
include/sidplay/version.h lib/libsidplay2.so
lib/libsidplay.a lib/libsidplay2.so.0
lib/libsidplay.la
lib/libsidplay.so
lib/libsidplay.so.1
@dirrm include/sidplay @dirrm include/sidplay