Chameleon

Chameleon Commit Details

Date:2011-09-21 03:12:37 (7 years 7 months ago)
Author:ErmaC
Commit:1549
Parents: 1548
Message:sync with trunk. Add 1280x768 resolution stuff for pkg Correction in all Language.
Changes:
D/branches/ErmaC/package/Resources/It.lproj
R/branches/ErmaC/package/Scripts/Keymaps/postinstall.in → /branches/ErmaC/package/Scripts/Keymaps/postinstall
A/branches/ErmaC/package/Scripts/Resolutions/1280x768x32
A/branches/ErmaC/package/Scripts/Resolutions/1280x768x32/postinstall
M/branches/ErmaC/package/Resources/zh.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/sr.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/pt-BR.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/ru.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/bg.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/de.lproj/Localizable.strings
M/branches/ErmaC/i386/libsaio/asm.s
M/branches/ErmaC/i386/boot2/resume.c
M/branches/ErmaC/package/Resources/he.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/id.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf
M/branches/ErmaC/package/Resources/el.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/en.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/ar.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/pt-PT.lproj/Localizable.strings
M/branches/ErmaC/i386/libsaio/ati.c
M/branches/ErmaC/package/Resources/mk.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/fr.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/es.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/nl.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/pl.lproj/Localizable.strings
M/branches/ErmaC/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf
M/branches/ErmaC/package/Resources/hr-HR.lproj/Localizable.strings

File differences

