diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-16 22:40:16 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-16 22:40:16 +0000 |
commit | 2ecdcd7cf9ac1fa2ec2a1fd71110da7871ece862 (patch) | |
tree | d60bf7527480adaa69e2f638d06e75ed128f3336 /packages | |
parent | 73f8adad13f85939ffe735d322bb364c6d043343 (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/16 23:22:11+01:00 reciva.com!pb
use KERNEL_CC for drm modules
2005/06/16 23:18:32+01:00 reciva.com!pb
update mythfront xorg.conf
BKrev: 42b1ffd02JRAX7f4W2XBSZQedD350w
Diffstat (limited to 'packages')
-rw-r--r-- | packages/dri/drm-kernel_cvs.bb | 6 | ||||
-rw-r--r-- | packages/mythfront/mythfront-config.bb | 4 | ||||
-rw-r--r-- | packages/mythfront/mythfront-config/epia/xorg.conf | 70 |
3 files changed, 75 insertions, 5 deletions
diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb index 25a5faaa17..421e055b90 100644 --- a/packages/dri/drm-kernel_cvs.bb +++ b/packages/dri/drm-kernel_cvs.bb @@ -1,16 +1,16 @@ SECTION = "x11/base" -PR = "r1" +PR = "r2" LICENSE = "MIT" SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver" -inherit module-base +nherit module-base PV = "0.0cvs${CVSDATE}" S = "${WORKDIR}/drm" do_compile() { - oe_runmake -C linux-core LINUXDIR="${KERNEL_SOURCE}" + oe_runmake -C linux-core LINUXDIR="${KERNEL_SOURCE}" CC="${KERNEL_CC}" } do_install() { diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb index 4b8b4005cc..2cb7362ae8 100644 --- a/packages/mythfront/mythfront-config.bb +++ b/packages/mythfront/mythfront-config.bb @@ -1,5 +1,5 @@ -PV = "1.7" -PR = "r1" +PV = "1.8" +PR = "r0" DEPENDS = "xfonts-xorg" RDEPENDS_${PN} = "xfonts-xorg" diff --git a/packages/mythfront/mythfront-config/epia/xorg.conf b/packages/mythfront/mythfront-config/epia/xorg.conf index e69de29bb2..1783a88af8 100644 --- a/packages/mythfront/mythfront-config/epia/xorg.conf +++ b/packages/mythfront/mythfront-config/epia/xorg.conf @@ -0,0 +1,70 @@ +Section "Files" + FontPath "unix/:7100" # local font server + FontPath "/usr/lib/X11/fonts/misc" + FontPath "/usr/lib/X11/fonts/cyrillic" + FontPath "/usr/lib/X11/fonts/100dpi/:unscaled" + FontPath "/usr/lib/X11/fonts/75dpi/:unscaled" + FontPath "/usr/lib/X11/fonts/Type1" + FontPath "/usr/lib/X11/fonts/CID" + FontPath "/usr/lib/X11/fonts/Speedo" + FontPath "/usr/lib/X11/fonts/100dpi" + FontPath "/usr/lib/X11/fonts/75dpi" +EndSection + +Section "Module" + Load "ddc" + Load "glx" + Load "GLcore" + Load "dbe" + Load "dri" + Load "extmod" + #Load "pex5" + Load "record" + #Load "xie" + Load "bitmap" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "keyboard" + Option "CoreKeyboard" + Option "XkbRules" "xfree86" + Option "XkbModel" "pc104" + Option "XkbLayout" "gb" +EndSection + +Section "Device" + Identifier "Via" + Driver "via" + Option "TVType" "PAL" + #Option "TVVScan" "over" + #Option "TVDotCrawl" + #Option "NoDDCValue" "true" + Option "TVOutput" "S-Video" + Option "EnableAGPDMA" "true" +EndSection + +Section "Monitor" + Identifier "TV" + Option "DPMS" "no" + HorizSync 15-70 + VertRefresh 50-100 + DisplaySize 400 225 + #Modeline "720x576" 27.88 720 744 768 920 576 578 579 606 # 28 MHz, 30.3 kHz, 50.0 Hz + ModeLine "720x576" 32.7 720 744 816 912 576 577 580 597 + + #Modeline "720x576" 55.75 720 744 768 920 576 578 581 606 # 56 MHz, 60.6 kHz, 100.0 Hz + #ModeLine "720x480" 26.7 720 736 808 896 480 481 484 497 + #ModeLine "720x576" 32.7 720 744 816 912 576 577 580 597 +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Via" + Monitor "TV" + DefaultDepth 24 + Subsection "Display" + Depth 24 + Modes "720x576" + EndSubsection +EndSection |