rpms/em8300-kmod/devel em8300-0.16.1-2621alsa.patch, NONE, 1.1 em8300-kmod.spec, 1.20, 1.21 em8300-0.16.1-rc2-2621alsa.patch, 1.1, NONE em8300-oss-default.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24396

Modified Files:
	em8300-kmod.spec 
Added Files:
	em8300-0.16.1-2621alsa.patch 
Removed Files:
	em8300-0.16.1-rc2-2621alsa.patch em8300-oss-default.patch 
Log Message:
* Mon Mar 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-7
- Drop OSS default patch, making ALSA the default now; users who need
  OSS should use the audio_driver=oss option of the em8300 module.
- Use upstream 2.6.21/ALSA patch.
- Build for kernel 2.6.20-1.2997.fc7, including ppc64.


em8300-0.16.1-2621alsa.patch:

--- NEW FILE em8300-0.16.1-2621alsa.patch ---
--- em8300-0.16.1/include/linux/em8300.h~	2006-09-13 18:28:36.000000000 +0300
+++ em8300-0.16.1/include/linux/em8300.h	2007-03-16 23:13:05.000000000 +0200
@@ -199,10 +199,14 @@
 extern int major;
 
 #if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#define snd_card_t struct snd_card
+#else
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #endif
+#endif
 
 struct dicom_s {
 	int luma;
@@ -390,6 +394,12 @@
 	unsigned int card_nr;
 };
 
+#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#undef snd_card_t
+#endif
+#endif
+
 #define TIMEDIFF(a,b) a.tv_usec - b.tv_usec + \
 	    1000000 * (a.tv_sec - b.tv_sec)
 
--- em8300-0.16.1/modules/em8300_alsa.c~	2006-11-17 00:57:44.000000000 +0200
+++ em8300-0.16.1/modules/em8300_alsa.c	2007-03-16 23:15:43.000000000 +0200
@@ -29,10 +29,23 @@
 #include <linux/em8300.h>
 #include <linux/pci.h>
 #include <linux/stringify.h>
+#include <linux/version.h>
 #include <asm/semaphore.h>
 
 #include "em8300_reg.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#define snd_card_t struct snd_card
+#define snd_pcm_t struct snd_pcm
+#define snd_pcm_substream_t struct snd_pcm_substream
+#define snd_pcm_hardware_t struct snd_pcm_hardware
+#define snd_pcm_runtime_t struct snd_pcm_runtime
+#define snd_pcm_hw_params_t struct snd_pcm_hw_params
+#define snd_pcm_ops_t struct snd_pcm_ops
+#define snd_device_t struct snd_device
+#define snd_device_ops_t struct snd_device_ops
+#endif
+
 typedef enum {
 	AUDIO_DRIVER_NONE,
 	AUDIO_DRIVER_OSSLIKE,


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- em8300-kmod.spec	3 Mar 2007 22:44:09 -0000	1.20
+++ em8300-kmod.spec	19 Mar 2007 18:06:47 -0000	1.21
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.20-1.2962.fc7}
+%{!?kversion: %define kversion 2.6.20-1.2997.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -31,18 +31,17 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.1
-Release:        6.%(echo %{kverrel} | tr - _)
+Release:        7.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
-Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
-Patch2:         em8300-0.16.1-rc2-2621alsa.patch
+Patch1:         em8300-0.16.1-2621alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch:  i586 i686 x86_64 ppc
+ExclusiveArch:  i586 i686 x86_64 ppc ppc64
 
 %description
 %{summary}.
@@ -53,8 +52,7 @@
 %setup -q -c
 cd %{kmod_name}-%{version}
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
@@ -86,6 +84,12 @@
 
 
 %changelog
+* Mon Mar 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-7
+- Drop OSS default patch, making ALSA the default now; users who need
+  OSS should use the audio_driver=oss option of the em8300 module.
+- Use upstream 2.6.21/ALSA patch.
+- Build for kernel 2.6.20-1.2997.fc7, including ppc64.
+
 * Sun Mar  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-6
 - Re-enable i586 and i686.
 - Build for kernel 2.6.20-1.2962.fc7.


--- em8300-0.16.1-rc2-2621alsa.patch DELETED ---


--- em8300-oss-default.patch DELETED ---