7:10 p.m.
Author: jwrdegoede
Update of /cvs/nonfree/rpms/r5u87x-firmware/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15052
Modified Files:
.cvsignore sources
Added Files:
r5u87x-firmware-path.patch r5u87x-firmware.spec
Log Message:
* Fri Jun 18 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.0-3.a9b2171d762b
- Rebase to latest upstream
- This fixes the udev rules to work with recent udev releases
r5u87x-firmware-path.patch:
Makefile | 10 +++++-----
config.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE r5u87x-firmware-path.patch ---
diff -up r5u87x/Makefile.firmware_path r5u87x/Makefile
--- r5u87x/Makefile.firmware_path 2009-12-31 16:00:34.000000000 +0100
+++ r5u87x/Makefile 2010-01-27 10:25:58.000000000 +0100
@@ -12,15 +12,15 @@ FIRMWARE=`ls ucode | xargs`
# Install names
LOADER_INSTALL=r5u87x-loader
-UDEV_INSTALL=/etc/udev/rules.d/
+UDEV_INSTALL=/lib/udev/rules.d/
# Directories
PREFIX=/usr
-INSTALL_PATH=$(DESTDIR)$(PREFIX)
+INSTALL_PATH=$(DESTDIR)
sbindir=/sbin
libdir=/lib
-firmdir=$(libdir)/r5u87x/ucode
-UCODE_PATH=$(PREFIX)$(firmdir)/$(FIRMWARE_NAMESPEC)
+firmdir=$(libdir)/firmware
+UCODE_PATH=$(firmdir)/$(FIRMWARE_NAMESPEC)
# For rules and make targets -------------------------------------------------|
RULESFILE=contrib/90-r5u87x-loader.rules
@@ -73,7 +73,7 @@ $(RULESFILE):
# process template for each firmware file
# loader is part of regexp REPL_LOADER has escaped slashes (to work for simple paths)
for sedline in `ls ucode | sed
's/^r5u87x-\([0-9a-zA-Z]\+\)-\([0-9a-zA-Z]\+\)\.fw$$/s\/#VENDORID#\/\1\/g;s\/#PRODUCTID#\/\2\/g/p;d'`;
do \
- REPL_LOADER=$$(echo "$(PREFIX)$(sbindir)/$(LOADER_INSTALL)" | sed
's/\//\\\//g'); \
+ REPL_LOADER=$$(echo "$(sbindir)/$(LOADER_INSTALL)" | sed
's/\//\\\//g'); \
cat $(RULESFILE).in | \
awk 'BEGIN{P=0;}/^###BEGINTEMPLATE###/{P=1;}/^###ENDTEMPLATE###/{P=0;} {if (P)
print;}' | \
grep -v '^###' | \
diff -up r5u87x/config.h.firmware_path r5u87x/config.h
--- r5u87x/config.h.firmware_path 2009-12-31 16:00:34.000000000 +0100
+++ r5u87x/config.h 2010-01-27 10:26:36.000000000 +0100
@@ -4,7 +4,7 @@
#define VERSION "0.2"
// By default, defined in Makefile
-//#define UCODE_PATH "/usr/lib/r5u87x/ucode/r5u87x-%vid%-%pid%.fw"
+//#define UCODE_PATH "/lib/firmware/r5u87x-%vid%-%pid%.fw"
// Provide support for --reload argument in application
// so that we can reload the uvcvideo kernel module
--- NEW FILE r5u87x-firmware.spec ---
%define snapshot a9b2171d762b
Name: r5u87x-firmware
# This is a snapshot of 0.2.0 + some fixes
Version: 0.2.0
Release: 3.%{snapshot}%{?dist}
Summary: R5U87x firmware and loader
Group: System Environment/Kernel
# Source is GPL, firmware files are distributable
License: GPLv2+ and Distributable
Url: http://bitbucket.org/ahixon/r5u87x/wiki/Home
Source0: http://bitbucket.org/ahixon/r5u87x/get/%{snapshot}.bz2
# Distro specific firmware path adjustments
Patch0: r5u87x-firmware-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel libusb-devel
# For /lib/udev/rules.d dir ownership
Requires: udev
%description
This package contains firmware needed to make cameras based on Ricoh R5U87x
chipsets work with the uvcvideo driver. And a firmware load tool and udev
rules to load the firmware.
%prep
%setup -q -n r5u87x
%patch0 -p1 -z .firmware_path
chmod 644 README COPYING
chmod 644 docs/*.txt
%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags} PREFIX=
make %{?_smp_mflags} PREFIX= rules
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc docs/*.txt README COPYING
/sbin/r5u87x-loader
/lib/udev/rules.d/90-r5u87x-loader.rules
/lib/firmware/*.fw
%changelog
* Fri Jun 18 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.0-3.a9b2171d762b
- Rebase to latest upstream
- This fixes the udev rules to work with recent udev releases
* Wed Jan 27 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.0-2.32495328d1c6
- Rebase to latest upstream (includes vflip patch, drop)
- Rename to r5u87x-firmware (rf794)
* Mon Aug 31 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.0-1.32a27008b8b9
- First version of the RPM Fusion package
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/r5u87x-firmware/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Jul 2010 21:47:46 -0000 1.1
+++ .cvsignore 16 Jul 2010 19:10:48 -0000 1.2
@@ -0,0 +1 @@
+a9b2171d762b.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/r5u87x-firmware/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Jul 2010 21:47:46 -0000 1.1
+++ sources 16 Jul 2010 19:10:48 -0000 1.2
@@ -0,0 +1 @@
+cb9c654314fb55956a6bc017bc8508ac a9b2171d762b.bz2