changeset 35:3fcc147b253a

Updates towards 0.8beta0
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 19 Jun 2003 20:13:00 +0000
parents 0e1189b94a7f
children f6afce365705
files BUGS FAQ NEWS README TODO acinclude.m4 autogen.sh bootstrap.sh configure.in
diffstat 9 files changed, 97 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/BUGS	Thu Jun 19 20:12:02 2003 +0000
+++ b/BUGS	Thu Jun 19 20:13:00 2003 +0000
@@ -1,5 +1,6 @@
 XMMS-SID - Known bugs
 =====================
+Author's contact information can be found from README-file.
 
 * There _may_ be some endianess problems that I'm not aware of.
   PLEASE bugger me, if you notice any! :)
--- a/FAQ	Thu Jun 19 20:12:02 2003 +0000
+++ b/FAQ	Thu Jun 19 20:13:00 2003 +0000
@@ -7,7 +7,7 @@
 - When using XMMS-SID with the OpenGL Spectrum Analyzer,
 - Can I make my own SIDs??? How??
 - XMMS-SID plays some tune badly!
-
+- What about SIDPlay1 & 2 support?
 
 >---
 
@@ -150,3 +150,20 @@
    can be done.
 
 >---
+
+Q: What about SIDPlay1 & 2 support? I saw some screenshots from 0.8beta
+   that had selectable support for v1 and v2 in the configuration!
+
+A: The runtime selection in betas 0-4 was based on patched libsidplay2
+   that changed the namespace to not to clash with libsidplay1. I don't
+   think it is worth of the trouble because a) it would break other apps
+   using libsidplay2 unless the patched version was statically linked to
+   XMMS-SID and b) I would have to manually create the patches for every
+   libsidplay2 update. Too much work, so it's not going to happen.
+
+   Only "feasible" (but also not worth of the trouble) way to achieve
+   runtime-selectable support would be to create a dynamic plugin-
+   architechture into XMMS-SID to on-demand load support for emulation
+   engine(s). I might do this if you are willing to pay 2000 EUR for it :-P
+
+>---
--- a/NEWS	Thu Jun 19 20:12:02 2003 +0000
+++ b/NEWS	Thu Jun 19 20:13:00 2003 +0000
@@ -11,7 +11,8 @@
   Dekadence web-experience: http://www.dekadence64.org/
 
 * Support for libSIDPlay 2.x! If you have 1.x too, you
-  can select which one to use in the configuration dialog.
+  can select which one to compile in via "configure"
+  options --with-sidplay1 and --with-sidplay2.
 
 * HVSC song-length database support. XMMS-SID now supports
   the XSIDPLAY's song-length database for tunes contained
@@ -24,12 +25,10 @@
   if song-length database does not contain information for
   selected tune.
 
-* Improved file information dialog:
-
-  - Sub-song "name" or "title" is shown (if any) in the
-    sub-song selector. If "name" is found for the song,
-    it is shown, if not, then "title" is checked for
-    and shown if found.
+* Improved file information dialog: Sub-song "name" or
+  "title" is shown (if any) in the sub-song selector.
+  If "name" is found for the song, it is shown, if not,
+  then "title" is checked for and shown if found.
 
 * XMMS v1.2.5 introduced the "generic title format" that
   can be used to have same format titles for those
--- a/README	Thu Jun 19 20:12:02 2003 +0000
+++ b/README	Thu Jun 19 20:13:00 2003 +0000
@@ -16,8 +16,8 @@
     (C) Copyright 1999 Aladdin Enterprises. All rights reserved.
 
 
-Short Introduction
-==================
+Introduction
+============
 XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides
 support for playing the so-called "SID tunes", which are music
 from old Commodore computer programs like games, demos, etc.
@@ -71,5 +71,3 @@
 XMMS-SID's homepage: http://www.tnsp.org/xmms-sid.php
 
 TNSP's WWW  : http://www.tnsp.org/
-TNSP e-mail : tnsp@tnsp.org
-
--- a/TODO	Thu Jun 19 20:12:02 2003 +0000
+++ b/TODO	Thu Jun 19 20:13:00 2003 +0000
@@ -1,19 +1,6 @@
 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
 ==============================================================
 
