FreeBSD Bugzilla – Attachment 128068 Details for
Bug 171965
audio/mixxx: Update to version 1.10.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.42 KB, created by
tkato432
on 2012-09-25 19:10:11 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2012-09-25 19:10:11 UTC
Size:
7.42 KB
patch
obsolete
>diff -urN /usr/ports/audio/mixxx/Makefile audio/mixxx/Makefile >--- /usr/ports/audio/mixxx/Makefile 2012-07-20 05:15:37.000000000 +0900 >+++ audio/mixxx/Makefile 2012-09-25 03:16:53.000000000 +0900 >@@ -1,18 +1,11 @@ >-# New ports collection makefile for: Mixxx >-# Date created: 25 Jun 2004 >-# Whom: Jean-Yves Lefort <jylefort@brutele.be> >-# >+# Created by: Jean-Yves Lefort <jylefort@brutele.be> > # $FreeBSD: ports/audio/mixxx/Makefile,v 1.30 2012/07/19 20:15:37 naddy Exp $ >-# > > PORTNAME= mixxx >-PORTVERSION= 1.10.0 >-PORTREVISION= 3 >+PORTVERSION= 1.10.1 > DISTVERSIONSUFFIX= -src > CATEGORIES= audio >-MASTER_SITES= http://mixxx.rasant-records.de/downloads/%SUBDIR%/ \ >- http://moo.glines.org/mixxx/%SUBDIR%/ \ >- http://web.mit.edu/rryan/www/downloads.mixxx.org/%SUBDIR%/ >+MASTER_SITES= http://moo.glines.org/mixxx/%SUBDIR%/ > MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION} > > MAINTAINER= ports@FreeBSD.org >@@ -20,24 +13,25 @@ > > LICENSE= GPLv2 # (or later) > >-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 \ >- tag.1:${PORTSDIR}/audio/taglib >- >-OPTIONS_DEFINE= LAME FAAD WAVPACK SHOUTCAST DOCS >-SHOUTCAST_DESC= Enable Shoutcast Broadcasting >-WAVPACK_DESC= Enable WavPack audio support plugin >+BUILD_DEPENDS= portaudio>=19:${PORTSDIR}/audio/portaudio2 >+LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ >+ id3tag:${PORTSDIR}/audio/libid3tag \ >+ mad:${PORTSDIR}/audio/libmad \ >+ sndfile:${PORTSDIR}/audio/libsndfile \ >+ vorbis:${PORTSDIR}/audio/libvorbis \ >+ tag:${PORTSDIR}/audio/taglib >+RUN_DEPENDS= portaudio>=19:${PORTSDIR}/audio/portaudio2 >+ >+OPTIONS_DEFINE= LAME SHOUTCAST FAAD WAVPACK DOCS >+SHOUTCAST_DESC= Shoutcast Broadcasting >+WAVPACK_DESC= WavPack audio support plugin > > WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} > >-USE_GL= glu > USE_QT4= corelib gui network opengl script sql svg webkit xml \ > xmlpatterns linguist_build moc_build qmake_build rcc_build \ > uic_build >+USE_GL= glu > USE_SCONS= yes > SCONS_BUILDENV= ${SCONS_ENV} > SCONS_ARGS= qtdir="${QT_PREFIX}" optimize=0 >@@ -82,7 +76,8 @@ > s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${FILE} > .endfor > @${REINPLACE_CMD} -e \ >- "/('install', docs)/d" ${WRKSRC}/src/SConscript >+ "/_get_bzr_/s|^|#| ; \ >+ /('install', docs)/d" ${WRKSRC}/src/SConscript > @${REINPLACE_CMD} -e \ > "s|^Exec=.*|Exec=mixxx|" ${WRKSRC}/src/mixxx.desktop > >diff -urN /usr/ports/audio/mixxx/distinfo audio/mixxx/distinfo >--- /usr/ports/audio/mixxx/distinfo 2012-02-20 09:06:48.000000000 +0900 >+++ audio/mixxx/distinfo 2012-08-09 08:44:30.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (mixxx-1.10.0-src.tar.gz) = 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97 >-SIZE (mixxx-1.10.0-src.tar.gz) = 15852338 >+SHA256 (mixxx-1.10.1-src.tar.gz) = eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 >+SIZE (mixxx-1.10.1-src.tar.gz) = 15948956 >diff -urN /usr/ports/audio/mixxx/files/patch-build__qt4.py audio/mixxx/files/patch-build__qt4.py >--- /usr/ports/audio/mixxx/files/patch-build__qt4.py 2012-02-20 09:06:48.000000000 +0900 >+++ audio/mixxx/files/patch-build__qt4.py 2012-09-08 02:30:29.000000000 +0900 >@@ -6,7 +6,7 @@ > QT4_BINPATH = os.path.join('$QTDIR', 'bin'), > - QT4_CPPPATH = os.path.join('$QTDIR', 'include'), > - QT4_LIBPATH = os.path.join('$QTDIR', 'lib'), >-+ QT4_CPPPATH = os.path.join('$QTDIR', 'include', 'qt4'), >++ QT4_CPPPATH = os.path.join('$QTDIR', 'include', 'qt4', 'Qt'), > + QT4_LIBPATH = os.path.join('$QTDIR', 'lib', 'qt4'), > # TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants > QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']), >diff -urN /usr/ports/audio/mixxx/files/patch-src__SConscript.env audio/mixxx/files/patch-src__SConscript.env >--- /usr/ports/audio/mixxx/files/patch-src__SConscript.env 1970-01-01 09:00:00.000000000 +0900 >+++ audio/mixxx/files/patch-src__SConscript.env 2012-08-09 09:07:28.000000000 +0900 >@@ -0,0 +1,24 @@ >+--- src/SConscript.env.orig 2012-06-26 05:23:40.000000000 +0900 >++++ src/SConscript.env 2012-08-09 09:03:53.000000000 +0900 >+@@ -19,21 +19,6 @@ >+ print "Deleting deprecated build file: %s" % defs >+ os.remove(defs) >+ >+-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun >+-## instead, embed BZR version into build >+-## Put version info into a file, so it doesn't force a rebuild of everything :) >+-f = open("build.h","w") >+-try: >+- branch_name = util.get_bzr_branch_name() >+- modified = util.get_bzr_modified() > 0 >+- # Do not emit BUILD_BRANCH on release branches. >+- if not branch_name.startswith('release'): >+- f.write('#define BUILD_BRANCH "%s"\n' % branch_name) >+- f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(), >+- '+' if modified else '')) >+-finally: >+- f.close() >+- >+ #Check for dependencies if we're not doing a clean... >+ #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']): >+ conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig, >diff -urN /usr/ports/audio/mixxx/files/patch-src__recording__encodermp3.cpp audio/mixxx/files/patch-src__recording__encodermp3.cpp >--- /usr/ports/audio/mixxx/files/patch-src__recording__encodermp3.cpp 2012-02-20 09:06:48.000000000 +0900 >+++ audio/mixxx/files/patch-src__recording__encodermp3.cpp 2012-08-09 09:07:07.000000000 +0900 >@@ -1,17 +1,15 @@ >---- src/recording/encodermp3.cpp.orig 2011-12-24 11:53:18.000000000 +0900 >-+++ src/recording/encodermp3.cpp 2012-01-16 06:10:09.000000000 +0900 >-@@ -85,7 +85,9 @@ >+--- src/recording/encodermp3.cpp.orig 2012-06-26 05:23:37.000000000 +0900 >++++ src/recording/encodermp3.cpp 2012-08-09 09:06:21.000000000 +0900 >+@@ -85,7 +85,7 @@ > */ > QStringList libnames; > QString libname = ""; > -#ifdef __LINUX__ >-+#ifdef __BSD__ >-+ libnames << "%%LOCALBASE%%/lib/libmp3lame.so"; >-+#elif __LINUX__ >- libnames << "/usr/lib/libmp3lame.so.0"; >- libnames << "/usr/lib/libmp3lame.so"; >++#if defined(__BSD__) || defined(__LINUX__) >+ libnames << "mp3lame"; > #elif __WINDOWS__ >-@@ -109,7 +111,7 @@ >+ libnames << "lame_enc.dll"; >+@@ -108,7 +108,7 @@ > props->setType(DLG_WARNING); > props->setTitle(tr("Encoder")); > QString key = ""; >diff -urN /usr/ports/audio/mixxx/pkg-plist audio/mixxx/pkg-plist >--- /usr/ports/audio/mixxx/pkg-plist 2012-02-20 09:06:48.000000000 +0900 >+++ audio/mixxx/pkg-plist 2012-08-09 09:59:46.000000000 +0900 >@@ -19,6 +19,8 @@ > %%DATADIR%%/midi/DJ-Tech-i-Mix-Reload-scripts.js > %%DATADIR%%/midi/DJTechTools MIDI Fighter.midi.xml > %%DATADIR%%/midi/DJTechTools-MIDIFighter-scripts.js >+%%DATADIR%%/midi/Denon MC3000.midi.xml >+%%DATADIR%%/midi/Denon-MC3000-scripts.js > %%DATADIR%%/midi/Evolution_Xsession.midi.xml > %%DATADIR%%/midi/FaderFoxDJ2.midi.xml > %%DATADIR%%/midi/Hercules DJ Console Mac Edition.midi.xml >@@ -75,9 +77,11 @@ > %%DATADIR%%/midi/Vestax Spin.midi.xml > %%DATADIR%%/midi/Vestax Typhoon.midi.xml > %%DATADIR%%/midi/Vestax VCI-100.midi.xml >+%%DATADIR%%/midi/Vestax VCI-400.midi.xml > %%DATADIR%%/midi/Vestax-Spin-scripts.js > %%DATADIR%%/midi/Vestax-Typhoon-scripts.js > %%DATADIR%%/midi/Vestax-VCI-100-scripts.js >+%%DATADIR%%/midi/Vestax-VCI-400-scripts.js > %%DATADIR%%/midi/Wireless DJ App.midi.xml > %%DATADIR%%/midi/Wireless-DJ-scripts.js > %%DATADIR%%/midi/convertToXMLSchemaV1.php
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 171965
: 128068