rpms/em8300-kmod/F-14 em8300-kmod-0.18.0-kernel2635.patch, NONE, 1.1 em8300-kmod.spec, 1.54, 1.55
Author: felix
Update of /cvs/free/rpms/em8300-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17379
Modified Files:
em8300-kmod.spec
Added Files:
em8300-kmod-0.18.0-kernel2635.patch
Log Message:
* Sun Jan 23 2011 Ville Skyttä <ville.skytta(a)iki.fi> - 0.18.0-2
- Apply Christian Gmeiner's patch to fix build with kernels >= 2.6.35.
em8300-kmod-0.18.0-kernel2635.patch:
em8300.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE em8300-kmod-0.18.0-kernel2635.patch ---
diff -up em8300-0.18.0/include/linux/em8300.h~ em8300-0.18.0/include/linux/em8300.h
--- em8300-0.18.0/include/linux/em8300.h~ 2009-12-21 00:24:55.000000000 +0200
+++ em8300-0.18.0/include/linux/em8300.h 2011-01-23 22:39:34.938179632 +0200
@@ -234,6 +234,10 @@ extern int major;
#include <linux/wait.h> /* wait_queue_head_t */
#include <linux/list.h> /* struct list_head */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+#include <linux/semaphore.h> /* struct semaphore */
+#endif
+
#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
#define snd_card_t struct snd_card
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-14/em8300-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- em8300-kmod.spec 24 Dec 2010 17:37:19 -0000 1.54
+++ em8300-kmod.spec 3 Feb 2011 19:05:42 -0000 1.55
@@ -10,7 +10,7 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
Version: 0.18.0
-Release: 1%{?dist}.7
+Release: 2%{?dist}
Group: System Environment/Kernel
License: GPLv2+
@@ -18,6 +18,8 @@
#Source0:
http://dxr3.sourceforge.net/download/em8300-%{version}%{?prever:-%{prever... with
modules/em8300.uc removed
#Source0: em8300-nofirmware-%{version}%{?prever:-%{prever}}.tar.lzma
Source0:
http://downloads.sourceforge.net/dxr3/em8300-nofirmware-%{version}%{?prev...
+# http://trac-hg.assembla.com/em8300-cgmeiner/changeset/720
+Patch0: %{name}-0.18.0-kernel2635.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# get the needed BuildRequires (in parts depending on what we build for)
@@ -35,7 +37,10 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name}
%{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"}
2>/dev/null
%setup -q -c
-for kernel_version in %{?kernel_versions} ; do
+cd em8300-%{version}%{?prever:-%{prever}}
+%patch0 -p1
+cd ..
+for kernel_version in %{?kernel_versions} ; do
cp -a em8300-%{version}%{?prever:-%{prever}} \
_kmod_build_${kernel_version%%___*}
done
@@ -63,6 +68,9 @@
%changelog
+* Sun Jan 23 2011 Ville Skyttä <ville.skytta(a)iki.fi> - 0.18.0-2
+- Apply Christian Gmeiner's patch to fix build with kernels >= 2.6.35.
+
* Fri Dec 24 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.18.0-1.7
- rebuild for updated kernel