-
-- UPDATE LIBTOOL! done.
-
-- Support libSIDPlay v2.x if detected
-
-  also make libsidplay1 optional, not required.
-  detect with configure.
-
-  if (sidplay1 || 2) ok; else fail;
-
---- 
-
------------------
 For XMMS-SID v0.9/1.0
 
  * Possibly: Song "pre-rendering" support+position selector
@@ -21,12 +8,13 @@
    CPU power (or patience) and enough RAM to spare for
    the whole song.
 
+   - What about "pre-rendering" of next playlist item during
+     playing of current one? Would it be possible?
+
  * Make it more modular (for future enchangements)
 
 INTERNAL:
 
-- Clean up the sources somewhat (char->gchar, etc)
-
 - Add STIL-database indexing for faster searches?
   (may not be real issue)
 
--- a/acinclude.m4	Thu Jun 19 20:12:02 2003 +0000
+++ b/acinclude.m4	Thu Jun 19 20:13:00 2003 +0000
@@ -427,6 +427,7 @@
 
     if test "$builders_work" = yes; then
         builders_available=yes
+        xs_builders="reSID $xs_builders"
         AC_DEFINE(HAVE_RESID_BUILDER)
         RESID_LDADD="-lresid-builder"
     fi
@@ -462,6 +463,7 @@
 
     if test "$builders_work" = yes; then
         builders_available=yes
+        xs_builders="HardSID $xs_builders"
         AC_DEFINE(HAVE_HARDSID_BUILDER)
         HARDSID_LDADD="-lhardsid-builder"
     fi
--- a/autogen.sh	Thu Jun 19 20:12:02 2003 +0000
+++ b/autogen.sh	Thu Jun 19 20:13:00 2003 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 
-echo "**************************************************"
-echo "** Generating build information                 **"
-echo "** This may take a while, please be patient ... **"
-echo "**************************************************"
+echo "**"
+echo "** Generating build information."
+echo "** This may take a while, please be patient ..."
+echo "**"
 
 rm -f config.cache config.log
 
@@ -12,13 +12,13 @@
 touch $directory/configure.in
 
 # Regenerate configuration files
-echo "* aclocal"
+echo "- aclocal"
 aclocal -I .
 
-echo "* automake"
+echo "- automake"
 automake --foreign -v
 
-echo "* autoconf"
+echo "- autoconf"
 autoconf
 
 # Run configure for this platform
--- a/bootstrap.sh	Thu Jun 19 20:12:02 2003 +0000
+++ b/bootstrap.sh	Thu Jun 19 20:13:00 2003 +0000
@@ -1,12 +1,22 @@
 #! /bin/sh
 
-echo "**************************************************"
-echo "** Bootstrapping XMMS-SID package               **"
-echo "** This may take a while, please be patient ... **"
-echo "**************************************************"
+echo "**"
+echo "** Now bootstrapping the package."
+echo "** This may take a while, please be patient ..."
+echo "**"
+echo "- aclocal     - 0%"
+aclocal
+
+echo "- autoconf    - 20%"
+autoconf
 
-aclocal
-autoconf
+echo "- autoheader  - 40%"
 autoheader
+
+echo "- automake    - 60%"
 automake -a
+
+echo "- libtoolize  - 80%"
 libtoolize --automake --force
+
+echo "- ok.         - 100%"
--- a/configure.in	Thu Jun 19 20:12:02 2003 +0000
+++ b/configure.in	Thu Jun 19 20:13:00 2003 +0000
@@ -2,20 +2,31 @@
 dnl *** Process this file with autoconf to produce a configure script.
 dnl ***
 
-dnl Require autoconf 2.54 or later
-AC_PREREQ(2.54)
+dnl Require autoconf 2.56 or later
+AC_PREREQ(2.56)
 
 dnl Initialize
 AC_INIT(XMMS-SID, 0.8.0beta1, ccr@tnsp.org)
 AC_COPYRIGHT([[(C) 2002-2003 Matti 'ccr' Hämäläinen]])
 AC_CONFIG_SRCDIR(src/xmms-sid.h)
 AM_INIT_AUTOMAKE
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(src/config.h)
+
+
+dnl ***
+dnl *** Define some templates
+dnl ***
+AH_TEMPLATE([HAVE_XMMSEXTRA],[Define if you have XMMS version 1.2.5 or later])
+AH_TEMPLATE([HAVE_SIDPLAY1],[Define if you want to use libSIDPlay 1])
+AH_TEMPLATE([HAVE_SIDPLAY2],[Define if you want to use libSIDPlay 2])
+AH_TEMPLATE([HAVE_RESID_BUILDER],[Define if you have reSID with libSIDPlay 2])
+AH_TEMPLATE([HAVE_HARDSID_BUILDER],[Define if you have HardSID with libSIDPlay 2])
 
 
 dnl ***
 dnl *** Some general checks
 dnl ***
