rpms/s3switch/devel Makefile, 1.3, 1.4 s3switch-lrmi.patch, 1.2, 1.3 s3switch-thinkpad-t23.patch, 1.3, 1.4 s3switch-virgegx2.patch, 1.2, 1.3 s3switch.consoleapp, 1.2, 1.3 s3switch.spec, 1.9, 1.10 sources, 1.4, 1.5 dead.package, 1.1, NONE
Paul Wouters (pwouters)
fedora-extras-commits at redhat.com
Mon Aug 7 20:29:10 UTC 2006
Author: pwouters
Update of /cvs/extras/rpms/s3switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21376
Added Files:
Makefile s3switch-lrmi.patch s3switch-thinkpad-t23.patch
s3switch-virgegx2.patch s3switch.consoleapp s3switch.spec
sources
Removed Files:
dead.package
Log Message:
re-instated s3switch package for devel.
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 7 Aug 2006 20:29:10 -0000 1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: s3switch
+# $Id$
+NAME := s3switch
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
s3switch-lrmi.patch:
Index: s3switch-lrmi.patch
===================================================================
RCS file: s3switch-lrmi.patch
diff -N s3switch-lrmi.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ s3switch-lrmi.patch 7 Aug 2006 20:29:10 -0000 1.3
@@ -0,0 +1,10 @@
+--- Makefile.orig 2002-09-12 01:26:57.000000000 +0300
++++ Makefile 2004-07-23 12:43:44.000000000 +0300
+@@ -1,5 +1,6 @@
+ CC = gcc -g
++LDFLAGS = -llrmi
+
+ all: s3switch
+
+-s3switch: s3switch.o lrmi.o
++s3switch: s3switch.o
s3switch-thinkpad-t23.patch:
Index: s3switch-thinkpad-t23.patch
===================================================================
RCS file: s3switch-thinkpad-t23.patch
diff -N s3switch-thinkpad-t23.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ s3switch-thinkpad-t23.patch 7 Aug 2006 20:29:10 -0000 1.4
@@ -0,0 +1,14 @@
+Fix segfaults seen on IBM ThinkPad T23 when changing TV signal format.
+Thanks to the upstream author, Tim Roberts, for help in creating this patch.
+
+--- s3switch.c.orig 2002-09-12 01:25:33.000000000 +0300
++++ s3switch.c 2004-07-22 13:28:32.000000000 +0300
+@@ -100,4 +100,8 @@
+ ioperm( 0x40, 4, enable );
++ ioperm( 0x4f, 1, enable );
+ ioperm( 0x61, 1, enable );
++ ioperm( 0x70, 1, enable );
++ ioperm( 0x71, 1, enable );
+ ioperm( 0x80, 1, enable );
++ ioperm( 0xb2, 1, enable );
+ ioperm( 0x3b0, 0x30, enable );
s3switch-virgegx2.patch:
Index: s3switch-virgegx2.patch
===================================================================
RCS file: s3switch-virgegx2.patch
diff -N s3switch-virgegx2.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ s3switch-virgegx2.patch 7 Aug 2006 20:29:10 -0000 1.3
@@ -0,0 +1,51 @@
+Extracted from s3switch.tar.bz2 contained in the GeeXboX 0.97 source tarball
+from http://www.geexbox.org/releases/0.97/geexbox-0.97-full.tar
+
+--- s3switch.c.orig 2002-09-12 01:25:33.000000000 +0300
++++ s3switch.c 2004-01-12 23:03:06.000000000 +0200
+@@ -3,4 +3,7 @@
+
+ // Linux x86 only.
++// Modified by mADAR
++// added S3 Virge/GX2 support
++
+
+ #include <stdio.h>
+@@ -16,4 +19,5 @@
+ // Define the Savage chip classes. PCI id's stolen from xf86PciInfo.h
+
++#define PCI_CHIP_VIRGEGX2 0x8A10
+ #define PCI_CHIP_SAVAGE3D 0x8A20
+ #define PCI_CHIP_SAVAGE3D_MV 0x8A21
+@@ -41,4 +45,5 @@
+
+ enum {
++ S3_VIRGEGX2,
+ S3_SAVAGE3D,
+ S3_SAVAGE4,
+@@ -116,4 +121,7 @@
+
+ switch( gPCIid ) {
++ case PCI_CHIP_VIRGEGX2:
++ ChipClass = S3_VIRGEGX2;
++ break;
+ case PCI_CHIP_SAVAGE3D:
+ case PCI_CHIP_SAVAGE3D_MV:
+@@ -152,5 +160,5 @@
+ break;
+ default:
+- printf( "PCI id is not a recognized Savage: %04x\n", gPCIid );
++ printf( "PCI id is not a recognized Savage or Virge GX2: %04x\n", gPCIid );
+ exit(-1);
+ }
+@@ -181,4 +189,10 @@
+ switch( ChipClass )
+ {
++ case S3_VIRGEGX2:
++ jDevices = (jDevices & 0x0f)
++ | CRT_ATTACHED
++ | TV_ATTACHED;
++ break;
++
+ case S3_SAVAGE3D:
+ jDevices = (jDevices & 0x0f)
Index: s3switch.consoleapp
===================================================================
RCS file: s3switch.consoleapp
diff -N s3switch.consoleapp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ s3switch.consoleapp 7 Aug 2006 20:29:10 -0000 1.3
@@ -0,0 +1,2 @@
+USER=root
+PROGRAM=/usr/sbin/s3switch
Index: s3switch.spec
===================================================================
RCS file: s3switch.spec
diff -N s3switch.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ s3switch.spec 7 Aug 2006 20:29:10 -0000 1.10
@@ -0,0 +1,95 @@
+Name: s3switch
+Version: 0.0
+Release: 7.20020912%{?dist}
+Summary: Manage the output device on S3 Savage chips
+
+Group: Applications/System
+License: BSD-like
+URL: http://www.probo.com/timr/savage40.html
+Source0: http://www.probo.com/timr/s3ssrc.zip
+Source1: %{name}.pam
+Source2: %{name}.consoleapp
+Patch0: http://ftp.debian.org/debian/pool/main/s/s3switch/s3switch_0.0.20030423-2.diff.gz
+Patch1: %{name}-thinkpad-t23.patch
+Patch2: %{name}-virgegx2.patch
+Patch3: %{name}-lrmi.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch: %{ix86}
+BuildRequires: lrmi-devel
+Requires: %{_bindir}/consolehelper
+
+%description
+The S3 Savage chips have the ability to send their output to a variety
+of different devices. The Savage3D can display to a standard CRT or
+to a TV. The Savage4 and Savage2000 can display to a standard CRT or
+through a digital interface to an LCD panel. The Savage/MX and Sav-
+age/IX can ship to any two of those three.
+The s3switch utility is used to select the devices to be used, and the
+format of the TV signal. When invoked with no parameters, s3switch
+displays the devices currently attached, and which of those devices
+are currently active. Supplying one or more of the words crt, lcd, or
+tv makes those devices the active devices. The word both is a
+shortcut for the combination of crt and lcd.
+
+
+%prep
+%setup -q -c
+%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+rm -f lrmi.*
+
+
+%build
+make %{?_smp_mflags} CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -Dpm 755 s3switch $RPM_BUILD_ROOT%{_sbindir}/s3switch
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/s3switch
+install -Dpm 644 s3switch.1x $RPM_BUILD_ROOT%{_mandir}/man8/s3switch.8
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/s3switch
+install -Dpm 644 %{SOURCE2} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/s3switch
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc copyright
+%config(noreplace) %{_sysconfdir}/pam.d/s3switch
+%config(noreplace) %{_sysconfdir}/security/console.apps/s3switch
+%{_bindir}/s3switch
+%{_sbindir}/s3switch
+%{_mandir}/man8/s3switch.8*
+
+
+%changelog
+* Sun Mar 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0-7.20020912
+- Rebuild.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.0-6.20020912
+- rebuilt
+
+* Fri Jul 23 2004 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.5.20020912
+- Use shared LRMI.
+
+* Thu Jul 22 2004 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.4.20020912
+- Apply patch from Debian for ProSavageDDR support and other cosmetic fixes.
+- Apply patch from GeeXboX 0.97 for ViRGE/GX2 support.
+
+* Wed Jul 30 2003 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20020912
+- Apply patch to avoid segfault on TV signal format change with ThinkPad T23.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20020912
+- Use consolehelper instead of installing suid root.
+
+* Sun Jul 27 2003 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20020912
+- First build.
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 7 Aug 2006 20:29:10 -0000 1.5
@@ -0,0 +1,2 @@
+1328b070343ac79c5ed4c613a1113754 s3ssrc.zip
+459e6c8efc86d75d66250c3cd4a47672 s3switch_0.0.20030423-2.diff.gz
--- dead.package DELETED ---
More information about the fedora-extras-commits
mailing list