wok-current rev 16062
ARM: Xorg light dont build yet but we have a Kdrive Xfbdev for ARM now :-)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Mar 12 01:33:20 2014 +0100 (2014-03-12) |
| parents | ab15b09c1a91 |
| children | a2fdd7af31a2 |
| files | python/receipt xorg-server-Xfbdev/receipt xorg-server-light/receipt |
line diff
1.1 --- a/python/receipt Wed Mar 12 01:19:59 2014 +0100 1.2 +++ b/python/receipt Wed Mar 12 01:33:20 2014 +0100 1.3 @@ -19,7 +19,8 @@ 1.4 1.5 # Handle cross compilation 1.6 case "$ARCH" in 1.7 - arm*) BUILD_DEPENDS="bzip2-dev readline-dev ncursesw-dev tcl-dev" ;; 1.8 + arm*) BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev ncursesw-dev \ 1.9 +tcl-dev db-dev" ;; 1.10 esac 1.11 1.12 # Rules to configure and make the package. 1.13 @@ -32,7 +33,12 @@ 1.14 sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py 1.15 case "$ARCH" in 1.16 arm*) 1.17 - #export ac_cv_file_dev__ptmx=yes 1.18 + #ac_cv_file__dev_ptmx=no 1.19 + #ac_cv_file__dev_ptc=no 1.20 + cp -s $CONFIG_SITE . 1.21 + CONFIG_SITE="$(pwd)/cook.site" 1.22 + echo 'ac_cv_file__dev_ptmx=no' >> $CONFIG_SITE 1.23 + echo 'ac_cv_file__dev_ptc=no' >> $CONFIG_SITE 1.24 ./configure \ 1.25 --disable-ipv6 \ 1.26 --enable-shared \ 1.27 @@ -54,7 +60,7 @@ 1.28 mkdir -p $fs/usr/include/${PACKAGE}$python_version 1.29 cp -a $install/usr/bin $fs/usr 1.30 cp -a $install/usr/lib $fs/usr 1.31 - # needed for mericurial to work now 1.32 + # needed for mercurial to work now 1.33 cp -a $install/usr/include/${PACKAGE}$python_version/pyconfig.h \ 1.34 $fs/usr/include/${PACKAGE}$python_version 1.35 rm -f $fs/usr/bin/*-config
2.1 --- a/xorg-server-Xfbdev/receipt Wed Mar 12 01:19:59 2014 +0100 2.2 +++ b/xorg-server-Xfbdev/receipt Wed Mar 12 01:33:20 2014 +0100 2.3 @@ -9,15 +9,90 @@ 2.4 WANTED="xorg-server" 2.5 SOURCE="xorg-server" 2.6 WEB_SITE="http://www.x.org/" 2.7 +HOST_ARCH="i486 arm" 2.8 2.9 DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt" 2.10 2.11 +# 2.12 +# This is the default Xserver for ARM platform until full Xorg or Xorg light 2.13 +# dont cross compile nicely. Note: on the RPi the Xorg driver is fbdev so 2.14 +# using Kdrive Xfbdev is a light and fast solution. 2.15 +# 2.16 +case "$ARCH" in 2.17 + arm) 2.18 + unset WANTED 2.19 + SOURCE="xorg-server" 2.20 + TARBALL="$SOURCE-$VERSION.tar.bz2" 2.21 + WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" 2.22 + PROVIDE="xorg-server" 2.23 + BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ 2.24 +xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ 2.25 +xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ 2.26 +xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ 2.27 +xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ 2.28 +libxcb-dev bzip2-dev" 2.29 + export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 2.30 + export LIBTOOL=${HOST_SYSTEM}-libtool 2.31 + export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \ 2.32 +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 2.33 + export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \ 2.34 +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;; 2.35 +esac 2.36 + 2.37 +# Rules to configure and make the package. 2.38 +compile_rules() 2.39 +{ 2.40 + case "$ARCH" in 2.41 + arm*) 2.42 + ./configure \ 2.43 + --prefix=/usr \ 2.44 + --sysconfdir=/etc \ 2.45 + --localstatedir=/var \ 2.46 + --with-module-dir=/usr/lib/X11/modules \ 2.47 + --with-xkb-output=/var/lib/xkb \ 2.48 + --with-serverconfig-path=/etc/X11 \ 2.49 + --with-fontrootdir=/usr/share/fonts \ 2.50 + --with-os-name="SliTaz ARM" \ 2.51 + --with-vendor-web="http://arm.slitaz.org/" \ 2.52 + --with-builder-addr="$MAINTAINER" \ 2.53 + --enable-install-setuid \ 2.54 + --enable-kdrive \ 2.55 + --enable-kdrive-kbd \ 2.56 + --enable-kdrive-mouse \ 2.57 + --enable-kdrive-evdev \ 2.58 + --enable-xfbdev \ 2.59 + --disable-config-dbus \ 2.60 + --disable-config-udev \ 2.61 + --disable-screensaver \ 2.62 + --disable-glx \ 2.63 + --disable-dri \ 2.64 + --disable-dri2 \ 2.65 + --disable-xinerama \ 2.66 + --disable-libdrm \ 2.67 + --disable-xvfb \ 2.68 + --disable-xnest \ 2.69 + --disable-xephyr \ 2.70 + --disable-xfake \ 2.71 + --disable-xv \ 2.72 + --disable-xorg \ 2.73 + ${CONFIGURE_ARGS} && 2.74 + make && make install ;; 2.75 + *) 2.76 + echo "Nothing to do for: $ARCH" ;; 2.77 + esac 2.78 +} 2.79 + 2.80 # Rules to gen a SliTaz package suitable for Tazpkg. 2.81 genpkg_rules() 2.82 { 2.83 mkdir -p $fs/usr/bin 2.84 cp -a $install/usr/bin/Xfbdev $fs/usr/bin 2.85 chmod 4711 $fs/usr/bin/Xfbdev 2.86 + case "$ARCH" in 2.87 + arm) 2.88 + cp -a $install/etc $fs 2.89 + cp -a $install/var $fs ;; 2.90 + esac 2.91 } 2.92 2.93 # We need /var/tmp rw to let xkbcomp builr XKB definition.
3.1 --- a/xorg-server-light/receipt Wed Mar 12 01:19:59 2014 +0100 3.2 +++ b/xorg-server-light/receipt Wed Mar 12 01:33:20 2014 +0100 3.3 @@ -12,7 +12,7 @@ 3.4 WEB_SITE="http://www.x.org/" 3.5 WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" 3.6 PROVIDE="xorg-server" 3.7 -HOST_ARCH="i486 arm" 3.8 +#HOST_ARCH="i486 arm" 3.9 3.10 DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \ 3.11 xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \ 3.12 @@ -21,19 +21,22 @@ 3.13 xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \ 3.14 flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev" 3.15 3.16 -# Handle arch compilation 3.17 +# Handle cross compilation: ARM can't find -lmd 3.18 case "$ARCH" in 3.19 arm) 3.20 - #--disable-xf86vidmode 3.21 BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ 3.22 xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ 3.23 xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ 3.24 xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ 3.25 xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ 3.26 libxcb-dev bzip2-dev" 3.27 - ARCH_ARGS="--disable-config-udev" 3.28 - ARM_LIBS="/cross/$arch/sysroot/usr/lib" 3.29 - export LIBTOOL=${HOST_SYSTEM}-libtool ;; 3.30 + ARCH_ARGS="--disable-config-udev --disable-xf86vidmode" 3.31 + export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 3.32 + export LIBTOOL=${HOST_SYSTEM}-libtool 3.33 + export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \ 3.34 +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 3.35 + export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \ 3.36 +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;; 3.37 i?86) 3.38 ARCH_ARGS="--enable-config-udev" ;; 3.39 esac 3.40 @@ -48,12 +51,13 @@ 3.41 --with-module-dir=/usr/lib/X11/modules \ 3.42 --with-xkb-output=/var/lib/xkb \ 3.43 --with-serverconfig-path=/etc/X11 \ 3.44 + --with-fontrootdir=/usr/share/fonts \ 3.45 + --with-os-name="SliTaz GNU/Linux" \ 3.46 + --with-vendor-web="http://www.slitaz.org/" \ 3.47 + --with-builder-addr="$MAINTAINER" \ 3.48 --enable-install-setuid \ 3.49 --enable-xorg \ 3.50 --disable-config-dbus \ 3.51 - --with-fontrootdir=/usr/share/fonts \ 3.52 - --with-os-name="SliTaz GNU/Linux" \ 3.53 - --with-builder-addr=$MAINTAINER \ 3.54 --disable-screensaver \ 3.55 --disable-glx \ 3.56 --disable-dri \ 3.57 @@ -63,11 +67,9 @@ 3.58 --disable-xvfb \ 3.59 --disable-xnest \ 3.60 --disable-xfbdev \ 3.61 + --disable-xephyr \ 3.62 + --disable-xfake \ 3.63 --disable-xv \ 3.64 -XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \ 3.65 --lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \ 3.66 -XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \ 3.67 --lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \ 3.68 ${CONFIGURE_ARGS} ${ARCH_ARGS} && 3.69 make && make install 3.70 }