rpms/gqradio/F-13 gqradio-1.9.2-ld.patch, NONE, 1.1 gqradio-1.9.2-v4l2.patch, NONE, 1.1 gqradio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/gqradio/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3509/F-13

Modified Files:
	.cvsignore sources 
Added Files:
	gqradio-1.9.2-ld.patch gqradio-1.9.2-v4l2.patch gqradio.spec 
	import.log 
Log Message:
initial version

gqradio-1.9.2-ld.patch:
 configure |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gqradio-1.9.2-ld.patch ---
diff -Naur gqradio-1.9.2/configure gqradio-1.9.2-new/configure
--- gqradio-1.9.2/configure	2005-02-22 21:58:29.000000000 -0300
+++ gqradio-1.9.2-new/configure	2010-02-25 07:12:37.000000000 -0300
@@ -4327,6 +4327,7 @@
             echo "$as_me:$LINENO: checking GQRADIO_LIBS" >&5
 echo $ECHO_N "checking GQRADIO_LIBS... $ECHO_C" >&6
             GQRADIO_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0"`
+            GQRADIO_LIBS=$GQRADIO_LIBS"-lX11 -lm"
             echo "$as_me:$LINENO: result: $GQRADIO_LIBS" >&5
 echo "${ECHO_T}$GQRADIO_LIBS" >&6
         else

gqradio-1.9.2-v4l2.patch:
 io_radio.c |   55 +++++++++++++++++++++++--------------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

--- NEW FILE gqradio-1.9.2-v4l2.patch ---
--- gqradio-1.9.2/src/io_radio.c	2005-02-23 04:01:18.000000000 +0000
+++ gqradio-1.9.2/src/io_radio.c	2007-02-10 18:57:17.000000000 +0000
@@ -38,6 +38,7 @@
   #include <fcntl.h>
   #include <sys/ioctl.h>
   #include <linux/videodev.h>
+  #include <linux/videodev2.h>
   #include <errno.h>
 #elif defined(HAVE_IOCTL_BT848)
   #include <fcntl.h>
@@ -108,9 +109,9 @@ static void radio_error_message(void)
 	printf("Error talking (ioctl) to %s, %s\n", RADIO_DEVICE, strerror(errno));
 }
 