+AC_PREFIX_PROGRAM(xmms)
 AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
@@ -24,13 +35,11 @@
 dnl ***
 dnl *** Checks for programs
 dnl ***
+AC_PROG_CXX
 AC_PROG_CC
-AC_PROG_CXX
-dnl AC_PROG_CPP
+AC_PROG_CPP
 AC_PROG_INSTALL
-AC_HEADER_STDC
 
-AC_PREFIX_PROGRAM(xmms)
 
 dnl ***
 dnl *** Checks for generic libraries
@@ -43,8 +52,8 @@
 dnl ***
 dnl *** libSIDPlay 1 options
 dnl ***
-AC_ARG_WITH(libsidplay1,
-[  --with-libsidplay1=PREFIX   Enable SIDPlay1 with install-PREFIX is],
+AC_ARG_WITH(sidplay1,
+[  --with-sidplay1=PREFIX   Enable SIDPlay1 with install-PREFIX is],
 [
 if test "$withval" = yes; then
 xs_sidplay1=yes
@@ -77,10 +86,11 @@
 dnl ***
 dnl *** libSIDPlay 2 options
 dnl ***
-AC_ARG_WITH(libsidplay2,
-[  --with-libsidplay2=PREFIX   Enable SIDPlay1 with install-PREFIX is],
+AC_ARG_WITH(sidplay2,
+[  --with-sidplay2=PREFIX   Enable SIDPlay1 with install-PREFIX is],
 [
 if test "$withval" = yes; then
+xs_sidplay1=no
 xs_sidplay2=yes
 xs_sidplay2_library=""
 xs_sidplay2_includes=""
@@ -89,6 +99,7 @@
 	xs_sidplay2=no
 	else
 	xs_sidplay2=yes
+	xs_sidplay1=no
 	xs_sidplay2_includes="$withval/include"
 	xs_sidplay2_library="$withval/lib"
 	fi
@@ -124,6 +135,7 @@
 
 
 OPT_SIDPLAY2="no"
+if test "$OPT_SIDPLAY1" = no; then
 if test "$xs_sidplay2" = yes; then
 LIBSIDPLAY2_REQUIRED_VERSION="2.1.0"
 XS_PATH_LIBSIDPLAY2
@@ -140,6 +152,7 @@
 AC_MSG_ERROR([libSIDPlay2 library and/or headers were not found!])
 fi
 fi
+fi
 
 
 dnl ***
@@ -151,6 +164,23 @@
 fi
 fi
 
+dnl ***
+dnl *** Checks for header files, types and functions
+dnl ***
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_C_VOLATILE
+
+AC_FUNC_MALLOC
+AC_TYPE_SIGNAL
+AC_FUNC_STAT
+AC_CHECK_FUNCS([memset strcasecmp strerror strrchr])
+
 
 dnl ***
 dnl *** Check XMMS version
@@ -169,16 +199,6 @@
 
 
 dnl ***
-dnl *** Define some templates
-dnl ***
-AC_DEFINE(HAVE_XMMSEXTRA, 0, Define to 1 if you have XMMS version 1.2.5 or later)
-AC_DEFINE(HAVE_SIDPLAY1, 0, Define to 1 if you want to use libSIDPlay 1)
-AC_DEFINE(HAVE_SIDPLAY2, 0, Define to 1 if you want to use libSIDPlay 2)
-AC_DEFINE(HAVE_RESID_BUILDER, 0, Define to 1 if you have reSID with libSIDPlay 2)
-AC_DEFINE(HAVE_HARDSID_BUILDER, 0, Define to 1 if you have HardSID with libSIDPlay 2)
-
-
-dnl ***
 dnl *** And finally, output the all generatable files!
 dnl ***
 AC_CONFIG_FILES([
@@ -199,5 +219,6 @@
 	XMMS >= v1.2.5 extra features : $OPT_XMMSEXTRA
 	libSIDPlay 1 support          : $OPT_SIDPLAY1
 	libSIDPlay 2 support          : $OPT_SIDPLAY2
+		Included builders     : $xs_builders
 
 ])