rpms/vdr/devel vdr-1.6.0-sky-lirc-device.patch, NONE, 1.1 vdr.spec, 1.52, 1.53

Ville Skyttä scop at fedoraproject.org
Sun Nov 22 21:11:58 UTC 2009


Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29946

Modified Files:
	vdr.spec 
Added Files:
	vdr-1.6.0-sky-lirc-device.patch 
Log Message:
* Sun Nov 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.0-29
- Set LIRC_DEVICE to /var/run/lirc/lircd for lirc 0.8.6 and add patch to
  change the sky plugin and vdr.1 man page accordingly (#538604).


vdr-1.6.0-sky-lirc-device.patch:
 Makefile |    3 ++-
 sky.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE vdr-1.6.0-sky-lirc-device.patch ---
diff -up vdr-1.6.0/PLUGINS/src/sky/Makefile~ vdr-1.6.0/PLUGINS/src/sky/Makefile
--- vdr-1.6.0/PLUGINS/src/sky/Makefile~	2008-01-13 15:00:16.000000000 +0200
+++ vdr-1.6.0/PLUGINS/src/sky/Makefile	2009-11-22 22:37:27.000000000 +0200
@@ -41,7 +41,8 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES += -I$(VDRDIR)/include
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+LIRC_DEVICE ?= /dev/lircd
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
 
 ### The object files (add further files here):
 
diff -up vdr-1.6.0/PLUGINS/src/sky/sky.c~ vdr-1.6.0/PLUGINS/src/sky/sky.c
--- vdr-1.6.0/PLUGINS/src/sky/sky.c~	2008-03-22 12:19:32.000000000 +0200
+++ vdr-1.6.0/PLUGINS/src/sky/sky.c	2009-11-22 22:33:03.000000000 +0200
@@ -88,7 +88,7 @@ cDigiboxDevice::cDigiboxDevice(void)
   apid = vpid = 0;
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
-  strn0cpy(addr.sun_path, "/dev/lircd", sizeof(addr.sun_path));//XXX parameter???
+  strn0cpy(addr.sun_path, LIRC_DEVICE, sizeof(addr.sun_path));//XXX parameter???
   fd_lirc = socket(AF_UNIX, SOCK_STREAM, 0);
   if (fd_lirc >= 0) {
      if (connect(fd_lirc, (struct sockaddr *)&addr, sizeof(addr)) < 0) {


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- vdr.spec	22 Nov 2009 20:03:10 -0000	1.52
+++ vdr.spec	22 Nov 2009 21:11:58 -0000	1.53
@@ -25,9 +25,15 @@
 # From APIVERSION in config.h
 %global apiver    1.6.0
 
+%if "%(rpm -q --qf=%%{VERSION} lirc-devel 2>/dev/null)" >= "0.8.6"
+%global lircsock  /var/run/lirc/lircd
+%else
+%global lircsock  /dev/lircd
+%endif
+
 Name:           vdr
 Version:        1.6.0
-Release:        28%{?dist}
+Release:        29%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -93,6 +99,8 @@ Patch26:        %{name}-jumpplay-1.0-1.6
 # http://projects.vdr-developer.org/git/?p=vdr-plugin-epgsearch.git;a=blob;f=patches/vdr.epgsearch-exttimeredit-0.0.2.diff
 # Modified so that it applies on top of our other patches
 Patch27:        %{name}-1.6.0-epgsearch-exttimeredit-0.0.2.diff
+# https://bugzilla.redhat.com/show_bug.cgi?id=538604, upstreamed 2009-11-22
+Patch28:        %{name}-1.6.0-sky-lirc-device.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -102,6 +110,8 @@ BuildRequires:  perl(File::Spec)
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gettext
+# lirc-devel just for version checking for socket location
+BuildRequires:  lirc-devel
 %if %{with docs}
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -221,11 +231,14 @@ sed \
 %patch25 -p1 -F 2
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.{jumpplay,timer-info} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
+sed -i -e 's|/dev/lircd\b|%{lircsock}|' vdr.1
+
 cp -p %{SOURCE5} reccmds.conf
 cp -p %{SOURCE13} timercmds.conf
 cp -p %{SOURCE6} commands.conf
@@ -281,6 +294,7 @@ CONFDIR      = \$(shell pkg-config vdr -
 INCLUDEDIR   = \$(shell pkg-config vdr --variable=includedir)
 LIBDIR       = \$(PLUGINLIBDIR)
 
+LIRC_DEVICE  = %{lircsock}
 VDR_USER     = %{vdr_user}
 EOF
 
@@ -543,6 +557,10 @@ fi
 %endif # plugins
 
 %changelog
+* Sun Nov 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.0-29
+- Set LIRC_DEVICE to /var/run/lirc/lircd for lirc 0.8.6 and add patch to
+  change the sky plugin and vdr.1 man page accordingly (#538604).
+
 * Wed Oct 28 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-28
 - Update URLs to point to tvdr.de.
 




More information about the fedora-extras-commits mailing list