rpms/jack_capture/F-11 import.log, NONE, 1.1 jack_capture-ppc64.patch, NONE, 1.1 jack_capture.desktop, NONE, 1.1 jack_capture.png, NONE, 1.1 jack_capture.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed May 13 06:12:03 UTC 2009

Author: oget

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jack_capture-ppc64.patch jack_capture.desktop 
	jack_capture.png jack_capture.spec 
Log Message:
* Fri May 08 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.33-1
- Update to 0.9.33
- Drop upstreamed patches
- Fix the build failure on ppc64

* Wed May 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.32-1
- Initial build

--- NEW FILE import.log ---
jack_capture-0_9_33-1_fc10:F-11:jack_capture-0.9.33-1.fc10.src.rpm:1242195064

jack_capture-ppc64.patch:

--- NEW FILE jack_capture-ppc64.patch ---
diff -rupN jack_capture-0.9.32.old/atomic/lffifo.c jack_capture-0.9.32/atomic/lffifo.c
--- jack_capture-0.9.32.old/atomic/lffifo.c	2005-04-05 07:11:30.000000000 -0400
+++ jack_capture-0.9.32/atomic/lffifo.c	2009-05-08 13:08:16.000000000 -0400
@@ -23,7 +23,7 @@
 #include "lffifo.h"
 
 #if defined(__GNUC__)
-# if defined(powerpc) || defined(__ppc__)
+# if defined(powerpc) || defined(__ppc__) || defined(powerpc64) || defined(__ppc64__) || defined(__powerpc64__)
 #  include "lffifoppc.c"
 # else
 #  include "lffifoIntel.c"
diff -rupN jack_capture-0.9.32.old/atomic/lffifo.h jack_capture-0.9.32/atomic/lffifo.h
--- jack_capture-0.9.32.old/atomic/lffifo.h	2008-07-25 05:30:16.000000000 -0400
+++ jack_capture-0.9.32/atomic/lffifo.h	2009-05-08 13:09:53.000000000 -0400
@@ -54,7 +54,7 @@
 /*****************************************************************
                            DATA STRUCTURES
  *****************************************************************/
-#ifndef __ppc__
+#if !defined(__ppc__) && !defined(__ppc64__) &&  !defined(__powerpc64__)
 # define ffCount(name) unsigned long volatile name
 #else
 # define ffCount(name) long name[7]
diff -rupN jack_capture-0.9.32.old/atomic/lflifo.c jack_capture-0.9.32/atomic/lflifo.c
--- jack_capture-0.9.32.old/atomic/lflifo.c	2005-04-05 07:11:30.000000000 -0400
+++ jack_capture-0.9.32/atomic/lflifo.c	2009-05-08 13:06:11.000000000 -0400
@@ -23,7 +23,7 @@
 #include "lflifo.h"
 
 #if defined(__GNUC__)
-# if defined(powerpc) || defined(__ppc__)
+# if defined(powerpc) || defined(__ppc__) || defined(powerpc64) || defined(__ppc64__) || defined(__powerpc64__)
 #  include "lflifoppc.c"
 # else
 #  include "lflifoIntel.c"
diff -rupN jack_capture-0.9.32.old/atomic/lflifo.h jack_capture-0.9.32/atomic/lflifo.h
--- jack_capture-0.9.32.old/atomic/lflifo.h	2008-07-25 06:30:50.000000000 -0400
+++ jack_capture-0.9.32/atomic/lflifo.h	2009-05-08 13:06:11.000000000 -0400
@@ -60,7 +60,7 @@
 /*****************************************************************
                            DATA STRUCTURES
  *****************************************************************/
-#ifndef __ppc__
+#if !defined(__ppc__) && !defined(__ppc64__) &&  !defined(__powerpc64__)
 # define lfCount(name) unsigned long volatile name
 #else
 # define lfCount(name) long name[7]
diff -rupN jack_capture-0.9.32.old/atomic/msAtomic.h jack_capture-0.9.32/atomic/msAtomic.h
--- jack_capture-0.9.32.old/atomic/msAtomic.h	2006-01-17 06:11:42.000000000 -0500
+++ jack_capture-0.9.32/atomic/msAtomic.h	2009-05-08 13:06:11.000000000 -0400
@@ -26,7 +26,7 @@
 /* by default, compiles for SMP architecture */
 #define __SMP__
 
-#if defined(powerpc) || defined(__ppc__) || defined(__MWERKS__)
+#if defined(powerpc) || defined(__ppc__) || defined(powerpc64) || defined(__ppc64__) || defined(__powerpc64__) || defined(__MWERKS__)
 	typedef struct {
 		long value;
 		long reserved[7];
@@ -39,7 +39,7 @@
 
 
 #if defined(__GNUC__)
-# if defined(powerpc) || defined(__ppc__)
+# if defined(powerpc) || defined(__ppc__) || defined(powerpc64) || defined(__ppc64__) || defined(__powerpc64__)
 #  include "msAtomicPPC.h"
 # else
 #  include "msAtomicIntel.h"


--- NEW FILE jack_capture.desktop ---
[Desktop Entry]
Name=jack_capture
GenericName=Record JACK output
Comment=Record sound files with JACK
Exec=jack_capture_gui2
Icon=jack_capture
Terminal=false
Type=Application
Categories=AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE jack_capture.spec ---
Name:		jack_capture
Version:	0.9.33
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_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
# since there is no upstream bugtracker.
Source1:	%{name}.desktop
Source2:	%{name}.png
# Fix build on ppc64
Patch0:		%{name}-ppc64.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	desktop-file-utils
BuildRequires:	gtk2-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	libsndfile-devel
BuildRequires:	meterbridge

Requires:	meterbridge
Requires:	vorbis-tools
Requires:	xdialog

%description
Jack_capture is a program for recording sound files with JACK. It's default
operation is to capture whatever sound is going out to your speakers into a
file, but it can do a number of other operations as well.

%prep
%setup -q
%patch0 -p1 -b .ppc64

%build
make %{?_smp_mflags} OPTIMIZE="%{optflags}"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} prefix=%{_prefix}

# Desktop file
mkdir -p %{buildroot}/%{_datadir}/applications
desktop-file-install					\
	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications	\
	%{SOURCE1}

# Icon
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps
install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/%{name}*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Fri May 08 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.33-1
- Update to 0.9.33
- Drop upstreamed patches
- Fix the build failure on ppc64

* Wed May 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.32-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jack_capture/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 May 2009 05:05:11 -0000	1.1
+++ .cvsignore	13 May 2009 06:11:33 -0000	1.2
@@ -0,0 +1 @@
+jack_capture-0.9.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jack_capture/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 May 2009 05:05:11 -0000	1.1
+++ sources	13 May 2009 06:11:33 -0000	1.2
@@ -0,0 +1 @@
+37a0cb5d564b65920de4192ffa5ca4c6  jack_capture-0.9.33.tar.gz


