rpms/jack_capture/F-11 jack_capture-ppc64.patch, 1.2, 1.3 .cvsignore, 1.4, 1.5 jack_capture.spec, 1.3, 1.4 sources, 1.4, 1.5

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/jack_capture/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15076

Modified Files:
	.cvsignore jack_capture.spec sources 
Added Files:
	jack_capture-ppc64.patch 
Log Message:
* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.40-1
- Update to 0.9.40


jack_capture-ppc64.patch:
 atomicity.h         |    2 +-
 atomicity_powerpc.h |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: jack_capture-ppc64.patch
===================================================================
RCS file: jack_capture-ppc64.patch
diff -N jack_capture-ppc64.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jack_capture-ppc64.patch	5 Feb 2010 05:20:46 -0000	1.3
@@ -0,0 +1,31 @@
+diff -rupN jack_capture-0.9.40.old/atomicity/atomicity.h jack_capture-0.9.40/atomicity/atomicity.h
+--- jack_capture-0.9.40.old/atomicity/atomicity.h	2008-04-30 08:00:18.000000000 -0400
++++ jack_capture-0.9.40/atomicity/atomicity.h	2010-01-31 00:53:07.000000000 -0500
+@@ -14,7 +14,7 @@
+ 
+ #include "atomicity_i386.h"
+ 
+-#elif defined(__powerpc__) || defined(__ppc__) /* linux and OSX use different tokens */
++#elif defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__ppc64__)/* linux and OSX use different tokens */
+ 
+ #include "atomicity_powerpc.h"
+ 
+diff -rupN jack_capture-0.9.40.old/atomicity/atomicity_powerpc.h jack_capture-0.9.40/atomicity/atomicity_powerpc.h
+--- jack_capture-0.9.40.old/atomicity/atomicity_powerpc.h	2008-06-02 07:08:12.000000000 -0400
++++ jack_capture-0.9.40/atomicity/atomicity_powerpc.h	2010-01-31 01:01:20.000000000 -0500
+@@ -30,6 +30,15 @@
+ #ifndef _GLIBCXX_ATOMICITY_H
+ #define _GLIBCXX_ATOMICITY_H	1
+ 
++//#ifdef _STWCX
++//#undef _STWCX
++//#endif
++#if defined(__powerpc64__) || defined(__ppc64__)
++#define _STWCX "stdcx."
++#else //__powerpc__ or __ppc__
++#define _STWCX "stwcx."
++#endif
++
+ typedef int _Atomic_word;
+ 
+ static inline _Atomic_word


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jack_capture/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Jul 2009 18:10:01 -0000	1.4
+++ .cvsignore	5 Feb 2010 05:20:46 -0000	1.5
@@ -1 +1 @@
-jack_capture-0.9.35.tar.gz
+jack_capture-0.9.40.tar.gz


Index: jack_capture.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack_capture/F-11/jack_capture.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jack_capture.spec	15 Jul 2009 18:10:01 -0000	1.3
+++ jack_capture.spec	5 Feb 2010 05:20:46 -0000	1.4
@@ -1,20 +1,24 @@
 Name:		jack_capture
-Version:	0.9.35
+Version:	0.9.40
 Release:	1%{?dist}
 Summary:	Record sound files with JACK
 Group:		Applications/Multimedia
 # As explained in the COPYING file,
-# jack_capture.c is GPLv2+,
+# jack_capture.c and atomicity/* are GPLv2+,
 # jack_capture_gui2.cpp is BSD,
 # atomic/* are LGPLv2+.
 # The icon is borrowed from oxygen icon theme, which is LGPLv3+
 License:	GPLv2+ and BSD and LGPLv3+
 URL:		http://www.musix.org.ar/wiki/index.php/Jack_capture
 Source0:	http://archive.notam02.no/arkiv/src/%{name}-%{version}.tar.gz
-# All additional sources and patches sent upstream via email on 2009-05-08
+# Extra sources sent upstream via email on 2009-05-08
 # since there is no upstream bugtracker.
 Source1:	%{name}.desktop
 Source2:	%{name}.png
+# Fix compilation error on ppc64. Sent upstream via email on 2010-02-01.
+# Upstream applied it to the trunk
+Patch0:		jack_capture-ppc64.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -22,6 +26,7 @@ BuildRequires:	gtk2-devel
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libsndfile-devel
 BuildRequires:	meterbridge
+BuildRequires:	ncurses-devel
 
 Requires:	meterbridge
 Requires:	vorbis-tools
@@ -34,6 +39,7 @@ file, but it can do a number of other op
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} OPTIMIZE="%{optflags}"
@@ -76,6 +82,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.40-1
+- Update to 0.9.40
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.35-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.35-1
 - Update to 0.9.35
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jack_capture/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jul 2009 18:10:01 -0000	1.4
+++ sources	5 Feb 2010 05:20:46 -0000	1.5
@@ -1 +1 @@
-8948c84b70b1b9f5c58ec7657ca2ebab  jack_capture-0.9.35.tar.gz
+1688fd5630bd738dd680c175498e43ca  jack_capture-0.9.40.tar.gz