rpms/em8300/devel em8300.console.perms, NONE, 1.1 .cvsignore, 1.2, 1.3 em8300-adv7170-wss.patch, 1.1, 1.2 em8300.spec, 1.1, 1.2 sources, 1.2, 1.3 em8300-README-console.perms, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Fri Sep 15 20:16:59 UTC 2006 

Author: scop

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

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300.spec sources 
Added Files:
	em8300.console.perms 
Removed Files:
	em8300-README-console.perms 
Log Message:
* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
- 0.16.0-rc1.
- Add console.perms snippet, commented out for now due to #206700.



--- NEW FILE em8300.console.perms ---
#<em8300>=/dev/em8300*
#<console>  0660 <em8300>     0660 root.video


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 20:14:05 -0000	1.2
+++ .cvsignore	15 Sep 2006 20:16:59 -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/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:14:05 -0000	1.1
+++ em8300-adv7170-wss.patch	15 Sep 2006 20:16:59 -0000	1.2
@@ -1,5 +1,5 @@
 http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply cleanly as of 0.15.2rc1.
+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	5 Nov 2005 08:32:24 -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.39
-diff -u -r1.39 em8300.h
---- include/linux/em8300.h	19 Oct 2005 22:15:16 -0000	1.39
-+++ include/linux/em8300.h	5 Nov 2005 08:32:24 -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
-@@ -455,6 +466,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);
@@ -119,11 +119,11 @@
 Index: modules/adv717x.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-retrieving revision 1.49
-diff -u -r1.49 adv717x.c
---- modules/adv717x.c	5 Nov 2005 01:12:13 -0000	1.49
-+++ modules/adv717x.c	5 Nov 2005 08:32:25 -0000
-@@ -192,6 +192,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	15 Sep 2006 18:15:01 -0000
+@@ -219,6 +219,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
  	int pd_adj_ntsc;
@@ -131,10 +131,10 @@
  
  	unsigned char config[32];
  	int configlen;
-@@ -398,6 +399,63 @@
+@@ -431,6 +432,63 @@
  		/* ADV7170/1 RGB sync: MR42 (register 4, bit 2) */
  		SET_REG(tmpconfig[ADV7170_REG_MR4], 2,
- 				ModeInfo[data->out_mode].sync_all);
+ 				mode_info[data->out_mode].conf.sync_all);
 +
 +		switch (data->wsscode) {
 +		case 0x08:
@@ -195,7 +195,7 @@
  		break;
  	}
  	/* ADV7170/1/5A/6A non-interlace: MR10 (register 1, bit 0) */
-@@ -559,6 +617,7 @@
+@@ -592,6 +650,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 +203,7 @@
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -664,6 +723,42 @@
+@@ -697,6 +756,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -249,11 +249,11 @@
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.49
-diff -u -r1.49 em8300_ioctl.c
---- modules/em8300_ioctl.c	19 Oct 2005 22:15:16 -0000	1.49
-+++ modules/em8300_ioctl.c	5 Nov 2005 08:32:25 -0000
-@@ -204,6 +204,20 @@
+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;
  
@@ -271,10 +271,10 @@
 +
 +		break;
 +
- 	case _IOC_NR(EM8300_IOCTL_GET_AUDIOMODE):
+ 	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
  		em8300_require_ucode(em);
  
-@@ -590,6 +604,52 @@
+@@ -617,6 +631,52 @@
  	return 0;
  }
  
@@ -333,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	5 Nov 2005 08:32:25 -0000
++++ modules/encoder.h	15 Sep 2006 18:15:01 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -356,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	5 Nov 2005 08:32:24 -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.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300.spec	22 Jul 2006 20:14:05 -0000	1.1
+++ em8300.spec	15 Sep 2006 20:16:59 -0000	1.2
@@ -1,13 +1,16 @@
 Name:           em8300
-Version:        0.15.3
-Release:        4%{?dist}
+Version:        0.16.0
+Release:        0.1.rc1%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-Source0:        http://download.sourceforge.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
-Source1:        http://cachalot.mine.nu/src/dxr3/em8300-README-console.perms
+#Source0:        http://dl.sf.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0:        %{name}-nofirmware-%{version}-rc1.tar.bz2
+Source1:        %{name}.console.perms
 Source2:        http://cachalot.mine.nu/src/dxr3/em8300-README-modprobe.conf
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +19,7 @@
 BuildRequires:  desktop-file-utils
 Requires:       em8300-kmod >= %{version}
 Requires:       udev
+Requires:       %{_sysconfdir}/security/console.perms.d
 Requires(pre):  %{_sbindir}/groupadd
 Provides:       em8300-kmod-common = %{version}-%{release}
 
@@ -41,12 +45,10 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0
-install -pm 644 %{SOURCE1} README-console.perms
 install -pm 644 %{SOURCE2} README-modprobe.conf
 echo "Icon=redhat-sound_video" >> overlay/dxr3view.desktop
-sed -i -e 's/^install-data-am:.*/install-data-am:/' Makefile.*
 sed -i -e 's/microcode_extract.pl/em8300-mc_ex/' scripts/microcode_extract.pl
 
 
@@ -74,6 +76,9 @@
 install -Dpm 644 modules/em8300-udev.rules \
   $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-%{name}.rules
 
+install -Dpm 644 %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-%{name}.perms
+
 # Already done by the modules and em8300setup:
 rm -f $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_upload.pl
 
@@ -98,6 +103,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* modules/README-modoptions
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
 %{_bindir}/em8300setup
 %{_mandir}/man1/em8300setup.1*
@@ -119,6 +125,10 @@
 
 
 %changelog
+* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
+- 0.16.0-rc1.
+- Add console.perms snippet, commented out for now due to #206700.
+
 * Tue Jul 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.3-4
 - Require >= em8300-kmod, not = kmod-em8300 (#189400).
 - Move microcode extractor to -utils as em8300-mc_ex (like Debian) (#189400).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 20:14:05 -0000	1.2
+++ sources	15 Sep 2006 20:16:59 -0000	1.3
@@ -1 +1 @@
-7e19428a267f645e7d9023f4d2c24a2c  em8300-nofirmware-0.15.3.tar.gz
+969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2


--- em8300-README-console.perms DELETED ---

More information about the scm-commits mailing list