pool/v4l-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 138923 from openSUSE:Factory:Staging:Systemd

Browse Source 
Add udev-rules-dir.patch and BuildRequires udev to fix build with new udev rules directory location.

OBS-URL: https://build.opensuse.org/request/show/138923
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=19
This commit is contained in:
Asterios Dramis 2012-10-21 12:32:27 +00:00 committed by Git OBS Bridge
parent bb047d2c88
commit a0e5998bdb
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
udev-rules-dir.patch Normal file
View File

@ -0,0 +1,21 @@
Index: v4l-utils-0.8.8/utils/keytable/Makefile
===================================================================
--- v4l-utils-0.8.8.orig/utils/keytable/Makefile
+++ v4l-utils-0.8.8/utils/keytable/Makefile
@@ -1,4 +1,5 @@
TARGETS = ir-keytable
+UDEVRULESDIR=/lib/udev/rules.d
all: $(TARGETS)
@@ -37,8 +38,8 @@ install: $(TARGETS)
install -m 644 -p rc_maps.cfg $(DESTDIR)/etc
install -m 755 -d $(DESTDIR)/etc/rc_keymaps
install -m 644 -p rc_keymaps/* $(DESTDIR)/etc/rc_keymaps
- install -m 755 -d $(DESTDIR)/lib/udev/rules.d
- install -m 644 -p 70-infrared.rules $(DESTDIR)/lib/udev/rules.d
+ install -m 755 -d $(DESTDIR)/$(UDEVRULESDIR)
+ install -m 644 -p 70-infrared.rules $(DESTDIR)/$(UDEVRULESDIR)
install -m 755 -d $(DESTDIR)$(MANDIR)/man1
install -m 644 -p ir-keytable.1 $(DESTDIR)$(MANDIR)/man1

6
v4l-utils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 17 13:53:54 UTC 2012 - fcrozat@suse.com
- Add udev-rules-dir.patch and BuildRequires udev to fix build with
new udev rules directory location.
-------------------------------------------------------------------
Wed May 30 18:24:41 UTC 2012 - asterios.dramis@gmail.com

15
v4l-utils.spec
View File

@ -16,6 +16,12 @@
#
%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
%define _udevrulesdir /usr/lib/udev/rules.d
%else
%define _udevrulesdir /lib/udev/rules.d
%endif
Name: v4l-utils
Version: 0.8.8
Release: 0
@ -30,6 +36,8 @@ Source100: baselibs.conf
Patch0: disable_rds_compilation.patch
# PATCH-FIX-UPSTREAM libdvbv5-Add-missing-includes.patch asterios.dramis@gmail.com -- Fix compilation due to missing includes (taken from Fedora)
Patch1: libdvbv5-Add-missing-includes.patch
# PATCH-FIX-UPSTREAM udev-rules-dir.patch fcrozat@suse.com -- allow udev rules directory to be overridden
Patch2: udev-rules-dir.patch
# Only needed to patch broken images in the upstream tarball
BuildRequires: ImageMagick
BuildRequires: kernel-headers
@ -41,9 +49,7 @@ BuildRequires: sysfsutils-devel
BuildRequires: sysfsutils
%endif
# Only needed for directory ownership (/lib/udev/rules.d)
%if 0%{?sles_version}
BuildRequires: udev
%endif
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
@ -142,12 +148,13 @@ qv4l2 is a test control and streaming test application for video4linux.
%setup -q
%patch0
%patch1 -p1
%patch2 -p1
%build
make CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags}" %{?_smp_mflags}
%install
make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} UDEVRULESDIR=%{_udevrulesdir}
# Patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size"
mogrify -extent "36x36" -background transparent -gravity "south" %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qv4l2.png
@ -175,7 +182,7 @@ mogrify -scale 32x32 -background transparent %{buildroot}%{_datadir}/icons/hicol
%dir %{_sysconfdir}/rc_keymaps
%config(noreplace) %{_sysconfdir}/rc_keymaps/*
%config(noreplace) %{_sysconfdir}/rc_maps.cfg
/lib/udev/rules.d/70-infrared.rules
%{_udevrulesdir}/70-infrared.rules
%{_bindir}/cx18-ctl
%{_bindir}/dvb-*
%{_bindir}/dvbv5-*