Author: helio
Date: Mon Feb 5 20:13:24 2007
New Revision: 116457
Added:
packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-beta2.tar.gz (contents,
props changed)
packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-gcc4.patch
packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-python.patch
packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-x86_64-build.patch
Removed:
packages/cooker/mixxx/current/SOURCES/mixx-1.2.1-gcc34.diff
packages/cooker/mixxx/current/SOURCES/mixxx-1.4.2.tar.bz2
Modified:
packages/cooker/mixxx/current/SPECS/mixxx.spec
Log:
- new upstream beta version 1.5.0 beta2
Added: packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-beta2.tar.gz
==============================================================================
Binary file. No diff available.
Added: packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-gcc4.patch
==============================================================================
--- (empty file)
+++ packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-gcc4.patch Mon Feb
5 20:13:24 2007
@@ -0,0 +1,22 @@
+--- mixxx/lib/soundtouch/SoundTouch.h.orig 2007-02-05 16:40:00.000000000
-0200
++++ mixxx/lib/soundtouch/SoundTouch.h 2007-02-05 16:40:17.000000000 -0200
+@@ -159,7 +159,7 @@
+ static const char *getVersionString();
+
+ /// Get SoundTouch library version Id
+- static uint SoundTouch::getVersionId();
++ static uint getVersionId();
+
+ /// Sets new rate control value. Normal rate = 1.0, smaller values
+ /// represent slower rate, larger faster rates.
+--- mixxx/src/wavesegmentation.h.orig 2007-02-05 16:45:46.000000000 -0200
++++ mixxx/src/wavesegmentation.h 2007-02-05 16:46:02.000000000 -0200
+@@ -45,7 +45,7 @@
+ double * column(int c);
+
+ ~Rhythmogram();
+- static void Rhythmogram::acf(double *wav, int nwav, double *acf, int
nacf);
++ static void acf(double *wav, int nwav, double *acf, int nacf);
+ };
+
+
Added: packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-python.patch
==============================================================================
--- (empty file)
+++ packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-python.patch Mon Feb
5 20:13:24 2007
@@ -0,0 +1,15 @@
+--- mixxx/src/mixxx.pro.orig 2006-04-11 13:03:10.000000000 -0300
++++ mixxx/src/mixxx.pro 2007-02-05 16:59:35.000000000 -0200
+@@ -463,8 +463,10 @@
+ SOURCES += script/python/*.cpp
+ DEFINES += __PYTHON__
+
+- LIBS += $$system(python-config)
+- exists(/usr/include/python2.4/Python.h) {
++ LIBS += $$system(python-config --ldflags --libs)
++ exists(/usr/include/python2.5/Python.h) {
++ INCLUDEPATH += /usr/include/python2.5/
++ } else:exists(/usr/include/python2.4/Python.h) {
+ INCLUDEPATH += /usr/include/python2.4/
+ } else:exists(/usr/include/python2.3/Python.h) {
+ INCLUDEPATH += /usr/include/python2.3/
Added: packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-x86_64-build.patch
==============================================================================
--- (empty file)
+++ packages/cooker/mixxx/current/SOURCES/mixxx-1.5.0-x86_64-build.patch
Mon Feb 5 20:13:24 2007
@@ -0,0 +1,33 @@
+--- mixxx/src/configure.orig 2007-02-05 16:33:57.000000000 -0200
++++ mixxx/src/configure 2007-02-05 16:35:12.000000000 -0200
+@@ -500,14 +500,13 @@
+ exit
+ fi
+ fi
+-
+-
++
+
+ ######################### QT library is thread type?
+ #
+- if test -e $QTDIR/lib/libqt-mt.so ;
++ if test -e $QTDIR/lib64/libqt-mt.so ;
+ then
+- QT_LIB="$QTDIR/lib" ;
++ QT_LIB="$QTDIR/lib64" ;
+ RES="yes"
+ echo "CONFIG += thread" >> $CONFIGURE_DEF ;
+ else
+--- mixxx/src/mixxx.pro.orig 2006-04-11 13:03:10.000000000 -0300
++++ mixxx/src/mixxx.pro 2007-02-05 17:04:48.000000000 -0200
+@@ -290,8 +290,8 @@
+ OBJECTS_DIR = .obj
+
+ # GCC Compiler optimization flags
+-QMAKE_CXXFLAGS += -pg -march=pentium3 -O3 -pipe
+-QMAKE_CFLAGS += -pg -march=pentium3 -O3 -pipe
++QMAKE_CXXFLAGS += -pg -march=athlon64 -O3 -pipe
++QMAKE_CFLAGS += -pg -march=athlon64 -O3 -pipe
+
+ # gcc Profiling
+ #QMAKE_CXXFLAGS += -pg
Modified: packages/cooker/mixxx/current/SPECS/mixxx.spec
==============================================================================
--- packages/cooker/mixxx/current/SPECS/mixxx.spec (original)
+++ packages/cooker/mixxx/current/SPECS/mixxx.spec Mon Feb 5 20:13:24 2007
@@ -1,6 +1,6 @@
%define name mixxx
-%define version 1.4.2
-%define release %mkrel 3
+%define version 1.5.0
+%define release %mkrel 0.2
%define section Multimedia/Sound
%define title Mixxx
@@ -10,12 +10,13 @@
Summary: %{Summary}
Version: %{version}
Release: %{release}
-
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}-beta2.tar.gz
Source1: %{name}48.png
Source2: %{name}32.png
Source3: %{name}16.png
-Patch: mixx-1.2.1-gcc34.diff
+Patch0: mixxx-1.5.0-gcc4.patch
+Patch1: mixxx-1.5.0-x86_64-build.patch
+Patch2: mixxx-1.5.0-python.patch
URL: http://mixxx.sourceforge.net/
License: GPL
Group: Sound
@@ -37,12 +38,22 @@
text files.
%prep
-%setup -q
-%patch -p0
+%setup -q -n mixxx
+%patch0 -p1 -b .gcc4
+%if "%{_lib}" != "lib"
+%patch1 -p1 -b .x86_64
+%endif
+#%patch2 -p1 -b .python
+
%build
cd src
-./configure --enable-jack --enable-alsa
-%{_libdir}/qt3/bin/qmake mixxx.pro
+./configure \
+ --enable-jack \
+ --enable-alsa
+
+# Mixx uses Qt 3
+qmake mixxx.pro
+
%make
%install