-static guint radio_calc_steps(struct video_tuner *t)
+static guint radio_calc_steps(struct v4l2_tuner *t)
 {
-	if ( (t->flags & VIDEO_TUNER_LOW) )
+	if ( (t->capability & V4L2_TUNER_CAP_LOW) )
 		{
 		return 16000;	/* field is KHz */
 		}
@@ -149,27 +150,21 @@ static gint radio_control_off(void)
 
 static gint radio_control_set_mute(gint mute)
 {
-	struct video_audio av;
+	struct v4l2_control control;
 
 	if (v4l_fd == -1) return FALSE;
 
-	if (ioctl(v4l_fd, VIDIOCGAUDIO, &av) != 0)
-		{
-		radio_error_message();
-		return FALSE;
-		}
-
+	control.id = V4L2_CID_AUDIO_MUTE;
 	if (mute)
 		{
-		av.flags |= VIDEO_AUDIO_MUTE;
+		control.value = 1;
 		}
 	else
 		{
-		if (av.volume == 0 || radio_volume_boost) av.volume = 65535;
-		av.flags &= ~VIDEO_AUDIO_MUTE;
+		control.value = 0;
 		}
 
-	if (ioctl(v4l_fd, VIDIOCSAUDIO, &av) != 0)
+	if (ioctl(v4l_fd, VIDIOC_S_CTRL, &control) != 0)
 		{
 		radio_error_message();
 		return FALSE;
@@ -180,15 +175,15 @@ static gint radio_control_set_mute(gint 
 
 static gint radio_control_set_freq(guint32 freq)
 {
-	struct video_tuner t;
+	struct v4l2_tuner t;
+	struct v4l2_frequency vfreq;
 	guint32 f;
 	guint m;
 
 	if (v4l_fd == -1) return FALSE;
 
-	t.tuner = 0;
-
-	if (ioctl(v4l_fd, VIDIOCGTUNER, &t) == 0)
+	memset(&t, 0, sizeof(struct v4l2_tuner));
+	if (ioctl(v4l_fd, VIDIOC_G_TUNER, &t) == 0)
 		{
 		m = radio_calc_steps(&t);
 		}
@@ -199,7 +194,10 @@ static gint radio_control_set_freq(guint
 		}
 
 	f = (guint32)((gfloat)freq / 1000000.0 * m);
-	if (ioctl(v4l_fd, VIDIOCSFREQ, &f) != 0)
+	vfreq.tuner = 0;
+	vfreq.type = V4L2_TUNER_RADIO;
+	vfreq.frequency = f;
+	if (ioctl(v4l_fd, VIDIOC_S_FREQUENCY, &vfreq) != 0)
 		{
 		radio_error_message();
 		return FALSE;
@@ -239,7 +237,7 @@ static gint radio_real_shutdown(void)
 
 static gint radio_real_test(void)
 {
-	struct video_tuner t;
+	struct v4l2_tuner t;
 
 	if (!radio_device) radio_device = g_strdup(RADIO_DEVICE);
 
@@ -256,9 +254,8 @@ static gint radio_real_test(void)
 		return FALSE;
 		}
 
-	t.tuner = 0;
-
-	if (ioctl(v4l_fd, VIDIOCGTUNER, &t) == 0)
+	memset(&t, 0, sizeof(struct v4l2_tuner));
+	if (ioctl(v4l_fd, VIDIOC_G_TUNER, &t) == 0)
 		{
 		guint g;
 
@@ -281,19 +278,19 @@ static gint radio_real_test(void)
 /* stereo is 0 or 1, strength is 0 to 100 (%) */
 static gint radio_real_status(gint *stereo, gint *strength)
 {
-	struct video_tuner t;
-	struct video_audio av;
+	struct v4l2_tuner t;
 
 	if (v4l_fd == -1 || !stereo || !strength) return FALSE;
 
 	/* stereo */
 
-	if (ioctl(v4l_fd, VIDIOCGAUDIO, &av) != 0)
+	memset(&t, 0, sizeof(struct v4l2_tuner));
+	if (ioctl(v4l_fd, VIDIOC_G_TUNER, &t) != 0)
 		{
 		radio_error_message();
 		return FALSE;
 		}
-	if ( (av.mode & VIDEO_SOUND_STEREO) )
+	if ( (t.audmode & V4L2_TUNER_MODE_STEREO) )
 		{
 		*stereo = TRUE;
 		}
@@ -304,12 +301,6 @@ static gint radio_real_status(gint *ster
 
 	/* strength */
 
-	t.tuner = 0;
-	if (ioctl(v4l_fd, VIDIOCGTUNER, &t) != 0)
-		{
-		radio_error_message();
-		return FALSE;
-		}
 	*strength = (double)t.signal / 65535.0 * 100.0;	/* 16bit scale */
 
 	return TRUE;


--- NEW FILE gqradio.spec ---
Summary: Skinned radio tuner
Name:    gqradio
Version: 1.9.2
Release: 6%{?dist}
License: GPL+
URL:     http://gqmpeg.sourceforge.net
Group:   Applications/Multimedia
Source0: http://download.sourceforge.net/gqmpeg/gqradio-%{version}.tar.gz
Patch0:  gqradio-1.9.2-v4l2.patch
Patch1:  gqradio-1.9.2-ld.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils, gettext
BuildRequires: gtk2-devel >= 2.4

%description
Radio tuner with themes. 
Interfaces with video4linux compatible radio tuner cards.

%prep
%setup -q
%patch0 -p1 -b .v4l2
%patch1 -p1 -b .ld

for i in ./SKIN-SPECS ; do
        iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
        mv "${i}_" "$i"
done

%build
%configure
%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}

%{__make} DESTDIR=%{buildroot} install

desktop-file-install \
           --delete-original \
           --vendor "" \
           --remove-key="Info" \
           --remove-key="Info[fr]" \
           --dir %{buildroot}%{_datadir}/applications \
           %{name}.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README ChangeLog COPYING README TODO SKIN-SPECS
%{_bindir}/gqradio
%{_datadir}/gqradio
%{_datadir}/applications/gqradio.desktop
%{_datadir}/pixmaps/gqradio.png

%changelog

* Thu Feb 25 2010 Paulo Roma <roma at lcg.ufrj.br> 1.9.2-6
- Changed license to GPL+
- Removed INSTALL from %%doc.

* Thu Feb 25 2010 Paulo Roma <roma at lcg.ufrj.br> 1.9.2-5
- Fixed FTBFS with the new ld (rhbz#564863)

* Sun Feb 14 2010 Paulo Roma <roma at lcg.ufrj.br> 1.9.2-4
- Changed %%name for %%{name}

* Sat Dec 05 2009 Paulo Roma <roma at lcg.ufrj.br> 1.9.2-3
- Using find_lang.
- Patched for v4l2.

* Mon Feb 05 2007 Paulo Roma <roma at lcg.ufrj.br> 1.9.2-2
- Rebuilt for Fedora 6.

* Fri Mar 03 2006 Paulo Roma <roma at lcg.ufrj.br> 1.9.2-1
- Initial spec file.
- Built for Fedora 4.



--- NEW FILE import.log ---
gqradio-1_9_2-6_fc12:F-13:gqradio-1.9.2-6.fc12.src.rpm:1267144910


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gqradio/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Feb 2010 17:39:12 -0000	1.1
+++ .cvsignore	26 Feb 2010 00:42:11 -0000	1.2
@@ -0,0 +1 @@
+gqradio-1.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gqradio/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Feb 2010 17:39:12 -0000	1.1
+++ sources	26 Feb 2010 00:42:12 -0000	1.2
@@ -0,0 +1 @@
+10fded1c080cadd1b260a592772bcbb6  gqradio-1.9.2.tar.gz