various fixes to xorg-server for building the new version, various cleanups

This commit is contained in:
Stephan Raue 2009-08-16 18:53:00 +02:00
parent bd08b5b162
commit 5dd09ad04e
3 changed files with 12 additions and 32 deletions

View File

@ -25,31 +25,16 @@ for drv in $XORG_DRIVERS; do
$SCRIPTS/install xf86-video-$drv
done
#$SCRIPTS/install xf86-video-openchrome
#$SCRIPTS/install xf86-video-vesa
#$SCRIPTS/install xf86-video-nv
#+for drv in `ls $INSTALL/usr/lib/xorg/modules/drivers/*_drv.so`; do
#+ echo "$drv"|sed -e 's,.*/,,;s,_drv.so,,' >> $INSTALL/etc/X11/drivers
#+done
#Tools
#$SCRIPTS/install xrandr
#$SCRIPTS/install xresprobe
#$SCRIPTS/install read-edid
$SCRIPTS/install xinit
#+$SCRIPTS/install pciutils
#$SCRIPTS/install evilwm-ewmh
#$SCRIPTS/install ratpoison
$SCRIPTS/install openbox
mkdir -p $INSTALL/usr/bin
#cp $PKG_DIR/scripts/oe_wrapper $INSTALL/usr/bin
#cp $PKG_DIR/scripts/startx $INSTALL/usr/bin
#+mkdir -p $INSTALL/etc/X11
#+cp $PKG_DIR/config/X.cfg.sample $INSTALL/etc/X11
#+cp $PKG_DIR/config/xorg.default $INSTALL/etc/X11
#$SCRIPTS/install xrandr
#$SCRIPTS/install xresprobe
#$SCRIPTS/install read-edid
$SCRIPTS/install xinit
#+$SCRIPTS/install pciutils
#$SCRIPTS/install evilwm-ewmh
#$SCRIPTS/install ratpoison
$SCRIPTS/install openbox
#[ "$DEVTOOLS" = yes ] && $SCRIPTS/install mrxvt
[ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm
exit 0

View File

@ -107,7 +107,7 @@ cd $PKG_BUILD
make
$STRIP hw/xfree86/.libs/Xorg
$STRIP hw/xfree86/Xorg
$STRIP hw/xfree86/utils/gtf/gtf
make DESTDIR=$SYSROOT_PREFIX install

View File

@ -6,9 +6,7 @@ $SCRIPTS/install libpciaccess
$SCRIPTS/install freetype
$SCRIPTS/install libX11
$SCRIPTS/install libXfont
#$SCRIPTS/install libXinerama
$SCRIPTS/install libXv
#$SCRIPTS/install libXvMC
$SCRIPTS/install $LIBDRM
$SCRIPTS/install $MESA
$SCRIPTS/install pixman
@ -19,16 +17,13 @@ XORG_SRC="$PKG_BUILD/hw/xfree86"
XORG_DST="$INSTALL/$XORG_PATH_MODULES"
mkdir -p $INSTALL/usr/bin
cp $XORG_SRC/.libs/Xorg $INSTALL/usr/bin
cp $XORG_SRC/Xorg $INSTALL/usr/bin
ln -sf /usr/bin/Xorg $INSTALL/usr/bin/X
cp $XORG_SRC/utils/gtf/gtf $INSTALL/usr/bin
#opt:
cp $XORG_SRC/utils/cvt/cvt $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib
cp -PR $XORG_SRC/parser/.libs/libxf86config.so* $INSTALL/usr/lib
mkdir -p $XORG_DST
cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST