rpms/mixxx/devel mixxx-1.10.0-gcc47.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 mixxx.spec, 1.12, 1.13 sources, 1.8, 1.9 mixxx-1.8.2-norpath.patch, 1.1, NONE mixxx-1.9.0-norpath.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/mixxx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18536/devel

Modified Files:
	.cvsignore mixxx.spec sources 
Added Files:
	mixxx-1.10.0-gcc47.patch 
Removed Files:
	mixxx-1.8.2-norpath.patch mixxx-1.9.0-norpath.patch 
Log Message:
Update to 1.10.0


mixxx-1.10.0-gcc47.patch:
 engineshoutcast.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE mixxx-1.10.0-gcc47.patch ---
diff -up mixxx-1.10.0/src/engine/engineshoutcast.cpp.gcc47 mixxx-1.10.0/src/engine/engineshoutcast.cpp
--- mixxx-1.10.0/src/engine/engineshoutcast.cpp.gcc47	2011-12-24 03:53:20.000000000 +0100
+++ mixxx-1.10.0/src/engine/engineshoutcast.cpp	2012-05-03 23:03:38.068426488 +0200
@@ -37,6 +37,7 @@
 #include <QDebug>
 #include <QMutexLocker>
 #include <stdio.h> // currently used for writing to stdout
+#include <unistd.h> // sleep
 
 
 /*


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Nov 2011 19:20:52 -0000	1.8
+++ .cvsignore	3 May 2012 21:20:31 -0000	1.9
@@ -1 +1 @@
-mixxx-1.9.2-src.tar.gz
+mixxx-1.10.0-src.tar.gz


Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/mixxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mixxx.spec	2 Mar 2012 22:12:42 -0000	1.12
+++ mixxx.spec	3 May 2012 21:20:33 -0000	1.13
@@ -1,13 +1,17 @@
+%global _with_bpm     1
+%global _with_libgpod 1
+
 Name:           mixxx
-Version:        1.9.2
-Release:        3%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 Summary:        Mixxx is open source software for DJ'ing
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.mixxx.org
 Source0:        http://downloads.mixxx.org/mixxx-%{version}/mixxx-%{version}-src.tar.gz
-Patch0:         mixxx-%{version}-norpath.patch
+Patch0:         mixxx-1.9.2-norpath.patch
+Patch1:         mixxx-1.10.0-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Build tools
@@ -32,7 +36,7 @@
 BuildRequires:  flac-devel
 
 #Optionals Requirements
-#BuildRequires:  ffmpeg-devel
+BuildRequires:  ffmpeg-devel
 BuildRequires:  libshout-devel
 #BuildRequires:  python-devel
 #BuildRequires:  lua-devel, tolua++-devel
@@ -56,6 +60,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .norpath
+%patch1 -p1 -b .gcc47
 
 
 %build
@@ -100,6 +105,9 @@
 %{_datadir}/pixmaps/mixxx-icon.png
 
 %changelog
+* Thu May 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.10.0-1
+- Update to 1.10.0
+
 * Fri Mar 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.9.2-3
 - Rebuilt for c++ ABI breakage
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Nov 2011 19:20:52 -0000	1.8
+++ sources	3 May 2012 21:20:33 -0000	1.9
@@ -1 +1 @@
-f84095951f66b12af5cf45d19200ff82  mixxx-1.9.2-src.tar.gz
+d92bf422491fa92adf7ed6c2998e67fb  mixxx-1.10.0-src.tar.gz


--- mixxx-1.8.2-norpath.patch DELETED ---


--- mixxx-1.9.0-norpath.patch DELETED ---