rpms/gnomeradio/F-12 gnomeradio-v4l2.patch, NONE, 1.1 gnomeradio.sh, NONE, 1.1 import.log, NONE, 1.1 gnomeradio.spec, 1.11, 1.12

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/gnomeradio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26177/F-12

Modified Files:
	gnomeradio.spec 
Added Files:
	gnomeradio-v4l2.patch gnomeradio.sh import.log 
Log Message:
using v4l2 by default

gnomeradio-v4l2.patch:
 prefs.c |    2 +-
 radio.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnomeradio-v4l2.patch ---
diff -up gnomeradio-1.8/src/prefs.c.v4l2 gnomeradio-1.8/src/prefs.c
--- gnomeradio-1.8/src/prefs.c.v4l2	2008-04-13 15:04:52.000000000 +0200
+++ gnomeradio-1.8/src/prefs.c	2009-12-06 12:43:45.000000000 +0100
@@ -112,7 +112,7 @@ gboolean load_settings(void)
 	/* Load general settings */
 	settings.device = gconf_client_get_string(client, "/apps/gnomeradio/device" , NULL);
 	if (!settings.device)
-		settings.device = g_strdup("/dev/radio");
+		settings.device = g_strdup("/dev/radio0");
 	settings.driver = gconf_client_get_string(client, "/apps/gnomeradio/driver" , NULL);
 	if (!settings.driver)
 		settings.driver = g_strdup("any");
diff -up gnomeradio-1.8/src/radio.c.v4l2 gnomeradio-1.8/src/radio.c
--- gnomeradio-1.8/src/radio.c.v4l2	2008-04-13 14:55:43.000000000 +0200
+++ gnomeradio-1.8/src/radio.c	2009-12-06 12:44:01.000000000 +0100
@@ -41,9 +41,9 @@ int radio_init(char *device, DriverType 
 	}
 
 	switch (driver) {
+		case DRIVER_ANY:
 		case DRIVER_V4L2:
 			goto try_v4l2;
-		case DRIVER_ANY:
 		case DRIVER_V4L1:
 		default:
 			goto try_v4l1;


--- NEW FILE gnomeradio.sh ---
#!/bin/sh
# Route the capture sources on the sound card back in as PCM audio

PROG=/usr/bin/gnomeradio

sox -c 2 -s -r 44100 -t ossdsp /dev/audio -t ossdsp -r 44100 /dev/dsp &
# a bit noisy for my taste
#sox -c 2 -s -r 44100 -t alsa hw:0,0 -t alsa -r 44100 &

# if someone wants to start always with the same volume
# amixer -c 0 sset Master 80%,80% unmute

$PROG
wait $PROG
t=`pidof sox`;
kill $t;


--- NEW FILE import.log ---
gnomeradio-1_8-4_fc13:F-12:gnomeradio-1.8-4.fc13.src.rpm:1260247084


Index: gnomeradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomeradio/F-12/gnomeradio.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnomeradio.spec	25 Jul 2009 00:52:28 -0000	1.11
+++ gnomeradio.spec	8 Dec 2009 04:38:24 -0000	1.12
@@ -1,11 +1,13 @@
 Summary: Graphical FM-Tuner program for GNOME
 Name: gnomeradio
 Version: 1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-URL: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/
-Source: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
+URL: http://projects.gnome.org/gnomeradio/
+Source0: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
+Source1: gnomeradio.sh
+Patch0: %{name}-v4l2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -31,6 +33,8 @@ Ogg files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .v4l2
+%{__install} -m 755 %{SOURCE1} .
 
 %build
 %configure \
@@ -93,7 +97,7 @@ scrollkeeper-update -q || :
 
 %files -f %{name}.lang
 %defattr(644,root,root,0755)
-%doc AUTHORS ChangeLog COPYING README README.lirc README.recording
+%doc AUTHORS ChangeLog COPYING README README.lirc README.recording gnomeradio.sh
 %{_datadir}/gnome/help/%{name}/
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %attr(755,root,root) %{_bindir}/%{name}
@@ -103,6 +107,11 @@ scrollkeeper-update -q || :
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Sat Dec 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.8-4
+- Changed defaults for using v4l2 (based on a patch by Paulo Roma)
+- Included script gnomeradio.sh (Paulo Roma)
+- fixed URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild