diff options
| -rw-r--r-- | xserver/xserver-xorg/epia/xorg.conf | 66 | ||||
| -rw-r--r-- | xserver/xserver-xorg_6.8.oe | 13 | ||||
| -rw-r--r-- | xserver/xserver-xorg_cvs.oe | 13 |
3 files changed, 6 insertions, 86 deletions
diff --git a/xserver/xserver-xorg/epia/xorg.conf b/xserver/xserver-xorg/epia/xorg.conf deleted file mode 100644 index fac9ac3ec6..0000000000 --- a/xserver/xserver-xorg/epia/xorg.conf +++ /dev/null @@ -1,66 +0,0 @@ -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" -EndSection - -Section "Monitor" - Identifier "TV" - Option "DPMS" "no" - HorizSync 15-70 - VertRefresh 50-100 - Modeline "720x576" 27.88 720 744 768 920 576 578 579 606 # 28 MHz, 30.3 kHz, 50.0 Hz - - #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 diff --git a/xserver/xserver-xorg_6.8.oe b/xserver/xserver-xorg_6.8.oe index 8422babc7d..b6859adc97 100644 --- a/xserver/xserver-xorg_6.8.oe +++ b/xserver/xserver-xorg_6.8.oe @@ -1,15 +1,12 @@ SECTION = "x11/base" -PR = "r4" +PR = "r5" -DEPENDS = "freetype libxi xmu flex-2.5.4-native xfonts-xorg" +DEPENDS = "freetype libxi xmu flex-2.5.4-native" SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;method=pserver \ cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;tag=release;method=pserver;module=xfree86 \ file://imake-staging.patch;patch=1 \ - file://dri.patch;patch=1 \ - file://xorg.conf" - -RDEPENDS_${PN} += "xfonts-xorg" + file://dri.patch;patch=1" PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" @@ -55,8 +52,4 @@ do_stage() { pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd done install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ - install -d ${D}/etc/X11 - if [ -f "${WORKDIR}/xorg.conf" ]; then - install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ - fi } diff --git a/xserver/xserver-xorg_cvs.oe b/xserver/xserver-xorg_cvs.oe index d56ee7ae1b..06b0cae1f7 100644 --- a/xserver/xserver-xorg_cvs.oe +++ b/xserver/xserver-xorg_cvs.oe @@ -1,15 +1,12 @@ SECTION = "x11/base" -PR = "r1" +PR = "r2" PV = "6.8.1+cvs${CVSDATE}" -DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native xfonts-xorg" +DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native" SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver \ file://imake-staging.patch;patch=1 \ - file://dri.patch;patch=1 \ - file://xorg.conf" - -RDEPENDS_${PN} += "xfonts-xorg" + file://dri.patch;patch=1" PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" @@ -58,8 +55,4 @@ do_stage() { pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd done install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ - install -d ${D}/etc/X11 - if [ -f "${WORKDIR}/xorg.conf" ]; then - install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ - fi } |