Update to IMMS version 1.2a. The functionality for classification has been

split back out so this is a General, not a Visualization, XMMS plug-in.
The sox program is now used to scale music for classification, and in
general things should be far faster using more optimal SQL with SQLite 3.
Since analysis is not integrated with XMMS playback directly, instead of
"demand-classification" the analyze program can be run beforehand and
you will immediately start off with smoother transitions between musical
genres.

7 files changed, 47 insertions, 37 deletions

diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 0446cce0c168..b6d68700aa63 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imms
-PORTVERSION=	1.1
+PORTVERSION=	1.2a
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,11 +15,12 @@ PKGNAMEPREFIX=	xmms-
 MAINTAINER=	green@FreeBSD.org
 COMMENT=	Automatic, weight-based playlist ordering plugin for XMMS
 
+BUILD_DEPENDS=	sox:${PORTSDIR}/audio/sox
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		sqlite.2:${PORTSDIR}/databases/sqlite \
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		id3:${PORTSDIR}/audio/id3lib \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
+		fftw3.3:${PORTSDIR}/math/fftw3 \
+		tag.3:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/xmms-imms/distinfo b/audio/xmms-imms/distinfo
index 66edaa8042ad..0fd18af68b9a 100644
--- a/audio/xmms-imms/distinfo
+++ b/audio/xmms-imms/distinfo
@@ -1,2 +1,2 @@
-MD5 (imms-1.1.tar.bz2) = b229b76f183ff2b3d4d1eccfd0569da2
-SIZE (imms-1.1.tar.bz2) = 48912
+MD5 (imms-1.2a.tar.bz2) = af48ee1c967e26a93c34b423fbaf18b2
+SIZE (imms-1.2a.tar.bz2) = 52470
diff --git a/audio/xmms-imms/files/patch-configure.ac b/audio/xmms-imms/files/patch-configure.ac
index eb7af04f3b88..5300a499f6ec 100644
--- a/audio/xmms-imms/files/patch-configure.ac
+++ b/audio/xmms-imms/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	Thu Apr 15 16:15:24 2004
-+++ configure.ac	Sat Aug 14 12:42:19 2004
+--- configure.ac.orig	Wed Aug 18 01:56:28 2004
++++ configure.ac	Tue Aug 31 16:19:40 2004
 @@ -31,8 +31,8 @@
  AC_ARG_ENABLE(debug,
              AC_HELP_STRING([--enable-debug],
@@ -11,7 +11,7 @@
  
  AC_PROG_CXX
  AC_PROG_CC
-@@ -96,6 +96,7 @@
+@@ -119,6 +119,7 @@
  
      saved_libs="$LIBS"
      LIBS="$LIBS-ltag"
@@ -19,7 +19,7 @@
      CPPFLAGS=`taglib-config --cflags`
  
      AC_TRY_LINK([#include <tag.h>
-@@ -104,6 +105,7 @@
+@@ -127,6 +128,7 @@
          [XCPPFLAGS="$XCPPFLAGS `taglib-config --cflags`" 
                                              AC_MSG_RESULT(yes)],
          [LIBS=$saved_libs AC_MSG_RESULT(no)])
@@ -27,3 +27,12 @@
  fi
  
  if test "$with_taglib" = "yes"; then
+@@ -165,7 +167,7 @@
+ 
+ 
+ if test "$with_screensaver" != "no"; then
+-    LDFLAGS="-shared -L/usr/X11R6/lib"
++    LDFLAGS="-L/usr/X11R6/lib"
+     AC_CHECK_LIB(Xext, XextFindDisplay,, [with_screensaver=no])
+     AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,, [with_screensaver=no])
+     AC_CHECK_HEADERS(X11/extensions/scrnsaver.h,,
diff --git a/audio/xmms-imms/files/patch-rules.mk b/audio/xmms-imms/files/patch-rules.mk
index 40906ef27c7e..90219ddc48ea 100644
--- a/audio/xmms-imms/files/patch-rules.mk
+++ b/audio/xmms-imms/files/patch-rules.mk
@@ -1,11 +1,11 @@
---- rules.mk.orig	Sun Jan 25 16:55:21 2004
-+++ rules.mk	Wed Feb 11 18:43:22 2004
-@@ -57,7 +57,7 @@
- 	$(warning Use 'make install-user' to install for the current user only.)
+--- rules.mk.orig	Wed Aug 18 01:56:28 2004
++++ rules.mk	Tue Aug 31 16:13:51 2004
+@@ -26,7 +26,7 @@
+ endif
  
- install-system: libimms.so
--	${INSTALL_PROGRAM} libimms.so ${DESTDIR}`xmms-config --visualization-plugin-dir`
-+	${INSTALL_PROGRAM} libimms.so `xmms-config --visualization-plugin-dir`
+ define installprogs
+-    ${INSTALL_PROGRAM} analyzer immsremote immstool ${PREFIX}
++    ${INSTALL_PROGRAM} analyzer immsremote immstool ${PREFIX}/bin
+ endef
  
- user-message:
- 	$(warning Defaulting to installing for current user only.)
+ system-message:
diff --git a/audio/xmms-imms/files/patch-utils.cc b/audio/xmms-imms/files/patch-utils.cc
index bbf1df0aa6b0..bec269b96110 100644
--- a/audio/xmms-imms/files/patch-utils.cc
+++ b/audio/xmms-imms/files/patch-utils.cc
@@ -1,8 +1,8 @@
---- utils.cc.orig	Sat Aug 14 11:03:14 2004
-+++ utils.cc	Sat Aug 14 11:05:54 2004
-@@ -3,23 +3,6 @@
- 
- #include "utils.h"
+--- utils.cc.orig	Wed Aug 18 01:56:28 2004
++++ utils.cc	Tue Aug 31 15:44:15 2004
+@@ -11,23 +11,6 @@
+ using std::ofstream;
+ using std::ios_base;
  
 -// Random
 -int imms_random(int max)
diff --git a/audio/xmms-imms/files/patch-vars.mk.in b/audio/xmms-imms/files/patch-vars.mk.in
index 2b2de9519fc5..a50325d848cf 100644
--- a/audio/xmms-imms/files/patch-vars.mk.in
+++ b/audio/xmms-imms/files/patch-vars.mk.in
@@ -1,19 +1,16 @@
---- vars.mk.in.orig	Thu Apr 15 16:15:24 2004
-+++ vars.mk.in	Sat Aug 14 12:51:25 2004
-@@ -4,15 +4,14 @@
- INSTALL_PROGRAM = @INSTALL@
- DESTDIR = @prefix@
+--- vars.mk.in.orig	Wed Aug 18 01:56:28 2004
++++ vars.mk.in	Tue Aug 31 12:58:54 2004
+@@ -5,12 +5,11 @@
+ PREFIX = @prefix@
+ VPATH = ..:../players/xmms:../analyzer:../utils
  
 -SHELL = bash
- XMMS_OBJ = @PLUGIN_OBJ@ interface.o player.o libimmscore.a 
- CORE_OBJ = imms.o immsdb.o basicdb.o correlate.o playlist.o sqldb.o \
- 	   fetcher.o picker.o spectrum.o songinfo.o comm.o server.o \
- 	   regexx.o utils.o strmanip.o levenshtein.o xidle.o md5.o
+ XMMS_OBJ = @PLUGIN_OBJ@ interface.o libimmscore.a 
  
--CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ -Wall -fPIC -D_REENTRANT
--CXXFLAGS = ${CPPFLAGS} -fno-rtti
+-CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ -Wall -fPIC -D_REENTRANT -I../
+-CXXFLAGS = -fno-rtti
 -LDFLAGS = `xmms-config --libs` @LIBS@
-+CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall -fPIC -D_REENTRANT
++CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall -fPIC -D_REENTRANT -I../
 +CXXFLAGS = ${CPPFLAGS}
 +LDFLAGS = @LDFLAGS@ `xmms-config --libs` -lc -lm @LIBS@
  ARFLAGS = rs
diff --git a/audio/xmms-imms/pkg-plist b/audio/xmms-imms/pkg-plist
index 83d0a34ca14a..b012245f62d1 100644
--- a/audio/xmms-imms/pkg-plist
+++ b/audio/xmms-imms/pkg-plist
@@ -1 +1,4 @@
-lib/xmms/Visualization/libimms.so
+bin/analyzer
+bin/immsremote
+bin/immstool
+lib/xmms/General/libimms.so