mixxx: update to 2.0.0.

This commit is contained in:
Enno Boland 2015-05-02 11:50:36 +02:00
parent 37287b71c9
commit f3e08bd366
4 changed files with 31 additions and 74 deletions

View file

@ -56,6 +56,7 @@ desc_option_rtmp="Enable support for RTMP"
desc_option_sasl="Enable support for SASL"
desc_option_sdl="Enable support for SDL (1.x)"
desc_option_sdl2="Enable support for SDL (2.x)"
desc_option_shoutcast="Enable support for shoutcast"
desc_option_smb="Enable support for SMB protocol"
desc_option_sndio="Enable support for the sndio sound server"
desc_option_snmp="Enable support for SNMP"

View file

@ -0,0 +1,16 @@
--- src/waveform/vsyncthread.h.orig 2015-12-21 14:23:59.671910985 +0100
+++ src/waveform/vsyncthread.h 2015-12-21 14:24:38.067912746 +0100
@@ -18,10 +18,11 @@
#include <GL/glx.h>
//#include "GL/glxext.h"
// clean up after Xlib.h, which #defines values that conflict with QT.
- #undef Bool
- #undef Unsorted
#endif // QT_OPENGL_ES_2
#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <X11/Xlib.h>
+ #undef Bool
+ #undef Unsorted
#endif
#include "util/performancetimer.h"

View file

@ -1,63 +0,0 @@
--- src/waveform/renderers/waveformrendererhsv.cpp
+++ src/waveform/renderers/waveformrendererhsv.cpp
@@ -69,7 +69,7 @@ void WaveformRendererHSV::draw(QPainter*
allGain *= factory->getVisualGain(::WaveformWidgetFactory::All);
// Save HSV of waveform color
- double h,s,v;
+ qreal h,s,v;
// Get base color of waveform in the HSV format (s and v isn't use)
m_pColors->getLowColor().getHsvF(&h,&s,&v);
--- src/waveform/renderers/waveformsignalcolors.cpp
+++ src/waveform/renderers/waveformsignalcolors.cpp
@@ -68,14 +68,14 @@ void WaveformSignalColors::fallBackFromS
qWarning() << "WaveformSignalColors::fallBackFromSignalColor - " \
"skin do not provide low/mid/high signal colors";
- double h,s,l,a;
+ qreal h,s,l,a;
m_signalColor.getHslF(&h,&s,&l,&a);
const double analogousAngle = 1.0/12.0;
if( s < 0.1) // gray
{
- const double sMax = 1.0 - h;
+ const qreal sMax = 1.0 - h;
m_lowColor.setHslF(h,s,l);
m_midColor.setHslF(h,s+sMax*0.2,l);
m_highColor.setHslF(h,s+sMax*0.4,l);
@@ -84,28 +84,28 @@ void WaveformSignalColors::fallBackFromS
{
if( l < 0.1) // ~white
{
- const double lMax = 1.0 - l;
+ const qreal lMax = 1.0 - l;
m_lowColor.setHslF(h,s,l);
m_midColor.setHslF(h,s,l+lMax*0.2);
m_highColor.setHslF(h,s,l+lMax*0.4);
}
else if( l < 0.5)
{
- const double lMax = 1.0 - l;
+ const qreal lMax = 1.0 - l;
m_lowColor.setHslF(h,s,l);
m_midColor.setHslF(stableHue(h-analogousAngle*0.3),s,l+lMax*0.1);
m_highColor.setHslF(stableHue(h+analogousAngle*0.3),s,l+lMax*0.4);
}
else if ( l < 0.9)
{
- const double lMin = l;
+ const qreal lMin = l;
m_lowColor.setHslF(h,s,l);
m_midColor.setHslF(stableHue(h-analogousAngle*0.3),s,l-lMin*0.1);
m_highColor.setHslF(stableHue(h+analogousAngle*0.3),s,l-lMin*0.4);
}
else // ~black
{
- const double lMin = l;
+ const qreal lMin = l;
m_lowColor.setHslF(h,s,l);
m_midColor.setHslF(h,s,l-lMin*0.2);
m_highColor.setHslF(h,s,l-lMin*0.4);

View file

@ -1,20 +1,23 @@
# Template file for 'mixxx'
pkgname=mixxx
version=1.11.0
revision=4
version=2.0.0
revision=1
hostmakedepends="scons pkg-config"
makedepends="qt-devel portaudio-devel libusb-devel libmad-devel protobuf-devel
libid3tag-devel libvorbis-devel libflac-devel glu-devel taglib-devel
libsndfile-devel portmidi-devel vamp-plugin-sdk-devel faad2-devel
libmp4v2-devel"
depends="qt-plugin-sqlite"
makedepends="portaudio-devel libusb-devel libmad-devel protobuf-devel
libid3tag-devel glu-devel taglib-devel opus-devel portmidi-devel
vamp-plugin-sdk-devel faad2-devel libmp4v2-devel libmp4v2-devel
rubberband-devel chromaprint-devel fftw-devel ffmpeg-devel
qt5-svg-devel qt5-script-devel qt5-xmlpatterns-devel qt5-script-devel
libshout-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="Enno Boland <gottox@voidlinux.eu>"
homepage="http://www.mixxx.org"
license="GPL-2"
distfiles="http://downloads.mixxx.org/${pkgname}-${version}/${pkgname}-${version}-src.tar.gz"
checksum="00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331"
_scons_args="qtdir=/usr/include shoutcast=0 faad=1 tuned=0 prefix=/usr"
distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
checksum=688d87d907f3ad3721602f44295a4d0caa41502df8504ca9264ca0c87d8818f1
_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
wrksrc=$pkgname-release-$version
do_build() {
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
@ -23,7 +26,7 @@ do_build() {
fi
sed -i \
-e 's/branch_name = .*/branch_name = "mixxx"/' \
-e 's/bazaar_revision = .*/bazaar_revision = "'$version'"/' \
-e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
src/SConscript
scons ${makejobs} ${_scons_args}