summaryrefslogtreecommitdiff
path: root/audio/gqradio/gqradio-1.9.2-v4l2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'audio/gqradio/gqradio-1.9.2-v4l2.patch')
-rw-r--r--audio/gqradio/gqradio-1.9.2-v4l2.patch26
1 files changed, 14 insertions, 12 deletions
diff --git a/audio/gqradio/gqradio-1.9.2-v4l2.patch b/audio/gqradio/gqradio-1.9.2-v4l2.patch
index ae72217a72..aa5350ea1e 100644
--- a/audio/gqradio/gqradio-1.9.2-v4l2.patch
+++ b/audio/gqradio/gqradio-1.9.2-v4l2.patch
@@ -1,14 +1,16 @@
---- 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 @@
+diff -Naur gqradio-1.9.2/src/io_radio.c gqradio-1.9.2-new/src/io_radio.c
+--- gqradio-1.9.2/src/io_radio.c 2005-02-23 01:01:18.000000000 -0300
++++ gqradio-1.9.2-new/src/io_radio.c 2012-10-25 19:54:14.038303871 -0200
+@@ -37,7 +37,7 @@
+ #if defined(linux) && defined(HAVE_VIDEO4LINUX)
#include <fcntl.h>
#include <sys/ioctl.h>
- #include <linux/videodev.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)
+@@ -108,9 +108,9 @@
printf("Error talking (ioctl) to %s, %s\n", RADIO_DEVICE, strerror(errno));
}
@@ -20,7 +22,7 @@
{
return 16000; /* field is KHz */
}
-@@ -149,27 +150,21 @@ static gint radio_control_off(void)
+@@ -149,27 +149,21 @@
static gint radio_control_set_mute(gint mute)
{
@@ -53,7 +55,7 @@
{
radio_error_message();
return FALSE;
-@@ -180,15 +175,15 @@ static gint radio_control_set_mute(gint
+@@ -180,15 +174,15 @@
static gint radio_control_set_freq(guint32 freq)
{
@@ -73,7 +75,7 @@
{
m = radio_calc_steps(&t);
}
-@@ -199,7 +194,10 @@ static gint radio_control_set_freq(guint
+@@ -199,7 +193,10 @@
}
f = (guint32)((gfloat)freq / 1000000.0 * m);
@@ -85,7 +87,7 @@
{
radio_error_message();
return FALSE;
-@@ -239,7 +237,7 @@ static gint radio_real_shutdown(void)
+@@ -239,7 +236,7 @@
static gint radio_real_test(void)
{
@@ -94,7 +96,7 @@
if (!radio_device) radio_device = g_strdup(RADIO_DEVICE);
-@@ -256,9 +254,8 @@ static gint radio_real_test(void)
+@@ -256,9 +253,8 @@
return FALSE;
}
@@ -106,7 +108,7 @@
{
guint g;
-@@ -281,19 +278,19 @@ static gint radio_real_test(void)
+@@ -281,19 +277,19 @@
/* stereo is 0 or 1, strength is 0 to 100 (%) */
static gint radio_real_status(gint *stereo, gint *strength)
{
@@ -130,7 +132,7 @@
{
*stereo = TRUE;
}
-@@ -304,12 +301,6 @@ static gint radio_real_status(gint *ster
+@@ -304,12 +300,6 @@
/* strength */