rpms/em8300-kmod/devel em8300-0.16.1-rc2-2621alsa.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 em8300-kmod.spec, 1.17, 1.18 kmodtool, 1.2, 1.3 sources, 1.5, 1.6 em8300-0.16.0-2.6.20.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Feb 25 08:13:27 UTC 2007
- Previous message: rpms/dvdauthor/devel .cvsignore, 1.4, 1.5 dvdauthor.spec, 1.4, 1.5 sources, 1.4, 1.5
- Next message: rpms/em8300/devel .cvsignore, 1.5, 1.6 em8300.spec, 1.8, 1.9 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19976
Modified Files:
.cvsignore em8300-kmod.spec kmodtool sources
Added Files:
em8300-0.16.1-rc2-2621alsa.patch
Removed Files:
em8300-0.16.0-2.6.20.patch
Log Message:
* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-0.5.rc2
- 0.16.1-rc2 + patch for post-2.6.20 ALSA changes.
- Update kmodtool to 0.10.12.
- Build for kernel 2.6.20-1.2942.fc7.
em8300-0.16.1-rc2-2621alsa.patch:
--- NEW FILE em8300-0.16.1-rc2-2621alsa.patch ---
Index: include/linux/em8300.h
===================================================================
RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
retrieving revision 1.42
diff -u -r1.42 em8300.h
--- include/linux/em8300.h 13 Sep 2006 15:28:36 -0000 1.42
+++ include/linux/em8300.h 24 Feb 2007 21:53:09 -0000
@@ -266,7 +277,7 @@
#endif
#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
- snd_card_t *alsa_card;
+ struct snd_card *alsa_card;
#endif
/* Fifos */
Index: modules/em8300_alsa.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_alsa.c,v
retrieving revision 1.8
diff -u -r1.8 em8300_alsa.c
--- modules/em8300_alsa.c 16 Nov 2006 22:57:44 -0000 1.8
+++ modules/em8300_alsa.c 24 Feb 2007 21:53:09 -0000
@@ -58,15 +58,15 @@
snd_pcm_uframes_t appl_ptr; /* Last seen appl_ptr */
} snd_em8300_pcm_indirect_t;
-typedef void (*snd_em8300_pcm_indirect_copy_t)(snd_pcm_substream_t *substream,
+typedef void (*snd_em8300_pcm_indirect_copy_t)(struct snd_pcm_substream *substream,
snd_em8300_pcm_indirect_t *rec, size_t bytes);
typedef struct {
struct em8300_s *em;
- snd_card_t *card;
- snd_pcm_t *pcm_analog;
- snd_pcm_t *pcm_digital;
- snd_pcm_substream_t *substream;
+ struct snd_card *card;
+ struct snd_pcm *pcm_analog;
+ struct snd_pcm *pcm_digital;
+ struct snd_pcm_substream *substream;
struct semaphore lock;
snd_em8300_pcm_indirect_t indirect;
} em8300_alsa_t;
@@ -79,7 +79,7 @@
#define EM8300_BLOCK_SIZE 4096
#define EM8300_MID_BUFFER_SIZE (1024*1024)
-static snd_pcm_hardware_t snd_em8300_playback_hw = {
+static struct snd_pcm_hardware snd_em8300_playback_hw = {
.info = (
SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED |
@@ -99,11 +99,11 @@
.periods_max = EM8300_MID_BUFFER_SIZE / EM8300_BLOCK_SIZE,
};
-static int snd_em8300_playback_open(snd_pcm_substream_t *substream)
+static int snd_em8300_playback_open(struct snd_pcm_substream *substream)
{
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
struct em8300_s *em = em8300_alsa->em;
- snd_pcm_runtime_t *runtime = substream->runtime;
+ struct snd_pcm_runtime *runtime = substream->runtime;
em8300_require_ucode(em);
if (!em->ucodeloaded)
@@ -144,7 +144,7 @@
return 0;
}
-static int snd_em8300_playback_close(snd_pcm_substream_t *substream)
+static int snd_em8300_playback_close(struct snd_pcm_substream *substream)
{
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
@@ -153,23 +153,23 @@
return 0;
}
-static int snd_em8300_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *hw_params)
+static int snd_em8300_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params)
{
// printk("snd_em8300_pcm_hw_params called.\n");
return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
}
-static int snd_em8300_pcm_hw_free(snd_pcm_substream_t *substream)
+static int snd_em8300_pcm_hw_free(struct snd_pcm_substream *substream)
{
// printk("snd_em8300_pcm_hw_free called.\n");
return snd_pcm_lib_free_pages(substream);
}
-static int snd_em8300_pcm_prepare(snd_pcm_substream_t *substream)
+static int snd_em8300_pcm_prepare(struct snd_pcm_substream *substream)
{
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
struct em8300_s *em = em8300_alsa->em;
- snd_pcm_runtime_t *runtime = substream->runtime;
+ struct snd_pcm_runtime *runtime = substream->runtime;
// printk("snd_em8300_pcm_prepare called.\n");
em->clockgen &= ~CLOCKGEN_SAMPFREQ_MASK;
@@ -205,13 +205,13 @@
return 0;
}
-static int snd_em8300_pcm_ack(snd_pcm_substream_t *substream);
+static int snd_em8300_pcm_ack(struct snd_pcm_substream *substream);
-static int snd_em8300_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
+static int snd_em8300_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
{
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
struct em8300_s *em = em8300_alsa->em;
-// snd_pcm_runtime_t *runtime = substream->runtime;
+// struct snd_pcm_runtime *runtime = substream->runtime;
// printk("snd_em8300_pcm_trigger(%d) called.\n", cmd);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
@@ -243,7 +243,7 @@
static inline snd_pcm_uframes_t
-snd_em8300_pcm_indirect_playback_pointer(snd_pcm_substream_t *substream,
+snd_em8300_pcm_indirect_playback_pointer(struct snd_pcm_substream *substream,
snd_em8300_pcm_indirect_t *rec, unsigned int ptr)
{
int bytes = ptr - rec->hw_io;
@@ -259,9 +259,9 @@
return bytes_to_frames(substream->runtime, rec->sw_io);
}
-static snd_pcm_uframes_t snd_em8300_pcm_pointer(snd_pcm_substream_t *substream)
+static snd_pcm_uframes_t snd_em8300_pcm_pointer(struct snd_pcm_substream *substream)
{
-// snd_pcm_runtime_t *runtime = substream->runtime;
+// struct snd_pcm_runtime *runtime = substream->runtime;
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
struct em8300_s *em = em8300_alsa->em;
unsigned int hw_ptr =
@@ -277,11 +277,11 @@
hw_ptr);
}
-static void snd_em8300_pcm_trans_dma(snd_pcm_substream_t *substream,
+static void snd_em8300_pcm_trans_dma(struct snd_pcm_substream *substream,
snd_em8300_pcm_indirect_t *rec,
size_t bytes)
{
-// snd_pcm_runtime_t *runtime = substream->runtime;
+// struct snd_pcm_runtime *runtime = substream->runtime;
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
struct em8300_s *em = em8300_alsa->em;
int writeindex = ((int)read_ucregister(MA_PCIWrPtr) - (ucregister(MA_PCIStart) - 0x1000)) / 3;
@@ -302,11 +302,11 @@
}
static inline void
-snd_em8300_pcm_indirect_playback_transfer(snd_pcm_substream_t *substream,
+snd_em8300_pcm_indirect_playback_transfer(struct snd_pcm_substream *substream,
snd_em8300_pcm_indirect_t *rec,
snd_em8300_pcm_indirect_copy_t copy)
{
- snd_pcm_runtime_t *runtime = substream->runtime;
+ struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_uframes_t appl_ptr = runtime->control->appl_ptr;
snd_pcm_sframes_t diff = appl_ptr - rec->appl_ptr;
int qsize;
@@ -341,7 +341,7 @@
}
}
-static int snd_em8300_pcm_ack(snd_pcm_substream_t *substream) {
+static int snd_em8300_pcm_ack(struct snd_pcm_substream *substream) {
em8300_alsa_t *em8300_alsa = snd_pcm_substream_chip(substream);
// printk("snd_em8300_pcm_ack called.\n");
snd_em8300_pcm_indirect_playback_transfer(substream, &em8300_alsa->indirect,
@@ -349,7 +349,7 @@
return 0;
}
-static snd_pcm_ops_t snd_em8300_playback_ops = {
+static struct snd_pcm_ops snd_em8300_playback_ops = {
.open = snd_em8300_playback_open,
.close = snd_em8300_playback_close,
.ioctl = snd_pcm_lib_ioctl,
@@ -361,7 +361,7 @@
.ack = snd_em8300_pcm_ack,
};
-static void snd_em8300_pcm_analog_free(snd_pcm_t *pcm)
+static void snd_em8300_pcm_analog_free(struct snd_pcm *pcm)
{
em8300_alsa_t *em8300_alsa = (em8300_alsa_t *)(pcm->private_data);
em8300_alsa->pcm_analog = NULL;
@@ -371,7 +371,7 @@
static int snd_em8300_pcm_analog(em8300_alsa_t *em8300_alsa)
{
struct em8300_s *em = em8300_alsa->em;
- snd_pcm_t *pcm;
+ struct snd_pcm *pcm;
int err;
if ((err = snd_pcm_new(em8300_alsa->card, "EM8300/" __stringify(EM8300_ALSA_ANALOG_DEVICENUM), EM8300_ALSA_ANALOG_DEVICENUM, 1, 0, &pcm))<0)
@@ -395,7 +395,7 @@
return 0;
}
-static void snd_em8300_pcm_digital_free(snd_pcm_t *pcm)
+static void snd_em8300_pcm_digital_free(struct snd_pcm *pcm)
{
em8300_alsa_t *em8300_alsa = (em8300_alsa_t *)(pcm->private_data);
em8300_alsa->pcm_digital = NULL;
@@ -405,7 +405,7 @@
static int snd_em8300_pcm_digital(em8300_alsa_t *em8300_alsa)
{
struct em8300_s *em = em8300_alsa->em;
- snd_pcm_t *pcm;
+ struct snd_pcm *pcm;
int err;
if ((err = snd_pcm_new(em8300_alsa->card, "EM8300/" __stringify(EM8300_ALSA_DIGITAL_DEVICENUM), EM8300_ALSA_DIGITAL_DEVICENUM, 1, 0, &pcm))<0)
@@ -435,17 +435,17 @@
return 0;
}
-static int snd_em8300_dev_free(snd_device_t *device)
+static int snd_em8300_dev_free(struct snd_device *device)
{
em8300_alsa_t *em8300_alsa = (em8300_alsa_t *)(device->device_data);
return snd_em8300_free(em8300_alsa);
}
-static int snd_em8300_create(snd_card_t *card, struct em8300_s *em, em8300_alsa_t **rem8300_alsa)
+static int snd_em8300_create(struct snd_card *card, struct em8300_s *em, em8300_alsa_t **rem8300_alsa)
{
em8300_alsa_t *em8300_alsa;
int err;
- static snd_device_ops_t ops = {
+ static struct snd_device_ops ops = {
.dev_free = snd_em8300_dev_free,
};
@@ -476,7 +476,7 @@
static void em8300_alsa_enable_card(struct em8300_s *em)
{
- snd_card_t *card;
+ struct snd_card *card;
em8300_alsa_t *em8300_alsa;
int err;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 18 Dec 2006 22:11:01 -0000 1.5
+++ .cvsignore 25 Feb 2007 08:12:54 -0000 1.6
@@ -1 +1 @@
-em8300-nofirmware-0.16.0.tar.gz
+em8300-nofirmware-0.16.1-rc2.tar.bz2
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- em8300-kmod.spec 6 Feb 2007 18:31:35 -0000 1.17
+++ em8300-kmod.spec 25 Feb 2007 08:12:54 -0000 1.18
@@ -4,13 +4,14 @@
# end stuff to be ...
# hardcode for now:
-%{!?kversion: %define kversion 2.6.20-1.2922.fc7}
+%{!?kversion: %define kversion 2.6.20-1.2942.fc7}
%define kmod_name em8300
%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
%ifarch i686
%define pae PAE
+#define pae PAE PAE-debug
%endif
%ifarch ppc
%define smp smp
@@ -29,16 +30,19 @@
Name: %{kmod_name}-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version: 0.16.0
-Release: 10.%(echo %{kverrel} | tr - _)
+Version: 0.16.1
+Release: 0.5.rc2.%(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
+#Source0: http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+# Source0 from http://dxr3.sourceforge.net/download/em8300-0.16.1-rc2.tar.gz
+# with modules/em8300.uc removed.
+Source0: em8300-nofirmware-0.16.1-rc2.tar.bz2
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.0-2.6.20.patch
+Patch2: em8300-0.16.1-rc2-2621alsa.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i586 i686 x86_64 ppc
@@ -50,13 +54,13 @@
%prep
%setup -q -c
-cd %{kmod_name}-%{version}
+cd %{kmod_name}-%{version}-rc2
%patch0 -p0
%patch1 -p0
-%patch2 -p1
+%patch2 -p0
cd ..
for kvariant in %{kvariants} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
+ cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
done
@@ -85,6 +89,11 @@
%changelog
+* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-0.5.rc2
+- 0.16.1-rc2 + patch for post-2.6.20 ALSA changes.
+- Update kmodtool to 0.10.12.
+- Build for kernel 2.6.20-1.2942.fc7.
+
* Tue Feb 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-10
- Adjust to current Rawhide arch-variant combos (kdump, xen, debug).
Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/kmodtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool 15 Sep 2006 20:18:24 -0000 1.2
+++ kmodtool 25 Feb 2007 08:12:54 -0000 1.3
@@ -1,7 +1,7 @@
#!/bin/bash
# kmodtool - Helper script for building kernel module RPMs
-# Copyright (c) 2003-2006 Ville Skyttä <ville.skytta at iki.fi>,
+# Copyright (c) 2003-2007 Ville Skyttä <ville.skytta at iki.fi>,
# Thorsten Leemhuis <fedora at leemhuis.info>
#
# Permission is hereby granted, free of charge, to any person obtaining
@@ -26,8 +26,8 @@
shopt -s extglob
myprog="kmodtool"
-myver="0.10.11"
-knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
+myver="0.10.12"
+knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
kmod_name=
kver=
verrel=
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 18 Dec 2006 22:11:01 -0000 1.5
+++ sources 25 Feb 2007 08:12:54 -0000 1.6
@@ -1 +1 @@
-61a3405d31e260d9159d189f649e5d48 em8300-nofirmware-0.16.0.tar.gz
+0e965f836a94d7c7fbb1a0d258750ba5 em8300-nofirmware-0.16.1-rc2.tar.bz2
--- em8300-0.16.0-2.6.20.patch DELETED ---
- Previous message: rpms/dvdauthor/devel .cvsignore, 1.4, 1.5 dvdauthor.spec, 1.4, 1.5 sources, 1.4, 1.5
- Next message: rpms/em8300/devel .cvsignore, 1.5, 1.6 em8300.spec, 1.8, 1.9 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list