rpms/em8300-kmod/devel em8300-oss-default.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 em8300-adv7170-wss.patch, 1.1, 1.2 em8300-kmod.spec, 1.2, 1.3 kmodtool, 1.1, 1.2 sources, 1.2, 1.3 em8300-kmod-2617.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Fri Sep 15 20:18:24 UTC 2006
- Previous message (by thread): rpms/tin/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tin.spec, 1.11, 1.12 needs.rebuild, 1.1, NONE
- Next message (by thread): owners owners.list,1.1615,1.1616
- 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-serv25461
Modified Files:
.cvsignore em8300-adv7170-wss.patch em8300-kmod.spec kmodtool
sources
Added Files:
em8300-oss-default.patch
Removed Files:
em8300-kmod-2617.patch
Log Message:
* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
- 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
- Patch to default to OSS for backwards compatibility.
- Adjust to FC6 kernel variants, build for 2.6.17-1.2647.fc6.
- Update kmodtool to 0.10.11.
- Drop early FC5 hacks.
em8300-oss-default.patch:
--- NEW FILE em8300-oss-default.patch ---
Default to OSS in 0.16.0-rc1 for backwards compatibility.
Index: modules/em8300_main.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_main.c,v
retrieving revision 1.116
diff -u -r1.116 em8300_main.c
--- modules/em8300_main.c 13 Sep 2006 15:34:37 -0000 1.116
+++ modules/em8300_main.c 15 Sep 2006 18:27:58 -0000
@@ -180,10 +180,10 @@
[ AUDIO_DRIVER_ALSA ] = "alsa",
};
-#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
-audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_ALSA };
-#elif defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_OSS };
+#elif defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
+audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_ALSA };
#else
audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_OSSLIKE };
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Jul 2006 20:16:26 -0000 1.2
+++ .cvsignore 15 Sep 2006 20:18:24 -0000 1.3
@@ -1 +1 @@
-em8300-nofirmware-0.15.3.tar.gz
+em8300-nofirmware-0.16.0-rc1.tar.bz2
em8300-adv7170-wss.patch:
Index: em8300-adv7170-wss.patch
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-adv7170-wss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300-adv7170-wss.patch 22 Jul 2006 20:16:26 -0000 1.1
+++ em8300-adv7170-wss.patch 15 Sep 2006 20:18:24 -0000 1.2
@@ -1,5 +1,5 @@
http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply as of 0.15.3+cvs20060626.
+Updated to apply as of 0.16.0-rc1.
Index: em8300setup/em8300setup.c
===================================================================
@@ -7,7 +7,7 @@
retrieving revision 1.5
diff -u -r1.5 em8300setup.c
--- em8300setup/em8300setup.c 19 Oct 2005 22:15:16 -0000 1.5
-+++ em8300setup/em8300setup.c 26 Jun 2006 13:44:47 -0000
++++ em8300setup/em8300setup.c 15 Sep 2006 18:15:00 -0000
@@ -114,7 +114,7 @@
char ucode_file[200]; // bad hardcoded value ;-)
@@ -79,10 +79,10 @@
Index: include/linux/em8300.h
===================================================================
RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.41
-diff -u -r1.41 em8300.h
---- include/linux/em8300.h 10 Apr 2006 22:31:14 -0000 1.41
-+++ include/linux/em8300.h 26 Jun 2006 13:44:48 -0000
+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 15 Sep 2006 18:15:01 -0000
@@ -80,6 +80,7 @@
#define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
#define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +108,7 @@
#define EM8300_VIDEOMODE_PAL 0
#define EM8300_VIDEOMODE_PAL60 1
#define EM8300_VIDEOMODE_NTSC 2
-@@ -467,6 +478,7 @@
+@@ -465,6 +476,7 @@
int em8300_control_ioctl(struct em8300_s *em, int cmd, unsigned long arg);
int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
@@ -122,7 +122,7 @@
retrieving revision 1.53
diff -u -r1.53 adv717x.c
--- modules/adv717x.c 12 May 2006 22:04:56 -0000 1.53
-+++ modules/adv717x.c 26 Jun 2006 13:44:48 -0000
++++ modules/adv717x.c 15 Sep 2006 18:15:01 -0000
@@ -219,6 +219,7 @@
int pp_ntsc;
int pd_adj_pal;
@@ -249,14 +249,14 @@
Index: modules/em8300_ioctl.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.50
-diff -u -r1.50 em8300_ioctl.c
---- modules/em8300_ioctl.c 10 Apr 2006 22:31:14 -0000 1.50
-+++ modules/em8300_ioctl.c 26 Jun 2006 13:44:48 -0000
-@@ -203,4 +203,17 @@
- return -EFAULT;
+retrieving revision 1.51
+diff -u -r1.51 em8300_ioctl.c
+--- modules/em8300_ioctl.c 13 Sep 2006 15:28:37 -0000 1.51
++++ modules/em8300_ioctl.c 15 Sep 2006 18:15:01 -0000
+@@ -183,6 +183,20 @@
}
break;
+
+ case _IOC_NR(EM8300_IOCTL_SET_WSS):
+ em8300_require_ucode(em);
+
@@ -270,8 +270,11 @@
+ }
+
+ break;
++
+ case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
+ em8300_require_ucode(em);
-@@ -604,6 +619,52 @@
+@@ -617,6 +631,52 @@
return 0;
}
@@ -330,7 +333,7 @@
retrieving revision 1.8
diff -u -r1.8 encoder.h
--- modules/encoder.h 14 Jan 2002 21:41:31 -0000 1.8
-+++ modules/encoder.h 26 Jun 2006 13:44:48 -0000
++++ modules/encoder.h 15 Sep 2006 18:15:01 -0000
@@ -13,6 +13,15 @@
#define ENCODER_CMD_SETMODE 1
@@ -353,7 +356,7 @@
retrieving revision 1.3
diff -u -r1.3 em8300setup.1
--- em8300setup/em8300setup.1 19 Oct 2005 22:15:16 -0000 1.3
-+++ em8300setup/em8300setup.1 26 Jun 2006 13:44:47 -0000
++++ em8300setup/em8300setup.1 15 Sep 2006 18:15:00 -0000
@@ -26,6 +26,33 @@
\fB-o\fR, \fB-w\fR
Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- em8300-kmod.spec 22 Jul 2006 20:20:34 -0000 1.2
+++ em8300-kmod.spec 15 Sep 2006 20:18:24 -0000 1.3
@@ -4,37 +4,42 @@
# end stuff to be ...
# hardcode for now:
-%{!?kversion: %define kversion 2.6.17-1.2157_FC5}
+%{!?kversion: %define kversion 2.6.17-1.2647.fc6}
%define kmod_name em8300
%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
-%define upvar ""
-%ifarch i686 ppc
-%define smpvar smp
+%ifarch i686
+%define pae PAE
%endif
-%ifarch i686 x86_64
-%define xenvar xen0
-%define kdumpvar kdump
+%ifarch ppc
+%define smp smp
%endif
-%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
+%ifarch i686 x86_64 ia64
+%define xen xen
+%endif
+%ifarch i686 x86_64 ppc64 ppc64iseries
+%define kdump kdump
+%endif
+%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}}
Name: %{kmod_name}-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version: 0.15.3
-Release: 6.%(echo %{kverrel} | tr - _)
+Version: 0.16.0
+Release: 0.1.rc1.%(echo %{kverrel} | tr - _)
Group: System Environment/Kernel
License: GPL
URL: http://dxr3.sourceforge.net/
-Source0: http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+#Source0: http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0: %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
Patch0: http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
-Patch1: %{name}-2617.patch
+Patch1: http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: sed >= 3.95
-
ExclusiveArch: i586 i686 x86_64 ppc
%description
@@ -44,13 +49,12 @@
%prep
%setup -q -c
-cd %{kmod_name}-%{version}
-%patch1 -p1
+cd %{kmod_name}-%{version}-rc1
%patch0 -p0
-sed -i -e s/2,6,16/2,6,15/ modules/*.c # FC5 pre-2.6.16 marked as 2.6.15 hack
+%patch1 -p0
cd ..
for kvariant in %{kvariants} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
+ cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
done
@@ -61,7 +65,7 @@
make %{?_smp_mflags} V=1 KERNEL_LOCATION=$ks && \
cd ../..
done
-
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -77,6 +81,13 @@
%changelog
+* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
+- 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
+- Patch to default to OSS for backwards compatibility.
+- Adjust to FC6 kernel variants, build for 2.6.17-1.2647.fc6.
+- Update kmodtool to 0.10.11.
+- Drop early FC5 hacks.
+
* Tue Jul 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.3-6
- Enable PPC SMP builds (#189400).
- Use firmwareless tarball (#189400).
Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool 22 Jul 2006 20:16:26 -0000 1.1
+++ kmodtool 15 Sep 2006 20:18:24 -0000 1.2
@@ -23,9 +23,11 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+shopt -s extglob
+
myprog="kmodtool"
-myver="0.10.9"
-knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
+myver="0.10.11"
+knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
kmod_name=
kver=
verrel=
@@ -33,24 +35,27 @@
get_verrel ()
{
- verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
+ verrel=${1:-$(uname -r)}
+ verrel=${verrel%%$knownvariants}
}
print_verrel ()
{
- get_verrel $@ || return $?
+ get_verrel $@
echo "${verrel}"
}
get_variant ()
{
- variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
- [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
+ get_verrel $@
+ variant=${1:-$(uname -r)}
+ variant=${variant##$verrel}
+ variant=${variant:-'""'}
}
print_variant ()
{
- get_variant $@ || return $?
+ get_variant $@
echo "${variant}"
}
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jul 2006 20:16:26 -0000 1.2
+++ sources 15 Sep 2006 20:18:24 -0000 1.3
@@ -1 +1 @@
-7e19428a267f645e7d9023f4d2c24a2c em8300-nofirmware-0.15.3.tar.gz
+969ba9fd1aebea7ef6549ebdb0f5ef4d em8300-nofirmware-0.16.0-rc1.tar.bz2
--- em8300-kmod-2617.patch DELETED ---
- Previous message (by thread): rpms/tin/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tin.spec, 1.11, 1.12 needs.rebuild, 1.1, NONE
- Next message (by thread): owners owners.list,1.1615,1.1616
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list