Mailinglist Archive: opensuse-commit (1124 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package 915resolution
checked in at Thu Apr 19 21:06:36 CEST 2007.

--------
--- 915resolution/915resolution.changes 2006-11-30 23:32:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/915resolution/915resolution.changes    2007-04-19 12:28:19.170882000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 19 12:27:25 CEST 2007 - sndirsch@xxxxxxx
+
+- add 855resolution compatibility symlink for SUSE < 10.2
+
+-------------------------------------------------------------------
+Thu Apr 19 11:55:37 CEST 2007 - sndirsch@xxxxxxx
+
+- 965GM.diff: support for 965GM
+
+-------------------------------------------------------------------

New:
----
  965GM.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ 915resolution.spec ++++++
--- /var/tmp/diff_new_pack.Bg1547/_old  2007-04-19 21:05:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Bg1547/_new  2007-04-19 21:05:37.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package 915resolution (Version 0.5.2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -19,7 +19,7 @@
 Obsoletes:      855resolution
 Autoreqprov:    on
 Version:        0.5.2
-Release:        15
+Release:        27
 PreReq:         %insserv_prereq %fillup_prereq
 Summary:        This software changes the resolution of an available vbios mode.
 Source:         %name-%version.tar.gz
@@ -27,6 +27,7 @@
 Source3:        sysconfig.videobios
 Patch:          915resolution.diff
 Patch1:         965.diff
+Patch2:         965GM.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -50,6 +51,7 @@
 %setup
 %patch
 %patch1
+%patch2
 rm -f 915resolution
 
 %build
@@ -64,6 +66,9 @@
 mkdir -p $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d
 install -m 644 %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates
+%if %suse_version < 1020
+ln -snf 915resolution $RPM_BUILD_ROOT/sbin/855resolution
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +77,9 @@
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt changes.log chipset_info.txt
 %ifnarch ppc ppc64 s390 s390x
+%if %suse_version < 1020
+/sbin/855resolution
+%endif
 /sbin/915resolution
 %endif
 /etc/init.d/boot.videobios
@@ -83,7 +91,11 @@
 %{fillup_only -n videobios}
 %endif
 
-%changelog -n 915resolution
+%changelog
+* Thu Apr 19 2007 - sndirsch@xxxxxxx
+- add 855resolution compatibility symlink for SUSE < 10.2
+* Thu Apr 19 2007 - sndirsch@xxxxxxx
+- 965GM.diff: support for 965GM
 * Thu Nov 30 2006 - sndirsch@xxxxxxx
 - fixed comment in sysconfig file (Bug #224528)
 * Thu Oct 19 2006 - sndirsch@xxxxxxx

++++++ 965GM.diff ++++++
diff -u ../915resolution-0.5.2.old/915resolution.c ./915resolution.c
--- ../915resolution-0.5.2.old/915resolution.c  2007-04-19 11:48:45.928114043 +0200
+++ ./915resolution.c   2007-04-19 11:54:04.113777429 +0200
@@ -55,10 +55,10 @@
 typedef unsigned int cardinal;
 
 typedef enum {
-    CT_UNKWN, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, CT_965G, CT_965Q, CT_946GZ
+    CT_UNKWN, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, CT_965G, CT_965Q, CT_946GZ, CT_965GM
 } chipset_type;
 
-char * chipset_type_names[] = {"UNKNOWN", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM" "965G", "965Q", "946GZ"};
+char * chipset_type_names[] = {"UNKNOWN", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM" "965G", "965Q", "946GZ", "965GM"};
 
 typedef enum {
     BT_UNKWN, BT_1, BT_2, BT_3
@@ -218,6 +218,10 @@
        type = CT_946GZ;
         break;
 
+    case 0x2A008086:
+       type = CT_965GM;
+       break;
+
     default:
         type = CT_UNKWN;
         break;
@@ -504,6 +508,7 @@
         case CT_965G:
         case CT_965Q:
         case CT_946GZ:
+        case CT_965GM:
             outl(0x80000090, 0xcf8);
             map->b1 = inb(0xcfd);
             map->b2 = inb(0xcfe);
@@ -554,6 +559,7 @@
         case CT_965G:
         case CT_965Q:
         case CT_946GZ:
+        case CT_965GM:
             outl(0x80000090, 0xcf8);
             outb(map->b1, 0xcfd);
             outb(map->b2, 0xcfe);
@@ -801,6 +807,9 @@
         else if (!strcmp(argv[index], "946GZ")) {
             *forced_chipset = CT_946GZ;
         }
+        else if (!strcmp(argv[index], "965GM")) {
+            *forced_chipset = CT_965GM;
+        }
         else {
             *forced_chipset = CT_UNKWN;
         }



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx