[gnomeradio] - Drop support for v4l1, fixes build against current kernel
Dominik Mierzejewski
rathann at fedoraproject.org
Sun Feb 27 17:15:31 UTC 2011
commit 11720411c09b1351391fd8a9aa643444910e72e9
Author: Dominik Mierzejewski <rpm at greysector.net>
Date: Sun Feb 27 17:16:01 2011 +0100
- Drop support for v4l1, fixes build against current kernel
gnomeradio-ld.patch | 16 ++++----
gnomeradio-v4l2.patch | 90 ++++++++++++++++++++++++++++++++++++++++++++-----
gnomeradio.spec | 5 ++-
3 files changed, 93 insertions(+), 18 deletions(-)
---
diff --git a/gnomeradio-ld.patch b/gnomeradio-ld.patch
index 0b4598c..7b852e5 100644
--- a/gnomeradio-ld.patch
+++ b/gnomeradio-ld.patch
@@ -1,17 +1,17 @@
diff -up gnomeradio-1.8/src/Makefile.am.ld gnomeradio-1.8/src/Makefile.am
---- gnomeradio-1.8/src/Makefile.am.ld 2008-09-13 18:01:41.000000000 +0200
-+++ gnomeradio-1.8/src/Makefile.am 2010-02-15 01:28:42.000000000 +0100
-@@ -34,4 +34,4 @@ gnomeradio_SOURCES = \
- v4l1.c \
+--- gnomeradio-1.8/src/Makefile.am.ld 2011-02-27 17:11:12.000000000 +0100
++++ gnomeradio-1.8/src/Makefile.am 2011-02-27 17:11:34.000000000 +0100
+@@ -33,4 +33,4 @@ gnomeradio_SOURCES = \
+ trayicon.c \
v4l2.c
-gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC)
+gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC) -lm
diff -up gnomeradio-1.8/src/Makefile.in.ld gnomeradio-1.8/src/Makefile.in
---- gnomeradio-1.8/src/Makefile.in.ld 2008-09-13 18:01:57.000000000 +0200
-+++ gnomeradio-1.8/src/Makefile.in 2010-02-15 01:29:03.000000000 +0100
-@@ -279,7 +279,7 @@ gnomeradio_SOURCES = \
- v4l1.c \
+--- gnomeradio-1.8/src/Makefile.in.ld 2011-02-27 17:11:12.000000000 +0100
++++ gnomeradio-1.8/src/Makefile.in 2011-02-27 17:11:45.000000000 +0100
+@@ -277,7 +277,7 @@ gnomeradio_SOURCES = \
+ trayicon.c \
v4l2.c
-gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC)
diff --git a/gnomeradio-v4l2.patch b/gnomeradio-v4l2.patch
index 9e2dfac..4d702fd 100644
--- a/gnomeradio-v4l2.patch
+++ b/gnomeradio-v4l2.patch
@@ -1,6 +1,53 @@
+diff -up gnomeradio-1.8/src/Makefile.am.v4l2 gnomeradio-1.8/src/Makefile.am
+--- gnomeradio-1.8/src/Makefile.am.v4l2 2008-09-13 18:01:41.000000000 +0200
++++ gnomeradio-1.8/src/Makefile.am 2011-02-27 17:10:13.000000000 +0100
+@@ -31,7 +31,6 @@ gnomeradio_SOURCES = \
+ record.c \
+ tech.c \
+ trayicon.c \
+- v4l1.c \
+ v4l2.c
+
+ gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC)
+diff -up gnomeradio-1.8/src/Makefile.in.v4l2 gnomeradio-1.8/src/Makefile.in
+--- gnomeradio-1.8/src/Makefile.in.v4l2 2008-09-13 18:01:57.000000000 +0200
++++ gnomeradio-1.8/src/Makefile.in 2011-02-27 17:09:58.000000000 +0100
+@@ -52,7 +52,7 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_gnomeradio_OBJECTS = bacon-volume.$(OBJEXT) gui.$(OBJEXT) \
+ lirc.$(OBJEXT) prefs.$(OBJEXT) radio.$(OBJEXT) \
+ rec_tech.$(OBJEXT) record.$(OBJEXT) tech.$(OBJEXT) \
+- trayicon.$(OBJEXT) v4l1.$(OBJEXT) v4l2.$(OBJEXT)
++ trayicon.$(OBJEXT) v4l2.$(OBJEXT)
+ gnomeradio_OBJECTS = $(am_gnomeradio_OBJECTS)
+ am__DEPENDENCIES_1 =
+ gnomeradio_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -265,7 +265,6 @@ gnomeradio_SOURCES = \
+ record.h \
+ tech.h \
+ trayicon.h \
+- v4l1.h \
+ v4l2.h \
+ bacon-volume.c \
+ gui.c \
+@@ -276,7 +275,6 @@ gnomeradio_SOURCES = \
+ record.c \
+ tech.c \
+ trayicon.c \
+- v4l1.c \
+ v4l2.c
+
+ gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC)
+@@ -360,7 +358,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/record.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tech.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trayicon.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/v4l1.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/v4l2.Po at am__quote@
+
+ .c.o:
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
++++ gnomeradio-1.8/src/prefs.c 2011-02-27 17:09:58.000000000 +0100
@@ -112,7 +112,7 @@ gboolean load_settings(void)
/* Load general settings */
settings.device = gconf_client_get_string(client, "/apps/gnomeradio/device" , NULL);
@@ -12,15 +59,40 @@ diff -up gnomeradio-1.8/src/prefs.c.v4l2 gnomeradio-1.8/src/prefs.c
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
++++ gnomeradio-1.8/src/radio.c 2011-02-27 17:09:58.000000000 +0100
+@@ -24,7 +24,6 @@
+ #include <assert.h>
+
+ #include "radio.h"
+-#include "v4l1.h"
+ #include "v4l2.h"
+
+ static RadioDev *dev;
+@@ -41,25 +40,10 @@ int radio_init(char *device, DriverType
}
switch (driver) {
-+ case DRIVER_ANY:
- case DRIVER_V4L2:
- goto try_v4l2;
-- case DRIVER_ANY:
- case DRIVER_V4L1:
+- case DRIVER_V4L2:
+- goto try_v4l2;
+ case DRIVER_ANY:
+- case DRIVER_V4L1:
++ case DRIVER_V4L2:
default:
- goto try_v4l1;
+- goto try_v4l1;
+- }
+-
+-try_v4l1:
+- dev = v4l1_radio_dev_new();
+- rv = dev->init (dev, device);
+- if (rv == 0) {
+- fprintf(stderr, "Initializing v4l1 failed\n");
+- dev->finalize (dev);
+- dev = NULL;
+- if (driver != DRIVER_ANY)
+- goto failure;
+- } else {
+- goto success;
++ goto try_v4l2;
+ }
+
+ try_v4l2:
diff --git a/gnomeradio.spec b/gnomeradio.spec
index 9148a5f..c514b9d 100644
--- a/gnomeradio.spec
+++ b/gnomeradio.spec
@@ -1,7 +1,7 @@
Summary: Graphical FM-Tuner program for GNOME
Name: gnomeradio
Version: 1.8
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://projects.gnome.org/gnomeradio/
@@ -118,6 +118,9 @@ scrollkeeper-update -q || :
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%changelog
+* Sun Feb 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.8-13
+- Drop support for v4l1, fixes build against current kernel
+
* Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> 1.8-12
- Rebuild against newer gtk
More information about the scm-commits
mailing list