# HG changeset patch # User Christophe Lincoln # Date 1394584400 -3600 # Node ID a29085892eee4407ff13d02b06da7f801c07e93d # Parent ab15b09c1a91fac5ff1cb69fb21da550443214f8 ARM: Xorg light dont build yet but we have a Kdrive Xfbdev for ARM now :-) diff -r ab15b09c1a91 -r a29085892eee python/receipt --- a/python/receipt Wed Mar 12 01:19:59 2014 +0100 +++ b/python/receipt Wed Mar 12 01:33:20 2014 +0100 @@ -19,7 +19,8 @@ # Handle cross compilation case "$ARCH" in - arm*) BUILD_DEPENDS="bzip2-dev readline-dev ncursesw-dev tcl-dev" ;; + arm*) BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev ncursesw-dev \ +tcl-dev db-dev" ;; esac # Rules to configure and make the package. @@ -32,7 +33,12 @@ sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py case "$ARCH" in arm*) - #export ac_cv_file_dev__ptmx=yes + #ac_cv_file__dev_ptmx=no + #ac_cv_file__dev_ptc=no + cp -s $CONFIG_SITE . + CONFIG_SITE="$(pwd)/cook.site" + echo 'ac_cv_file__dev_ptmx=no' >> $CONFIG_SITE + echo 'ac_cv_file__dev_ptc=no' >> $CONFIG_SITE ./configure \ --disable-ipv6 \ --enable-shared \ @@ -54,7 +60,7 @@ mkdir -p $fs/usr/include/${PACKAGE}$python_version cp -a $install/usr/bin $fs/usr cp -a $install/usr/lib $fs/usr - # needed for mericurial to work now + # needed for mercurial to work now cp -a $install/usr/include/${PACKAGE}$python_version/pyconfig.h \ $fs/usr/include/${PACKAGE}$python_version rm -f $fs/usr/bin/*-config diff -r ab15b09c1a91 -r a29085892eee xorg-server-Xfbdev/receipt --- a/xorg-server-Xfbdev/receipt Wed Mar 12 01:19:59 2014 +0100 +++ b/xorg-server-Xfbdev/receipt Wed Mar 12 01:33:20 2014 +0100 @@ -9,15 +9,90 @@ WANTED="xorg-server" SOURCE="xorg-server" WEB_SITE="http://www.x.org/" +HOST_ARCH="i486 arm" DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt" +# +# This is the default Xserver for ARM platform until full Xorg or Xorg light +# dont cross compile nicely. Note: on the RPi the Xorg driver is fbdev so +# using Kdrive Xfbdev is a light and fast solution. +# +case "$ARCH" in + arm) + unset WANTED + SOURCE="xorg-server" + TARBALL="$SOURCE-$VERSION.tar.bz2" + WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" + PROVIDE="xorg-server" + BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ +xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ +xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ +xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ +xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ +libxcb-dev bzip2-dev" + export ARM_LIBS="/cross/$arch/sysroot/usr/lib" + export LIBTOOL=${HOST_SYSTEM}-libtool + export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \ +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" + export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \ +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;; +esac + +# Rules to configure and make the package. +compile_rules() +{ + case "$ARCH" in + arm*) + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-module-dir=/usr/lib/X11/modules \ + --with-xkb-output=/var/lib/xkb \ + --with-serverconfig-path=/etc/X11 \ + --with-fontrootdir=/usr/share/fonts \ + --with-os-name="SliTaz ARM" \ + --with-vendor-web="http://arm.slitaz.org/" \ + --with-builder-addr="$MAINTAINER" \ + --enable-install-setuid \ + --enable-kdrive \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ + --enable-kdrive-evdev \ + --enable-xfbdev \ + --disable-config-dbus \ + --disable-config-udev \ + --disable-screensaver \ + --disable-glx \ + --disable-dri \ + --disable-dri2 \ + --disable-xinerama \ + --disable-libdrm \ + --disable-xvfb \ + --disable-xnest \ + --disable-xephyr \ + --disable-xfake \ + --disable-xv \ + --disable-xorg \ + ${CONFIGURE_ARGS} && + make && make install ;; + *) + echo "Nothing to do for: $ARCH" ;; + esac +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin cp -a $install/usr/bin/Xfbdev $fs/usr/bin chmod 4711 $fs/usr/bin/Xfbdev + case "$ARCH" in + arm) + cp -a $install/etc $fs + cp -a $install/var $fs ;; + esac } # We need /var/tmp rw to let xkbcomp builr XKB definition. diff -r ab15b09c1a91 -r a29085892eee xorg-server-light/receipt --- a/xorg-server-light/receipt Wed Mar 12 01:19:59 2014 +0100 +++ b/xorg-server-light/receipt Wed Mar 12 01:33:20 2014 +0100 @@ -12,7 +12,7 @@ WEB_SITE="http://www.x.org/" WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" PROVIDE="xorg-server" -HOST_ARCH="i486 arm" +#HOST_ARCH="i486 arm" DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \ xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \ @@ -21,19 +21,22 @@ xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \ flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev" -# Handle arch compilation +# Handle cross compilation: ARM can't find -lmd case "$ARCH" in arm) - #--disable-xf86vidmode BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ libxcb-dev bzip2-dev" - ARCH_ARGS="--disable-config-udev" - ARM_LIBS="/cross/$arch/sysroot/usr/lib" - export LIBTOOL=${HOST_SYSTEM}-libtool ;; + ARCH_ARGS="--disable-config-udev --disable-xf86vidmode" + export ARM_LIBS="/cross/$arch/sysroot/usr/lib" + export LIBTOOL=${HOST_SYSTEM}-libtool + export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \ +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" + export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \ +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;; i?86) ARCH_ARGS="--enable-config-udev" ;; esac @@ -48,12 +51,13 @@ --with-module-dir=/usr/lib/X11/modules \ --with-xkb-output=/var/lib/xkb \ --with-serverconfig-path=/etc/X11 \ + --with-fontrootdir=/usr/share/fonts \ + --with-os-name="SliTaz GNU/Linux" \ + --with-vendor-web="http://www.slitaz.org/" \ + --with-builder-addr="$MAINTAINER" \ --enable-install-setuid \ --enable-xorg \ --disable-config-dbus \ - --with-fontrootdir=/usr/share/fonts \ - --with-os-name="SliTaz GNU/Linux" \ - --with-builder-addr=$MAINTAINER \ --disable-screensaver \ --disable-glx \ --disable-dri \ @@ -63,11 +67,9 @@ --disable-xvfb \ --disable-xnest \ --disable-xfbdev \ + --disable-xephyr \ + --disable-xfake \ --disable-xv \ -XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \ --lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \ -XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \ --lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \ ${CONFIGURE_ARGS} ${ARCH_ARGS} && make && make install }