branches/ErmaC/i386/libsaio/asm.s
339339
340340
341341
342
342
343343
344344
345345
jmp _halt
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// disableIRQs() - Azi: DHP
// disableIRQs()
// http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1677779
//
// Port of original patch by: CPARM (who basically did this in boot.c) Thanks!
branches/ErmaC/i386/libsaio/ati.c
314314
315315
316316
317
318
319
320317
321318
322319
......
398395
399396
400397
401
402
403398
404399
405400
......
480475
481476
482477
483
478
479
484480
485481
486482
......
504500
505501
506502
503
507504
508505
509506
......
554551
555552
556553
557
558
554
555
559556
560557
561
558
562559
563
564
560
561
565562
566
563
567564
568
569
565
566
570567
571568
572569
......
574571
575572
576573
577
574
578575
579576
580577
581578
582
579
583580
584
581
585582
586583
587584
......
594591
595592
596593
594
597595
598596
597
598
599599
600600
601
601
602602
603603
604604
......
688688
689689
690690
691
691
692692
693
693
694694
695695
696696
697697
698698
699
699
700700
701701
702702
......
13531353
13541354
13551355
1356
1356
13571357
13581358
13591359
......
13771377
13781378
13791379
1380
1380
13811381
13821382
13831383
{ 0x94C3,0x2247148C, CHIP_FAMILY_RV610,"ATI Radeon HD 2400 LE",kNull},
{ 0x94C3,0x3000148C, CHIP_FAMILY_RV610,"ATI Radeon HD 2350 Series",kNull},
{ 0x94C3,0x30001642, CHIP_FAMILY_RV610,"ATI Radeon HD 3410",kNull},
{ 0x94C3,0x37161642, CHIP_FAMILY_RV610,"ATI Radeon HD 2400 PRO",kNull},
{ 0x94C3,0x3000174B, CHIP_FAMILY_RV610,"ATI Radeon HD 2350 Series",kNull},
{ 0x94C3,0xE370174B, CHIP_FAMILY_RV610,"ATI Radeon HD 2400 PRO",kNull},
{ 0x94C3,0xE400174B, CHIP_FAMILY_RV610,"ATI Radeon HD 2400 PRO",kNull},
{ 0x9589,0x30001462, CHIP_FAMILY_RV630,"ATI Radeon HD 3610",kNull},
{ 0x9589,0x30001642, CHIP_FAMILY_RV630,"ATI Radeon HD 3610",kNull},
{ 0x9589,0x0E41174B, CHIP_FAMILY_RV630,"ATI Radeon HD 3600 Series",kNull},
{ 0x9589,0x30001787, CHIP_FAMILY_RV630,"ATI Radeon HD 3600 Series",kNull},
{ 0x689C,0x30201682, CHIP_FAMILY_HEMLOCK,"ATI Radeon HD 5970",kUakari},
{ 0x68A1,0x144D103C,CHIP_FAMILY_CYPRESS,"ATI Mobility Radeon HD 5800",kNomascus},
{ 0x68A1,0x144D103C,CHIP_FAMILY_CYPRESS,"ATI Mobility Radeon HD 5850",kNomascus},
{ 0x68A1,0x1522103C, CHIP_FAMILY_CYPRESS,"ATI Mobility Radeon HD 5850",kHoolock},
{ 0x68A8,0x050E1025, CHIP_FAMILY_CYPRESS,"AMD Radeon HD 6850M",kUakari},
{ 0x68C0,0x392717AA, CHIP_FAMILY_REDWOOD,"ATI Mobility Radeon HD 5730",kNull},
{ 0x68C1,0x033E1025, CHIP_FAMILY_REDWOOD,"ATI Mobility Radeon HD 5650",kNull},
{ 0x68C1,0x9071104D,CHIP_FAMILY_REDWOOD,"ATI Mobility Radeon HD 5650",kEulemur},
{ 0x68C8,0x2306103C, CHIP_FAMILY_REDWOOD,"ATI FirePro V4800 (FireGL)",kNull},
{ 0x6718,0x31301682, CHIP_FAMILY_CAYMAN,"AMD Radeon HD 6970",kNull},
{ 0x6738,0x00D01002,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x21FA1002,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x00D01002, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x21FA1002, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x67381002, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x21FA1458,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x21FA1458, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x31031682,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x31041682,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x31031682, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x31041682, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0xE178174B,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0xE178174B, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x20101787,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x23051787,CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x20101787, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6738,0x23051787, CHIP_FAMILY_BARTS,"AMD Radeon HD 6870",kDuckweed},
{ 0x6739,0x67391002, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed},
{ 0x6739,0x24411462, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed},
{ 0x6739,0xE177174B,CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed},
{ 0x6739,0xE177174B, CHIP_FAMILY_BARTS,"AMD Radeon HD 6850",kDuckweed},
{ 0x6740,0x1657103C, CHIP_FAMILY_TURKS,"AMD Radeon HD 6770M",kNull},
{ 0x6741,0x050E1025, CHIP_FAMILY_TURKS,"AMD Radeon HD 6650M",kNull},
{ 0x6741,0x05131025, CHIP_FAMILY_TURKS,"AMD Radeon HD 6650M",kNull},
{ 0x6741,0x05131025, CHIP_FAMILY_TURKS,"AMD Radeon HD 6650M",kNull},
{ 0x6741,0x1646103C, CHIP_FAMILY_TURKS,"AMD Radeon HD 6750M",kNull},
{ 0x6741,0x9080104D, CHIP_FAMILY_TURKS,"AMD Radeon HD 6630M",kNull},
{ 0x6741,0x9080104D,CHIP_FAMILY_TURKS,"AMD Radeon HD 6630M",kNull},
{ 0x6758,0x67581002,CHIP_FAMILY_TURKS,"AMD Radeon HD 6670",kBulrushes},
{ 0x6759,0xE193174B, CHIP_FAMILY_TURKS,"AMD Radeon HD 6570",kNull},
{ 0x6760,0x04CC1028,CHIP_FAMILY_RV730,"AMD Radeon HD 6490M",kNull},
{ 0x6760,0x1CB21043, CHIP_FAMILY_RV730,"AMD Radeon HD 6470M",kNull},
{ 0x6760,0x1656103C, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6490M",kNull}, // ErmaC no tested
{ 0x6779,0x64501092,CHIP_FAMILY_CAICOS,"AMD Radeon HD 6450",kBulrushes},
{ 0x6779,0xE164174B,CHIP_FAMILY_CAICOS,"AMD Radeon HD 6450",kBulrushes},
{ 0x6779,0xE164174B,CHIP_FAMILY_CAICOS,"AMD Radeon HD 6450",kBulrushes},
/* standard/default models */
{ 0x9400,0x00000000, CHIP_FAMILY_R600,"ATI Radeon HD 2900 XT",kNull},
{ 0x673E,0x00000000, CHIP_FAMILY_BARTS,"AMD Radeon HD 6790 Series",kNull},
{ 0x6740,0x00000000, CHIP_FAMILY_TURKS,"AMD Radeon HD 6700M Series",kNull},
{ 0x6741,0x00000000, CHIP_FAMILY_TURKS,"AMD Radeon HD 6600M/6700M Series", kNull},
{ 0x6741,0x00000000, CHIP_FAMILY_TURKS,"AMD Radeon HD 6600/6700M Series",kNull},
{ 0x6758,0x00000000, CHIP_FAMILY_TURKS,"AMD Radeon HD 6670 Series",kBulrushes},
{ 0x6758,0x00000000, CHIP_FAMILY_TURKS,"AMD Radeon HD 6670 Series",kNull},
{ 0x6759,0x00000000, CHIP_FAMILY_TURKS,"AMD Radeon HD 6500 Series",kNull},
{ 0x6760,0x00000000, CHIP_FAMILY_RV730,"AMD Radeon HD 6470M",kNull},
{ 0x6770,0x00000000, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6400 Series",kNull},
{ 0x6779,0x00000000, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6450 Series",kBulrushes},
{ 0x6779,0x00000000, CHIP_FAMILY_CAICOS,"AMD Radeon HD 6450 Series",kNull},
{ 0x0000,0x00000000, CHIP_FAMILY_UNKNOW,NULL,kNull}
};
// if none,
if (!card->cfg_name)
{
// use the device fb key on radeon_cards, to retrive the default name from card_configs.
// use cfg_name on radeon_cards, to retrive the default name from card_configs,
card->cfg_name = card_configs[card->info->cfg_name].name;
// and leave ports alone!
//card->ports = card_configs[card->info->cfg_name].ports;
}
else// if (card->cfg_name > 0) // do we want 0 ports if fb is kNull or mistyped ?
{
// else, match fb name with card_configs list and retrive default nr of ports.
// else, match cfg_name with card_configs list and retrive default nr of ports.
for (i = 0; i < kCfgEnd; i++)
if (strcmp(card->cfg_name, card_configs[i].name) == 0)
card->ports = card_configs[i].ports; // default
branches/ErmaC/i386/boot2/resume.c
139139
140140
141141
142
143
142
144143
145144
146145
mem_base = getmemorylimit() - allocSize;//TODO: lower this
printf("mem_base %x\n", mem_base);
// Rek : hibernate fix
if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))
if (((long long)mem_base + allocSize) < (1024 * bootInfo->extmem + 0x100000))
{
printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n");
getchar();
branches/ErmaC/package/Scripts/Resolutions/1280x768x32/postinstall
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
#!/usr/bin/python
# Script to add Graphics_Mode for Chameleon boot loaders
import sys
import os
import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
if not os.path.exists(plist):
shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
Graphics_ModeCheck = False
body = ""
for line in infile:
# if we finish the tags and haven't written Graphics_Mode Yet
if "</dict>" in line and Graphics_ModeCheck == False:
line = " <key>Graphics Mode</key>\n"
line += " <string>1280x768x32</string>\n"
line += "</dict>\n"
Graphics_ModeCheck = True
body += line
infile.close()
outfile = open(plist, "w")
outfile.write(body)
outfile.close()
branches/ErmaC/package/Scripts/Keymaps/postinstall.in
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
#!/usr/bin/python
# Script to add Graphics_Mode for Chameleon boot loaders
import sys
import os
import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
if not os.path.exists(plist):
shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
KeyLayoutCheck = False
body = ""
for line in infile:
# if we finish the tags and haven't written KeyLayout Yet
if "</dict>" in line and KeyLayoutCheck == False:
line = " <key>KeyLayout</key>\n"
line += " <string>@@KEYMAP@@</string>\n"
line += "</dict>\n"
KeyLayoutCheck = True
body += line
infile.close()
outfile = open(plist, "w")
outfile.write(body)
outfile.close()
branches/ErmaC/package/Scripts/Keymaps/postinstall
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
#!/usr/bin/python
# Script to add KeyLayout for Chameleon boot loaders
import sys
import os
import shutil
vol = str(sys.argv[3])
boot = "/Extra/org.chameleon.Boot.plist"
plist = vol + boot
if not os.path.exists(plist):
shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
infile = open(plist, "r")
# check if Graphics_Mode has been written or not
KeyLayoutCheck = False
body = ""
for line in infile:
# if we finish the tags and haven't written KeyLayout Yet
if "</dict>" in line and KeyLayoutCheck == False:
line = " <key>KeyLayout</key>\n"
line += " <string>@@KEYMAP@@</string>\n"
line += "</dict>\n"
KeyLayoutCheck = True
body += line
infile.close()
outfile = open(plist, "w")
outfile.write(body)
outfile.close()
branches/ErmaC/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf
2929
3030
3131
32
32
33
3334
34
35
36
\b\fs26 \cf0 Packages credits to : %PKGDEV%
\b0\fs30 \
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\cf0 \\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\fs26 \cf0 Copyright \'a9 2011}
\fs26 \cf0 Copyright \'a9 2011
\b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1086 \u1076 \u1089 \u1090 \u1088 \u1072 \u1085 \u1072 \u1085 \u1072 : kn6600}
branches/ErmaC/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf
3232
3333
3434
35
35
36
\cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\fs26 \cf0 Copyright \'a9 2011}
\fs26 \cf0 Copyright \'a9 2011
\b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 : mozodojo}

Archive Download the corresponding diff file

Revision: 1549