rpms/em8300-kmod/devel .cvsignore, 1.7, 1.8 em8300-adv7170-wss.patch, 1.2, 1.3 em8300-kmod.spec, 1.21, 1.22 kmodtool, 1.3, 1.4 sources, 1.7, 1.8 em8300-0.16.1-2621alsa.patch, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Wed Apr 4 12:37:02 UTC 2007


Author: scop

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

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300-kmod.spec kmodtool 
	sources 
Removed Files:
	em8300-0.16.1-2621alsa.patch 
Log Message:
* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> 0.16.2-0.1.rc1
- 0.16.2-rc1, build for kernel 2.6.20-1.3040.fc7.
- Update kmodtool to 0.10.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Mar 2007 16:52:20 -0000	1.7
+++ .cvsignore	4 Apr 2007 12:36:29 -0000	1.8
@@ -1 +1 @@
-em8300-nofirmware-0.16.1.tar.gz
+em8300-nofirmware-0.16.2-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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- em8300-adv7170-wss.patch	15 Sep 2006 20:18:24 -0000	1.2
+++ em8300-adv7170-wss.patch	4 Apr 2007 12:36:29 -0000	1.3
@@ -1,13 +1,8 @@
 http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply as of 0.16.0-rc1.
+Updated to apply as of 0.16.2-rc1.
 
-Index: em8300setup/em8300setup.c
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.c,v
-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	15 Sep 2006 18:15:00 -0000
+--- em8300setup/em8300setup.c~	2005-10-20 01:15:16.000000000 +0300
++++ em8300setup/em8300setup.c	2007-04-04 03:07:38.000000000 +0300
 @@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -76,13 +71,8 @@
  		if(audio!=-1) {
  			printf("Setting audio = %i\n",audio);
  			if(ioctl(DEV, EM8300_IOCTL_SET_AUDIOMODE, &audio) == -1) 
-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	15 Sep 2006 18:15:01 -0000
+--- include/linux/em8300.h~	2007-03-17 00:08:39.000000000 +0200
++++ include/linux/em8300.h	2007-04-04 03:07:40.000000000 +0300
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +98,7 @@
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -465,6 +476,7 @@
+@@ -486,6 +497,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);
@@ -116,14 +106,9 @@
  int em8300_ioctl_getstatus(struct em8300_s *em, char *usermsg);
  int em8300_ioctl_init(struct em8300_s *em, em8300_microcode_t *useruc);
  void em8300_ioctl_enable_videoout(struct em8300_s *em, int mode);
-Index: modules/adv717x.c
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-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	15 Sep 2006 18:15:01 -0000
-@@ -219,6 +219,7 @@
+--- modules/adv717x.c~	2007-03-09 01:48:00.000000000 +0200
++++ modules/adv717x.c	2007-04-04 03:07:34.000000000 +0300
+@@ -218,6 +218,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
  	int pd_adj_ntsc;
@@ -131,7 +116,7 @@
  
  	unsigned char config[32];
  	int configlen;
-@@ -431,6 +432,63 @@
+@@ -430,6 +431,63 @@
  		/* ADV7170/1 RGB sync: MR42 (register 4, bit 2) */
  		SET_REG(tmpconfig[ADV7170_REG_MR4], 2,
  				mode_info[data->out_mode].conf.sync_all);
@@ -195,7 +180,7 @@
  		break;
  	}
  	/* ADV7170/1/5A/6A non-interlace: MR10 (register 1, bit 0) */
-@@ -592,6 +650,7 @@
+@@ -591,6 +649,7 @@
  	data->out_mode = output_mode_nr[em->card_nr];
  	if (data->out_mode < 0 || data->out_mode >= MODE_MAX)
  		data->out_mode = 0;
@@ -203,7 +188,7 @@
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -697,6 +756,42 @@
+@@ -696,6 +755,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -243,17 +228,12 @@
 +		data->wsscode = 0; 
 +		adv717x_update(client);
 +		break;
