Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
Ken Moore
Ken Moore committed Mar 3, 2014
2 parents fa4f55f + 5e26f0b commit 7b1e4b6dc6e06595dc0eaa63b85adfe89823fd28
Showing 332 changed files with 9,211 additions and 5,049 deletions.
@@ -43,7 +43,6 @@ blinkensisters_SET=ADDONS SDL_MIXER SDL_NET
boinc-client_SET=SKINS
ca_root_nss_SET=ETCSYMLINK
centerim_SET=GG LJ RSS GPGME JABBER IRC AIM YAHOO MSN FRIBIDI MULTIBYTE
-chromium_SET=CODECS CLANG PULSEAUDIO
claws-mail_SET=BOGOFILTER GPGME SPAMASSASSIN
conky_SET=XFT LUA LUA_CAIRO LUA_IMLIB2 IMLIB2
cups-base_SET=XPDF
@@ -53,8 +52,6 @@ denemo_SET=LILYPOND
dovecot_SET=MYSQL PGSQL SQLITE LDAP
easytag_SET=WAVEPACK
evolution_SET=SPAMASSASSIN
-firefox_UNSET=ALSA
-firefox_SET=PULSEAUDIO
freeciv_SET=SDL
freetype2_SET=LCD_FILTERING
fvwm-crystal_UNSET=XSCREENSAVER
@@ -22,26 +22,16 @@ detect_x()
if [ $? -eq 0 ] ; then cp /root/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf ; return; fi
# Try the second card, since many optimus / amd hybrids have Intel on secondary
- cfg_second_card
- if [ $? -ne 0 ] ; then
- # Check if this system has a nvidia device, and run nvidia-xconfig
- kldstat | grep -q 'nvidia'
- if [ $? -eq 0 ] ; then
- echo "Detected NVIDIA, creating xorg.conf"
- nvidia-xconfig 2>/dev/null
- fi
- fi
-
+ cfg_card_busid "1"
}
-cfg_second_card()
+cfg_card_busid()
{
- # This is a script to try an xorg.conf file configured to use the second vgapci1 device
- # For most systems this wont do anything, but on a number of newer hybrid
- # intel/amd or intel/nvidia laptops this may fix a problem where the intel card (which works)
- # is the secondary pcivga1 device, and the non-functional AMD/NVIDIA optimus shows up first.
+ whichcard="$1"
+ # This script will manually set BusID for the first or second vgapciX device
+ # For some reason in 10.0, it no longer auto-probes for different VGA devices :(
inCard=0
pciconf -lv > /tmp/.pciconf.$$
while read line
@@ -66,33 +56,54 @@ cfg_second_card()
;;
1) card2=`echo $line | cut -d "'" -f 2`
card2bus="$busID"
- ;;
+ ;;
*) ;;
esac
fi
fi
done < /tmp/.pciconf.$$
rm /tmp/.pciconf.$$
- # No secondary card, return 1
- if [ -z "$card2" ] ; then return 1; fi
+ # Which card are we configuring
+ if [ "$whichcard" = "1" ] ; then
+ cfgCard="$card1"
+ cfgCardBusID="$card1bus"
+ else
+ cfgCard="$card2"
+ cfgCardBusID="$card2bus"
+ fi
- # Is this secondary an Intel chipset?
- echo "$card2" | grep -q -i -e "intel"
- if [ $? -ne 0 ] ; then return 1 ; fi
+ # No detected, return 1
+ if [ -z "$cfgCard" ] ; then return 1; fi
- # Found a second card, lets try an xorg config for it
- cp /root/cardDetect/XF86Config.default /etc/X11/xorg.conf
- echo "
+ # Is this an Intel chipset?
+ echo "$cfgCard" | grep -q -i -e "intel"
+ if [ $? -eq 0 ] ; then
+ driver="intel"
+ fi
+ echo "$cfgCard" | grep -q -i -e "nvidia"
+ if [ $? -eq 0 ] ; then
+ driver="nvidia"
+ fi
+
+ # Found a card, lets try an xorg config for it
+ cp ${PROGDIR}/cardDetect/XF86Config.default /etc/X11/xorg.conf
+ if [ -n "$driver" ] ; then
+ echo "
Section \"Device\"
Identifier \"Card0\"
- Driver \"intel\"
- BusID \"${card2bus}\"
+ Driver \"$driver\"
+ BusID \"${cfgCardBusID}\"
EndSection
" >> /etc/X11/xorg.conf
-
- echo "Hybrid video detected! Using Intel chipset..."
- sleep 3
+ else
+ echo "
+Section \"Device\"
+ Identifier \"Card0\"
+ BusID \"${cfgCardBusID}\"
+EndSection
+ " >> /etc/X11/xorg.conf
+ fi
return 0
}
@@ -108,8 +119,9 @@ start_xorg()
if [ ! -e "/tmp/.xstarted" ]
then
# Failed to start X
- # Lets try again with its own internal video detection
+ # Lets try again with a secondary video card
rm /etc/X11/xorg.conf 2>/dev/null
+ cfg_card_busid "2"
startx
if [ ! -e "/tmp/.xstarted" ]
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -187,23 +187,28 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
Oops, something went wrong.

0 comments on commit 7b1e4b6

Please sign in to comment.