소스 검색

Merge pull request #19 from cuu/master

 add xorg configs,change xinit logic,add Pcsx as submodule,add gpu driver switch
GNU 5 년 전
부모
커밋
155b3985eb
10개의 변경된 파일34개의 추가작업 그리고 5개의 파일을 삭제
  1. 9 2
      .cpirc
  2. 3 0
      .gitmodules
  3. 4 2
      .xinitrc
  4. 7 0
      .xorg.conf
  5. 7 0
      .xorg_lima.conf
  6. 1 0
      Menu/GameShell/20_Retro Games/Pcsx
  7. BIN
      dwm-mod
  8. BIN
      main
  9. 2 1
      md5sum.log
  10. 1 0
      md5sum.sh

+ 9 - 2
.cpirc

@@ -1,12 +1,19 @@
 SCREEN=`cat /sys/class/graphics/fb0/modes`
+
+XORG_CONF="/home/cpi/launchergo/.xorg.conf"
+if [ -f ~/.lima ]
+then
+XORG_CONF="/home/cpi/launchergo/.xorg_lima.conf"
+fi
+
 if [ -f /tmp/autologin ]
 then
    rm -f /tmp/autologin
    mpd ~/.mpd.conf
       if [[ $SCREEN =~ .*320.* ]]
       then
-         startx /home/cpi/launchergo/.xinitrc -- -nocursor > /tmp/x.log 2>&1
+         startx /home/cpi/launchergo/.xinitrc -- -xf86config $XORG_CONF -nocursor > /tmp/x.log 2>&1
       else
-         startx /home/cpi/launchergo/.xinitrc hdmi > /tmp/x.log 2>&1
+         startx /home/cpi/launchergo/.xinitrc hdmi -- -xf86config $XORG_CONF > /tmp/x.log 2>&1
       fi
 fi

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Menu/GameShell/20_Retro Games/Pcsx"]
+	path = Menu/GameShell/20_Retro Games/Pcsx
+	url = https://github.com/cuu/Pcsx.git

+ 4 - 2
.xinitrc

@@ -5,13 +5,15 @@ hdmi )
 	feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/desktopbg.jpg
 	exec ~/launchergo/load.sh &
 	exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon &
-	exec /usr/bin/twm -f ~/launchergo/.twmrc
+#	exec /usr/bin/twm -f ~/launchergo/.twmrc
+	exec ~/launchergo/dwm-mod
 	;;
 gameshell ) 
 	feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/loading.png
 	exec ~/launchergo/load.sh &
 	exec ~/launcher/sys.py/gsnotify/gsnotify-arm &
-	exec awesome -c ~/launchergo/awesome/rc.lua
+#	exec awesome -c ~/launchergo/awesome/rc.lua
+	exec ~/launchergo/dwm-mod
 	;;
 *) 
 	exec $1;;

+ 7 - 0
.xorg.conf

@@ -0,0 +1,7 @@
+Section "Device"
+        Identifier      "Allwinner A10/A13 FBDEV"
+        Driver          "fbturbo"
+        Option          "fbdev" "/dev/fb0"
+
+        Option          "SwapbuffersWait" "true"
+EndSection

+ 7 - 0
.xorg_lima.conf

@@ -0,0 +1,7 @@
+Section "Device"
+        Identifier      "Allwinner A10/A13 FBDEV"
+        Driver          "modesetting"
+        Option          "fbdev" "/dev/fb0"
+
+        Option          "SwapbuffersWait" "true"
+EndSection

+ 1 - 0
Menu/GameShell/20_Retro Games/Pcsx

@@ -0,0 +1 @@
+Subproject commit c532cedb5387697c633777f37a52e11f95fa3352

BIN
dwm-mod


BIN
main


+ 2 - 1
md5sum.log

@@ -1 +1,2 @@
-06286d87e7724c2ff79155db9a8e826b main
+f767ff5a91748714129ed417e3392c15 main
+b4681733b228e2976a309efb7902588c dwm-mod

+ 1 - 0
md5sum.sh

@@ -3,6 +3,7 @@ set -x
 
 find . -iname "*.so" -exec md5sum {} + > md5sum.log
 echo `md5sum main`  >> md5sum.log
+echo `md5sum dwm-mod`  >> md5sum.log