Attachment 78502 Details for Bug 112922 – file.diff

[patch] file.diff

file.diff (text/plain), 6.99 KB, created by Yarema on 2007-05-24 03:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarema

Created: 2007-05-24 03:20:03 UTC

Size: 6.99 KB

patch

obsolete

>diff -u -ruN 915resolution-0.5.2/Makefile 915resolution/Makefile
>--- 915resolution-0.5.2/Makefile	Mon Nov  6 04:19:23 2006
>+++ 915resolution/Makefile	Wed May 23 20:26:38 2007
>@@ -5,8 +5,8 @@
> # $FreeBSD: ports/sysutils/915resolution/Makefile,v 1.5 2006/11/05 09:57:49 lawrance Exp $
> 
> PORTNAME=	915resolution
>-PORTVERSION=	0.5.2
>-PORTREVISION=	1
>+PORTVERSION=	0.5.3
>+PORTREVISION=	0
> PORTEPOCH=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.geocities.com/stomljen/ \
>@@ -16,8 +16,11 @@
> MAINTAINER=	MrL0Lz@gmail.com
> COMMENT=	Resolution tool for Intel i915 video cards
> 
>-PLIST_FILES=	bin/915resolution
>+USE_RC_SUBR=	915resolution.sh
>+
> ALL_TARGET=	915resolution
>+PLIST_FILES=	sbin/915resolution
>+PORTDOCS=	README.txt chipset_info.txt
> 
> ONLY_FOR_ARCHS=	i386
> 
>@@ -32,6 +35,12 @@
> 		${CC} ${CFLAGS} 915resolution.c -o 915resolution
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/915resolution ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/915resolution ${PREFIX}/sbin
>+.if !defined(NOPORTDOCS)
>+	${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m ${BINMODE} -d ${DOCSDIR}
>+.for f in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>+.endfor
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -u -ruN 915resolution-0.5.2/distinfo 915resolution/distinfo
>--- 915resolution-0.5.2/distinfo	Thu Mar 30 03:30:03 2006
>+++ 915resolution/distinfo	Wed May 23 16:49:52 2007
>@@ -1,3 +1,3 @@
>-MD5 (915resolution-0.5.2.tar.gz) = a3441e5662c5ff1e00dc97de4487e8f8
>-SHA256 (915resolution-0.5.2.tar.gz) = 98827dd5adb5ffb5e415b2b28364033ffc173796555051ef52983ec5df77b6d4
>-SIZE (915resolution-0.5.2.tar.gz) = 21183
>+MD5 (915resolution-0.5.3.tar.gz) = ed287778a53d02c31a7a6a52bc146291
>+SHA256 (915resolution-0.5.3.tar.gz) = b64cab834b5e410bca555dc9db8e69f62f6f02496942f35ff4a68f3f27f1b542
>+SIZE (915resolution-0.5.3.tar.gz) = 22583
>diff -u -ruN 915resolution-0.5.2/files/915resolution.sh.in 915resolution/files/915resolution.sh.in
>--- 915resolution-0.5.2/files/915resolution.sh.in	Wed Dec 31 19:00:00 1969
>+++ 915resolution/files/915resolution.sh.in	Wed May 23 20:59:53 2007
>@@ -0,0 +1,44 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: $
>+#
>+
>+# PROVIDE: i915resolution
>+# REQUIRE: mountcritremote
>+# BEFORE:  SERVERS
>+# KEYWORD: nojail
>+
>+# Define these i915resolution_* variables in one of these files:
>+#	/etc/rc.conf
>+#	/etc/rc.conf.local
>+#	/etc/rc.conf.d/i915resolution
>+#
>+# DO NOT CHANGE THESE DEFAULT VALUES HERE
>+#
>+i915resolution_enable=${i915resolution_enable:-"NO"}	# Enable hacking VBIOS resolution (YES/NO)
>+i915resolution_modes=${i915resolution_modes:-"3c 4d 5c"}# Space separated list of modes to set
>+i915resolution_width=${i915resolution_width:-"1920"}	# the horisontal resolution in pixels
>+i915resolution_hight=${i915resolution_hight:-"1080"}	# the vertical resolution in pixels
>+
>+. %%RC_SUBR%%
>+
>+name="i915resolution"
>+rcvar=`set_rcvar`
>+command="%%PREFIX%%/sbin/915resolution"
>+start_cmd="${name}_start"
>+stop_cmd=":"
>+status_cmd="${command} -l"
>+extra_commands="status"
>+
>+i915resolution_start()
>+{
>+	local mode
>+
>+	${status_cmd} | grep '^Chipset:'
>+	for mode in ${i915resolution_modes}; do
>+		${command} ${mode} ${i915resolution_width} ${i915resolution_hight} | tail -n 1
>+	done
>+}
>+
>+load_rc_config $name
>+run_rc_command "$1"
>diff -u -ruN 915resolution-0.5.2/files/patch-915resolution.c 915resolution/files/patch-915resolution.c
>--- 915resolution-0.5.2/files/patch-915resolution.c	Tue Oct 31 02:07:11 2006
>+++ 915resolution/files/patch-915resolution.c	Sun Apr 15 06:46:56 2007
>@@ -1,5 +1,5 @@
>---- 915resolution.c.orig	Fri Feb  3 01:28:34 2006
>-+++ 915resolution.c	Sun Oct 15 20:39:56 2006
>+--- 915resolution.c.orig	Sun Apr 15 06:46:56 2007
>++++ 915resolution.c	Sun Apr 15 06:46:56 2007
> @@ -21,8 +21,10 @@
>  #define __USE_GNU
>  #include <string.h>
>@@ -12,7 +12,7 @@
>  #include <unistd.h>
>  #include <assert.h>
>  
>-@@ -161,7 +163,8 @@
>+@@ -165,7 +167,8 @@
>  void initialize_system(char * filename) {
>  
>      if (!filename) {
>@@ -22,7 +22,7 @@
>              perror("Unable to obtain the proper IO permissions");
>              exit(2);
>          }
>-@@ -169,7 +172,7 @@
>+@@ -173,7 +176,7 @@
>  }
>  
>  cardinal get_chipset_id(void) {
>@@ -31,60 +31,60 @@
>      return inl(0xcfc);
>  }
>  
>-@@ -476,11 +479,11 @@
>-         case CT_UNKWN:
>-             break;
>-         case CT_855GM:
>--            outl(0x8000005a, 0xcf8);
>-+            OUTL(0x8000005a, 0xcf8);
>-             map->b1 = inb(0xcfe);
>-             
>--            outl(0x8000005a, 0xcf8);
>--            outb(0x33, 0xcfe);
>-+            OUTL(0x8000005a, 0xcf8);
>-+            OUTB(0x33, 0xcfe);
>-             break;
>-         case CT_845G:
>-         case CT_865G:
>-@@ -488,13 +491,13 @@
>-         case CT_915GM:
>-         case CT_945G:
>-         case CT_945GM:
>--            outl(0x80000090, 0xcf8);
>-+            OUTL(0x80000090, 0xcf8);
>-             map->b1 = inb(0xcfd);
>-             map->b2 = inb(0xcfe);
>-             
>--            outl(0x80000090, 0xcf8);
>--            outb(0x33, 0xcfd);
>--            outb(0x33, 0xcfe);
>-+            OUTL(0x80000090, 0xcf8);
>-+            OUTB(0x33, 0xcfd);
>-+            OUTB(0x33, 0xcfe);
>-             break;
>-         }
>+@@ -496,11 +499,11 @@
>+         break;
>+     case CT_830:
>+     case CT_855GM:
>+-        outl(0x8000005a, 0xcf8);
>++        OUTL(0x8000005a, 0xcf8);
>+         map->b1 = inb(0xcfe);
>+         
>+-        outl(0x8000005a, 0xcf8);
>+-        outb(0x33, 0xcfe);
>++        OUTL(0x8000005a, 0xcf8);
>++        OUTB(0x33, 0xcfe);
>+         break;
>+     case CT_845G:
>+     case CT_865G:
>+@@ -511,13 +514,13 @@
>+     case CT_946GZ:
>+     case CT_G965:
>+     case CT_Q965:
>+-        outl(0x80000090, 0xcf8);
>++        OUTL(0x80000090, 0xcf8);
>+         map->b1 = inb(0xcfd);
>+         map->b2 = inb(0xcfe);
>+         
>+-        outl(0x80000090, 0xcf8);
>+-        outb(0x33, 0xcfd);
>+-        outb(0x33, 0xcfe);
>++        OUTL(0x80000090, 0xcf8);
>++        OUTB(0x33, 0xcfd);
>++        OUTB(0x33, 0xcfe);
>+         break;
>      }
>-@@ -526,8 +529,8 @@
>-         case CT_UNKWN:
>-             break;
>-         case CT_855GM:
>--            outl(0x8000005a, 0xcf8);
>--            outb(map->b1, 0xcfe);
>-+            OUTL(0x8000005a, 0xcf8);
>-+            OUTB(map->b1, 0xcfe);
>-             break;
>-         case CT_845G:
>-         case CT_865G:
>-@@ -535,9 +538,9 @@
>-         case CT_915GM:
>-         case CT_945G:
>-         case CT_945GM:
>--            outl(0x80000090, 0xcf8);
>--            outb(map->b1, 0xcfd);
>--            outb(map->b2, 0xcfe);
>-+            OUTL(0x80000090, 0xcf8);
>-+            OUTB(map->b1, 0xcfd);
>-+            OUTB(map->b2, 0xcfe);
>-             break;
>-         }
>+ 
>+@@ -539,8 +542,8 @@
>+         break;
>+     case CT_830:
>+     case CT_855GM:
>+-        outl(0x8000005a, 0xcf8);
>+-        outb(map->b1, 0xcfe);
>++        OUTL(0x8000005a, 0xcf8);
>++        OUTB(map->b1, 0xcfe);
>+         break;
>+     case CT_845G:
>+     case CT_865G:
>+@@ -551,9 +554,9 @@
>+     case CT_946GZ:
>+     case CT_G965:
>+     case CT_Q965:
>+-        outl(0x80000090, 0xcf8);
>+-        outb(map->b1, 0xcfd);
>+-        outb(map->b2, 0xcfe);
>++        OUTL(0x80000090, 0xcf8);
>++        OUTB(map->b1, 0xcfd);
>++        OUTB(map->b2, 0xcfe);
>+         break;
>      }
>+

Actions: View | Diff

Attachments on bug 112922: 78502