[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/em8300-kmod/FC-6 em8300-kmod-0.16.2-oss-default.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 em8300-adv7170-wss.patch, 1.2, 1.3 em8300-kmod.spec, 1.25, 1.26 sources, 1.6, 1.7 em8300-oss-default.patch, 1.1, NONE



Author: scop

Update of /cvs/extras/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21878

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300-kmod.spec sources 
Added Files:
	em8300-kmod-0.16.2-oss-default.patch 
Removed Files:
	em8300-oss-default.patch 
Log Message:
* Mon May  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.2-1
- 0.16.2.


em8300-kmod-0.16.2-oss-default.patch:

--- NEW FILE em8300-kmod-0.16.2-oss-default.patch ---
--- em8300-0.16.2/modules/em8300_params.c~	2007-03-09 01:48:00.000000000 +0200
+++ em8300-0.16.2/modules/em8300_params.c	2007-05-07 09:20:51.000000000 +0300
@@ -111,10 +111,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/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Mar 2007 16:43:23 -0000	1.6
+++ .cvsignore	7 May 2007 22:17:29 -0000	1.7
@@ -1 +1 @@
-em8300-nofirmware-0.16.1.tar.gz
+em8300-nofirmware-0.16.2.tar.gz

em8300-adv7170-wss.patch:

Index: em8300-adv7170-wss.patch
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/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	7 May 2007 22:17: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/FC-6/em8300-kmod.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- em8300-kmod.spec	1 May 2007 18:47:50 -0000	1.25
+++ em8300-kmod.spec	7 May 2007 22:17:29 -0000	1.26
@@ -17,25 +17,25 @@
 %endif
 %ifarch i686 x86_64
 %define xen xen
-%define dbg debug
+%define debug debug
 %endif
 %ifarch i686 x86_64 ppc64 ppc64iseries
 %define kdump kdump
 %endif
-%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump} %{?dbg}}
+%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump} %{?debug}}
 
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version:        0.16.1
-Release:        3.%(echo %{kverrel} | tr - _)
+Version:        0.16.2
+Release:        1.%(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
+Patch1:         %{name}-0.16.2-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  i586 i686 x86_64 ppc
@@ -49,7 +49,7 @@
 %setup -q -c
 cd %{kmod_name}-%{version}
 %patch0 -p0
-%patch1 -p0
+%patch1 -p1
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon May  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.2-1
+- 0.16.2.
+
 * Tue May  1 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.20-1.2948.fc6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2007 16:43:23 -0000	1.6
+++ sources	7 May 2007 22:17:29 -0000	1.7
@@ -1 +1 @@
-c1e2db38fa3e3cf28b43dd304aaa2961  em8300-nofirmware-0.16.1.tar.gz
+10d38c886280f9e9e2559b6c02922496  em8300-nofirmware-0.16.2.tar.gz


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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]