packages: mumble/mumble.spec, mumble/mumble-celt.patch (NEW) - rel 5; fix b...

[arekm]

Author: arekm                        Date: Sun Sep 11 19:45:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; fix builds with new celt

---- Files affected:
packages/mumble:
   mumble.spec (1.45 -> 1.46) , mumble-celt.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mumble/mumble.spec
diff -u packages/mumble/mumble.spec:1.45 packages/mumble/mumble.spec:1.46
--- packages/mumble/mumble.spec:1.45	Wed Aug 31 11:17:59 2011
+++ packages/mumble/mumble.spec	Sun Sep 11 21:45:35 2011
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
 
-%define		qtver	4.6.2
+%define		qtver	4.6.4
 %define		snap	20100401
 
 Summary:	Voice chat software primarily intended for use while gaming
 Name:		mumble
 Version:	1.2.3
-Release:	4
+Release:	5
 License:	BSD and Custom (see LICENSE)
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/mumble/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch0:		%{name}-compile-fix.patch
 Patch1:		%{name}-murmurini.patch
 Patch2:		%{name}-link.patch
+Patch3:		%{name}-celt.patch
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -85,6 +86,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 # change obsoleted LIBPATH to QMAKE_LIBDIR
 %{__sed} -i 's,LIBPATH,QMAKE_LIBDIR,' src/mumble11x/mumble11x.pro
@@ -181,6 +183,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2011/09/11 19:45:35  arekm
+- rel 5; fix builds with new celt
+
 Revision 1.45  2011/08/31 09:17:59  arekm
 - release 4
 

================================================================
Index: packages/mumble/mumble-celt.patch
diff -u /dev/null packages/mumble/mumble-celt.patch:1.1
--- /dev/null	Sun Sep 11 21:45:41 2011
+++ packages/mumble/mumble-celt.patch	Sun Sep 11 21:45:35 2011
@@ -0,0 +1,12 @@
+--- mumble-1.2.3/src/mumble/AudioInput.cpp~	2011-02-19 22:35:16.000000000 +0100
++++ mumble-1.2.3/src/mumble/AudioInput.cpp	2011-09-11 21:38:25.093933057 +0200
+@@ -823,7 +823,9 @@
+ 
+ 		cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_PREDICTION(0));
+ 
++#ifdef CELT_SET_VBR_RATE
+ 		cCodec->celt_encoder_ctl(ceEncoder,CELT_SET_VBR_RATE(iAudioQuality));
++#endif
+ 		len = cCodec->encode(ceEncoder, psSource, buffer, qMin(iAudioQuality / 800, 127));
+ 		iBitrate = len * 100 * 8;
+ 	} else {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mumble/mumble.spec?r1=1.45&r2=1.46&f=u