diff -ruN /usr/ports/audio/mixxx/Makefile mixxx/Makefile --- /usr/ports/audio/mixxx/Makefile Sun Sep 19 12:25:15 2004 +++ mixxx/Makefile Tue Oct 12 22:37:28 2004 @@ -6,15 +6,16 @@ # PORTNAME= mixxx -PORTVERSION= 1.3.2 +PORTVERSION= 1.4 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +DISTFILES= ${PORTNAME}-${PORTVERSION}a${EXTRACT_SUFX} MAINTAINER= jylefort@brutele.be COMMENT= A DJ mixing application -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ portaudio:${PORTSDIR}/audio/portaudio \ @@ -32,24 +33,20 @@ BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src -CONFIGURE_ENV= QTDIR="${X11BASE}" \ - QMAKESPEC="freebsd-g++" \ - NOPORTDOCS="${NOPORTDOCS}" +CONFIGURE_ENV= QTDIR="${X11BASE}" QMAKESPEC="freebsd-g++" MAKE_ENV= QTDIR="${X11BASE}" .include CONFIGURE_ARGS= --prefix=${PREFIX} -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - post-patch: @${REINPLACE_CMD} \ - -e 's|@LOCALBASE@|${LOCALBASE}|g' \ - -e 's|@X11BASE@|${X11BASE}|g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ + -e 's|/bin/bash|${LOCALBASE}&| ; \ + s|$$QTDIR/bin/qmake|${LOCALBASE}/bin/qmake|g' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} \ + -e 's|system( ld|& -shared -L${LOCALBASE}/lib -L${X11BASE}/lib|' \ ${CONFIGURE_WRKSRC}/check.qbas .if !defined(NOPORTDOCS) diff -ruN /usr/ports/audio/mixxx/distinfo mixxx/distinfo --- /usr/ports/audio/mixxx/distinfo Sat Jun 26 08:07:00 2004 +++ mixxx/distinfo Tue Oct 12 20:41:41 2004 @@ -1,2 +1,2 @@ -MD5 (mixxx-1.3.2.tar.gz) = 0562b94bbb0ddb53854719f0a0b319fd -SIZE (mixxx-1.3.2.tar.gz) = 3752254 +MD5 (mixxx-1.4a.tar.gz) = b5b00f17e1a107d307162b317722645c +SIZE (mixxx-1.4a.tar.gz) = 3842082 diff -ruN /usr/ports/audio/mixxx/files/patch-src::check.qbas mixxx/files/patch-src::check.qbas --- /usr/ports/audio/mixxx/files/patch-src::check.qbas Sat Jun 26 08:07:00 2004 +++ mixxx/files/patch-src::check.qbas Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/check.qbas.orig Fri Jun 25 22:37:11 2004 -+++ src/check.qbas Fri Jun 25 22:42:36 2004 -@@ -169,7 +169,7 @@ - # At first ----> check using LD - # -------------------------------------- - !isEmpty( LINK_LIBS ) { -- system( ld $${LINK_LIBS} 2>/dev/null ) { -+ system( ld -shared -L@LOCALBASE@/lib -L@X11BASE@/lib $${LINK_LIBS} 2>/dev/null ) { - FOUND = true - } - } diff -ruN /usr/ports/audio/mixxx/files/patch-src::configure mixxx/files/patch-src::configure --- /usr/ports/audio/mixxx/files/patch-src::configure Sat Jun 26 08:07:00 2004 +++ mixxx/files/patch-src::configure Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- src/configure.orig Fri Jun 25 22:52:48 2004 -+++ src/configure Fri Jun 25 22:53:23 2004 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!@LOCALBASE@/bin/bash - - #************************************************************************ - # QBAS -@@ -369,9 +369,9 @@ - - ######################### qmake, uic, moc checking - # --if test -e $QTDIR/bin/qmake ; -+if test -e @LOCALBASE@/bin/qmake ; - then -- QT_QMAKE_EXEC="$QTDIR/bin/qmake" ; -+ QT_QMAKE_EXEC="@LOCALBASE@/bin/qmake" ; - RES="yes" - else - find /usr -name qmake 1> temp ; diff -ruN /usr/ports/audio/mixxx/files/patch-src::mixxx.cpp mixxx/files/patch-src::mixxx.cpp --- /usr/ports/audio/mixxx/files/patch-src::mixxx.cpp Sat Jun 26 08:07:00 2004 +++ mixxx/files/patch-src::mixxx.cpp Tue Oct 12 22:09:03 2004 @@ -1,26 +1,6 @@ ---- src/mixxx.cpp.orig Fri Jun 25 20:52:15 2004 -+++ src/mixxx.cpp Fri Jun 25 21:17:32 2004 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include "wknob.h" - #include "wslider.h" -@@ -85,6 +86,11 @@ - - #include "playerproxy.h" - -+void MixxxApp::Timeout() -+{ -+ // nop -+} -+ - MixxxApp::MixxxApp(QApplication *a, QStringList files) - { - app = a; -@@ -113,7 +119,7 @@ +--- src/mixxx.cpp.orig Tue Oct 12 22:08:14 2004 ++++ src/mixxx.cpp Tue Oct 12 22:08:35 2004 +@@ -111,7 +111,7 @@ // On Windows and Mac it is always (and only) app dir. // QString qConfigPath; @@ -29,17 +9,3 @@ // On Linux, check if the path is stored in the configuration database. if (config->getValueString(ConfigKey("[Config]","Path")).length()>0 && QDir(config->getValueString(ConfigKey("[Config]","Path"))).exists()) qConfigPath = config->getValueString(ConfigKey("[Config]","Path")); -@@ -381,7 +387,12 @@ - #ifndef __WIN__ - new MixxxSocketServer(m_pTrack); - #endif -- -+ -+ // Keep the sound alive -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), SLOT(Timeout())); -+ timer->start(100); -+ - // Call inits to invoke all other construction parts - initActions(); - initMenuBar(); diff -ruN /usr/ports/audio/mixxx/files/patch-src::mixxx.h mixxx/files/patch-src::mixxx.h --- /usr/ports/audio/mixxx/files/patch-src::mixxx.h Sat Jun 26 08:07:00 2004 +++ mixxx/files/patch-src::mixxx.h Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- src/mixxx.h.orig Fri Jun 25 21:13:01 2004 -+++ src/mixxx.h Fri Jun 25 21:13:29 2004 -@@ -96,6 +96,7 @@ - /** Change of file to play */ - //void slotChangePlay(int,int,int, const QPoint &); - private: -+ void Timeout(); - /** view is the main widget which represents your working area. The View - * class should handle all events of the view widget. It is kept empty so - * you can create your view according to your application's needs by diff -ruN /usr/ports/audio/mixxx/files/patch-src::mixxx.pro mixxx/files/patch-src::mixxx.pro --- /usr/ports/audio/mixxx/files/patch-src::mixxx.pro Sat Jun 26 08:07:00 2004 +++ mixxx/files/patch-src::mixxx.pro Tue Oct 12 21:51:03 2004 @@ -1,5 +1,5 @@ ---- src/mixxx.pro.orig Tue Jun 1 07:13:51 2004 -+++ src/mixxx.pro Fri Jun 25 23:20:23 2004 +--- src/mixxx.pro.orig Mon Oct 11 11:58:09 2004 ++++ src/mixxx.pro Tue Oct 12 21:50:29 2004 @@ -31,15 +31,7 @@ DEFINES += __PORTAUDIO__ SOURCES += playerportaudio.cpp @@ -25,7 +25,17 @@ win32:SOURCES += powermatewin.cpp win32:HEADERS += powermatewin.h win32:LIBS += setupapi.lib -@@ -145,8 +135,6 @@ +@@ -145,16 +135,14 @@ + # Mouse + SOURCES += mouse.cpp + HEADERS += mouse.h +-unix:!macx:SOURCES += mouselinux.cpp +-unix:!macx:HEADERS += mouselinux.h ++#unix:!macx:SOURCES += mouselinux.cpp ++#unix:!macx:HEADERS += mouselinux.h + #win32:SOURCES += mousewin.cpp + #win32:HEADERS += mousewin.h + # Joystick SOURCES += joystick.cpp HEADERS += joystick.h @@ -34,7 +44,7 @@ # KissFFT KISSFFT_DIR = ../lib/kissfft -@@ -155,9 +143,8 @@ +@@ -163,9 +151,8 @@ INCLUDEPATH += $$KISSFFT_DIR # Audio scaling @@ -46,7 +56,7 @@ # Debug plotting through gplot API #unix:DEFINES += __GNUPLOT__ -@@ -189,7 +176,6 @@ +@@ -197,7 +184,6 @@ SETTINGS_FILE = \".mixxx.cfg\" TRACK_FILE = \".mixxxtrack.xml\" @@ -54,7 +64,7 @@ } unix { -@@ -251,23 +237,12 @@ +@@ -259,23 +245,12 @@ keyb.path = $${UNIX_SHARE_PATH}/keyboard keyb.files = keyboard/* @@ -79,7 +89,7 @@ } -@@ -287,6 +262,10 @@ +@@ -295,6 +270,10 @@ # Socket SOURCES += mixxxsocketserver.cpp mixxxsocketclient.cpp #mixxxsocketcli.cpp HEADERS += mixxxsocketserver.h mixxxsocketclient.h #mixxxsocket.cli.h diff -ruN /usr/ports/audio/mixxx/pkg-plist mixxx/pkg-plist --- /usr/ports/audio/mixxx/pkg-plist Sat Jun 26 08:07:00 2004 +++ mixxx/pkg-plist Tue Oct 12 22:17:31 2004 @@ -6,8 +6,6 @@ share/mixxx/midi/MidiTech-MidiControl.midi.cfg share/mixxx/midi/Mixman DM2 for Mixxx.dm2 share/mixxx/midi/Mixman DM2.midi.cfg -share/mixxx/midi/PowerMate.midi.cfg -share/mixxx/midi/Turntable.midi.cfg share/mixxx/midi/format.txt share/mixxx/skins/outline/back-off-Ch1.png share/mixxx/skins/outline/back-off-Ch2.png