- 	default:
- 		return -EINVAL;
- 		break;
-Index: modules/em8300_ioctl.c
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-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 @@
+ 	case ENCODER_CMD_GETCONFIG:
+ 	{
+ 		struct em8300_s *em = i2c_get_adapdata(client->adapter);
+--- modules/em8300_ioctl.c~	2007-03-03 12:13:25.000000000 +0200
++++ modules/em8300_ioctl.c	2007-04-04 03:07:33.000000000 +0300
+@@ -174,6 +174,20 @@
  		}
  		break;
  
@@ -274,7 +254,7 @@
  	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
  		em8300_require_ucode(em);
  
-@@ -617,6 +631,52 @@
+@@ -611,6 +625,52 @@
  	return 0;
  }
  
@@ -327,13 +307,8 @@
  int em8300_ioctl_setplaymode(struct em8300_s *em, int mode)
  {
  	switch (mode) {
-Index: modules/encoder.h
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/modules/encoder.h,v
-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	15 Sep 2006 18:15:01 -0000
+--- modules/encoder.h~	2007-03-09 01:48:00.000000000 +0200
++++ modules/encoder.h	2007-04-04 03:07:41.000000000 +0300
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -347,16 +322,11 @@
 +#define ENCODER_CMD_WSS_14_9               9
 +#define ENCODER_CMD_WSS_16_9               10
 +#define ENCODER_CMD_WSS_OFF                11
+ #define ENCODER_CMD_GETCONFIG    0xDEADBEEF
  
  #endif
- 
-Index: em8300setup/em8300setup.1
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.1,v
-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	15 Sep 2006 18:15:00 -0000
+--- em8300setup/em8300setup.1~	2005-10-20 01:15:16.000000000 +0300
++++ em8300setup/em8300setup.1	2007-04-04 03:07:30.000000000 +0300
 @@ -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- em8300-kmod.spec	19 Mar 2007 18:06:47 -0000	1.21
+++ em8300-kmod.spec	4 Apr 2007 12:36:29 -0000	1.22
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.20-1.2997.fc7}
+%{!?kversion: %define kversion 2.6.20-1.3040.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -30,15 +30,17 @@
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version:        0.16.1
-Release:        7.%(echo %{kverrel} | tr - _)
+Version:        0.16.2
+Release:        0.%(echo %{kverrel} | tr - _).1.rc1
 
 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
+# http://dxr3.sourceforge.net/download/em8300-0.16.2-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0:        em8300-nofirmware-%{version}-rc1.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
-Patch1:         em8300-0.16.1-2621alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  i586 i686 x86_64 ppc ppc64
@@ -50,12 +52,11 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}
+cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
-%patch1 -p1
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
 done
 
 
@@ -84,6 +85,10 @@
 
 
 %changelog
+* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> 0.16.2-0.1.rc1
+- 0.16.2-rc1, build for kernel 2.6.20-1.3040.fc7.
+- Update kmodtool to 0.10.13.
+
 * 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.


Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	25 Feb 2007 08:12:54 -0000	1.3
+++ kmodtool	4 Apr 2007 12:36:29 -0000	1.4
@@ -26,8 +26,8 @@
 shopt -s extglob
 
 myprog="kmodtool"
-myver="0.10.12"
-knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
+myver="0.10.13"
+knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp?(-debug)|uml|xen?([0U])?(-PAE))
 kmod_name=
 kver=
 verrel=


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Mar 2007 16:52:20 -0000	1.7
+++ sources	4 Apr 2007 12:36:29 -0000	1.8
@@ -1 +1 @@
-c1e2db38fa3e3cf28b43dd304aaa2961  em8300-nofirmware-0.16.1.tar.gz
+5ab0fcaa8e4a6bef68ac7f041155e293  em8300-nofirmware-0.16.2-rc1.tar.bz2


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




More information about the fedora-extras-commits mailing list