1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00

- Update to 1.7.0

PR:		139515
Submitted by:	Ports Fury
This commit is contained in:
Martin Wilke 2009-10-14 13:45:26 +00:00
parent 24f39f450c
commit 3fe70838c5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=242838
11 changed files with 2437 additions and 1338 deletions

View File

@ -6,51 +6,50 @@
#
PORTNAME= mixxx
PORTVERSION= 1.4.2
PORTREVISION= 7
PORTVERSION= 1.7.0
CATEGORIES= audio
MASTER_SITES= SF
MASTER_SITES= http://downloads.mixxx.org/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= A DJ mixing application
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
qmake:${PORTSDIR}/devel/qmake
LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \
portaudio:${PORTSDIR}/audio/portaudio \
mad:${PORTSDIR}/audio/libmad \
id3tag:${PORTSDIR}/audio/libid3tag \
vorbis:${PORTSDIR}/audio/libvorbis \
sndfile:${PORTSDIR}/audio/libsndfile
LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
id3tag.0:${PORTSDIR}/audio/libid3tag \
mad.2:${PORTSDIR}/audio/libmad \
sndfile.1:${PORTSDIR}/audio/libsndfile \
vorbis.4:${PORTSDIR}/audio/libvorbis \
portaudio.2:${PORTSDIR}/audio/portaudio2
USE_QT_VER= 3
HAS_CONFIGURE= yes
USE_GL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_WRKSRC= ${WRKSRC}/src
BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${WRKSRC}/src
USE_QT_VER= 4
QT_COMPONENTS= corelib gui opengl qt3support script svg xml \
linguist_build moc_build qmake_build uic_build \
moc_build rcc_build
USE_SCONS= yes
SCONS_BUILDENV= ${SCONS_ENV}
SCONS_ARGS= qtdir="${QT_PREFIX}"
CONFIGURE_ENV= QMAKESPEC="freebsd-g++"
CONFIGURE_ARGS= --prefix=${PREFIX}
MAKE_ENV= QTDIR="${QT_PREFIX}"
CCFLAGS= `pkg-config --cflags portaudio-2.0 \
QtCore QtGui QtOpenGL Qt3Support QtScript QtSvg QtXml`
LINKFLAGS= -L${LOCALBASE}/lib/portaudio2 -L${QT_LIBDIR} \
-Wl,-rpath,${LOCALBASE}/lib/portaudio2 -Wl,-rpath,${QT_LIBDIR} \
${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} \
-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|' \
${CONFIGURE_WRKSRC}/check.qbas
@${REINPLACE_CMD} \
-e 's|/usr/local|${LOCALBASE}|; s|/opt|${LOCALBASE}|' \
${CONFIGURE_WRKSRC}/paths.qbas
@${REINPLACE_CMD} -e \
'/pthread/d ; \
/X11R6/d ; \
/-pipe -Wall -W -g/d' ${WRKSRC}/src/SConscript
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Mixxx-Manual.pdf ${WRKSRC}/README ${DOCSDIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in Mixxx-Manual.pdf README
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (mixxx-1.4.2.tar.gz) = 646dd79d0dcf36ce431d1081629e8edb
SHA256 (mixxx-1.4.2.tar.gz) = 2673f29c84e80cb309473ae2d2f7be76abf47eaa9b8972e4848fbe7b1dfa2a52
SIZE (mixxx-1.4.2.tar.gz) = 3839230
MD5 (mixxx-1.7.0-src.tar.gz) = 811c068af1a049402052890e246347f7
SHA256 (mixxx-1.7.0-src.tar.gz) = e1304935736da032f0395b2d2abce4336f6022b06a06e95cf42be5ec85d917a4
SIZE (mixxx-1.7.0-src.tar.gz) = 8775170

View File

@ -0,0 +1,12 @@
--- lib/kissfft/kiss_fft.h.orig 2009-08-06 16:11:34.000000000 +0900
+++ lib/kissfft/kiss_fft.h 2009-10-09 01:36:38.000000000 +0900
@@ -5,9 +5,6 @@
#include <stdio.h>
#include <math.h>
#include <memory.h>
-#ifndef __APPLE__
-#include <malloc.h>
-#endif
#ifdef __cplusplus
extern "C" {

View File

@ -1,41 +0,0 @@
--- src/build.definition.orig Fri Jun 11 19:31:04 2004
+++ src/build.definition Fri Jun 25 22:13:33 2004
@@ -57,6 +57,38 @@
+# SAMPLERATE --------------------------------------------------------
+OBJECT = libsamplerate.a
+TYPE = lib
+DESCRIPTION =
+TIP_MESSAGE =
+LINK_LIBS = -lsamplerate
+ADD_DEFINES =
+OPTIONS = exit_on_failure marked_static
+#----------------------------------------------------------------------
+# Check routines (DON'T TOUCH!)
+include( check.qbas )
+#----------------------------------------------------------------------
+
+
+
+
+# PORTAUDIO ---------------------------------------------------------
+OBJECT = libportaudio.a
+TYPE = lib
+DESCRIPTION =
+TIP_MESSAGE =
+LINK_LIBS = -lportaudio
+ADD_DEFINES =
+OPTIONS = exit_on_failure marked_static
+#----------------------------------------------------------------------
+# Check routines (DON'T TOUCH!)
+include( check.qbas )
+#----------------------------------------------------------------------
+
+
+
+
# MAD ---------------------------------------------------------------
OBJECT = libmad.a
TYPE = lib

View File

@ -1,11 +0,0 @@
--- 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;
-#ifdef __LINUX__
+#if defined(__LINUX__) || defined(__FreeBSD__)
// 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"));

View File

@ -1,89 +0,0 @@
--- src/mixxx.pro.orig Fri Oct 22 09:29:25 2004
+++ src/mixxx.pro Sun Oct 23 02:53:58 2005
@@ -31,15 +31,7 @@
DEFINES += __PORTAUDIO__
SOURCES += playerportaudio.cpp
HEADERS += playerportaudio.h
-PORTAUDIO_DIR = ../lib/portaudio-v18
-INCLUDEPATH += $$PORTAUDIO_DIR/pa_common
-HEADERS += $$PORTAUDIO_DIR/pa_common/portaudio.h
unix {
-SOURCES += $$PORTAUDIO_DIR/pa_common/pa_lib.c $$PORTAUDIO_DIR/pa_common/pa_convert.c
-HEADERS += $$PORTAUDIO_DIR/pa_common/pa_host.h
-unix:!macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix_oss.c
-unix:!macx:HEADERS += $$PORTAUDIO_DIR/pablio/ringbuffer.h $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.h
-unix:!macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_unix_oss
macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_mac_core/pa_mac_core.c
macx:LIBS += -framework CoreAudio -framework AudioToolbox
macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_mac_core $$PORTAUDIO_DIR/pablio
@@ -136,8 +128,6 @@
# PowerMate
SOURCES += powermate.cpp
HEADERS += powermate.h
-unix:!macx:SOURCES += powermatelinux.cpp
-unix:!macx:HEADERS += powermatelinux.h
win32:SOURCES += powermatewin.cpp
win32:HEADERS += powermatewin.h
win32:LIBS += setupapi.lib
@@ -145,16 +135,12 @@
# Mouse
SOURCES += mouse.cpp
HEADERS += mouse.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
-unix:!macx:SOURCES += joysticklinux.cpp
-unix:!macx:HEADERS += joysticklinux.h
# KissFFT
KISSFFT_DIR = ../lib/kissfft
@@ -163,9 +149,8 @@
INCLUDEPATH += $$KISSFFT_DIR
# Audio scaling
-INCLUDEPATH += ../lib/libsamplerate
-SOURCES += enginebufferscalesrc.cpp ../lib/libsamplerate/samplerate.c ../lib/libsamplerate/src_linear.c ../lib/libsamplerate/src_sinc.c ../lib/libsamplerate/src_zoh.c
-HEADERS += enginebufferscalesrc.h ../lib/libsamplerate/samplerate.h ../lib/libsamplerate/config.h ../lib/libsamplerate/common.h ../lib/libsamplerate/float_cast.h ../lib/libsamplerate/fastest_coeffs.h ../lib/libsamplerate/high_qual_coeffs.h ../lib/libsamplerate/mid_qual_coeffs.h
+SOURCES += enginebufferscalesrc.cpp
+HEADERS += enginebufferscalesrc.h
# Debug plotting through gplot API
#unix:DEFINES += __GNUPLOT__
@@ -197,7 +182,6 @@
SETTINGS_FILE = \".mixxx.cfg\"
TRACK_FILE = \".mixxxtrack.xml\"
- DEFINES += __LINUX__
}
unix {
@@ -259,23 +243,12 @@
keyb.path = $${UNIX_SHARE_PATH}/keyboard
keyb.files = keyboard/*
- # doc files...
- readme.path = $${PREFIX}/share/doc/mixxx-1.3
- readme.files = ../README
- licence.path = $${PREFIX}/share/doc/mixxx-1.3
- licence.files = ../LICENSE
- copying.path = $${PREFIX}/share/doc/mixxx-1.3
- copying.files = ../COPYING
- manual.path = $${PREFIX}/share/doc/mixxx-1.3
- manual.files = ../Mixxx-Manual.pdf
-
-
# binary...
TARGET = mixxx
target.path = $${PREFIX}/bin
# finally adding what we wanna install...
- INSTALLS += skino skinoc skinos skint midi keyb readme licence copying manual target
+ INSTALLS += skino skinoc skinos skint midi keyb target
}

View File

@ -1,11 +0,0 @@
--- src/playerportaudio.cpp.orig Fri Jun 25 20:53:49 2004
+++ src/playerportaudio.cpp Fri Jun 25 20:54:03 2004
@@ -381,7 +381,7 @@
QString PlayerPortAudio::getSoundApi()
{
-#ifdef __LINUX__
+#if defined(__LINUX__) || defined(__FreeBSD__)
return QString("OSS");
#endif
#ifdef __MACX__

View File

@ -1,11 +0,0 @@
--- src/soundsourcesndfile.cpp.orig Fri Jun 25 18:59:18 2004
+++ src/soundsourcesndfile.cpp Fri Jun 25 19:03:08 2004
@@ -17,6 +17,8 @@
#include "soundsourcesndfile.h"
#include <qstring.h>
#include "trackinfoobject.h"
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#define min(a,b) (((a) < (b)) ? (a) : (b))
/*
Class for reading files using libsndfile
*/

View File

@ -1,11 +0,0 @@
--- src/wvisualwaveform.cpp.orig Fri Jun 25 20:55:03 2004
+++ src/wvisualwaveform.cpp Fri Jun 25 20:55:19 2004
@@ -36,7 +36,7 @@
#ifdef __WIN__
startTimer(15);
#endif
-#ifdef __LINUX__
+#if defined(__LINUX__) || defined(__FreeBSD__)
startTimer(15);
#endif

View File

@ -3,7 +3,7 @@ Vorbis and MP3 files as audio input. Mixxx can be controlled through
the GUI and with external controllers including MIDI devices,
joysticks and more.
WWW: http://mixxx.sourceforge.net/
WWW: http://www.mixxx.org/
- Jean-Yves Lefort
jylefort@FreeBSD.org

File diff suppressed because it is too large Load Diff