wok-6.x rev 16067
ARM: xorg-server-light cross compile and add more needed packages
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Mar 12 20:54:03 2014 +0100 (2014-03-12) |
| parents | 89f18ec827a9 |
| children | 00606601418e |
| files | attr/receipt giflib-dev/receipt giflib/receipt hsetroot/receipt imlib2-dev/receipt imlib2/receipt jwm/receipt kmod-dev/receipt kmod/receipt libgudev-dev/receipt libgudev/receipt udev-dev/receipt udev/receipt xorg-libXcomposite-dev/receipt xorg-libXcomposite/receipt xorg-libXfixes-dev/receipt xorg-libXfixes/receipt xorg-libXxf86vm-dev/receipt xorg-libXxf86vm/receipt xorg-server-Xfbdev/receipt xorg-server-dev/receipt xorg-server-light/receipt xorg-xclock/receipt xorg-xf86-input-evdev/receipt xorg-xf86-video-fbdev/receipt |
line diff
1.1 --- a/attr/receipt Wed Mar 12 19:55:40 2014 +0100 1.2 +++ b/attr/receipt Wed Mar 12 20:54:03 2014 +0100 1.3 @@ -44,4 +44,7 @@ 1.4 cp -a $install/usr/lib/*.so* $fs/usr/lib 1.5 cp -a $install/usr/bin $fs/usr 1.6 find $fs -type f -name '*.so*' -exec chmod a+x \{\} \; 1.7 + # Fix /usr/lib/libattr.so 1.8 + cd $fs/usr/lib 1.9 + rm libattr.so && ln -s ../../lib/libattr.so 1.10 }
2.1 --- a/giflib-dev/receipt Wed Mar 12 19:55:40 2014 +0100 2.2 +++ b/giflib-dev/receipt Wed Mar 12 20:54:03 2014 +0100 2.3 @@ -8,6 +8,7 @@ 2.4 MAINTAINER="rcx@zoominternet.net" 2.5 LICENSE="MIT" 2.6 WANTED="giflib" 2.7 +HOST_ARCH="i486 arm" 2.8 2.9 DEPENDS="giflib" 2.10
3.1 --- a/giflib/receipt Wed Mar 12 19:55:40 2014 +0100 3.2 +++ b/giflib/receipt Wed Mar 12 20:54:03 2014 +0100 3.3 @@ -9,6 +9,7 @@ 3.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 3.5 WEB_SITE="http://sourceforge.net/projects/giflib/" 3.6 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 3.7 +HOST_ARCH="i486 arm" 3.8 3.9 DEPENDS="glibc-base xorg-libSM xorg-libICE xorg-libX11 xorg-libXau \ 3.10 xorg-libXdmcp" 3.11 @@ -17,19 +18,22 @@ 3.12 # Rules to configure and make the package. 3.13 compile_rules() 3.14 { 3.15 - cd $src 3.16 sed -i '/AC_PATH_XTRA/d' configure.ac 3.17 libtoolize -f 3.18 autoreconf 3.19 ./configure \ 3.20 $CONFIGURE_ARGS && 3.21 make && make DESTDIR=$DESTDIR install 3.22 - # libungif compatibility - instructions taken from Redhat specfile 3.23 - MAJOR=`echo $VERSION | sed 's/\([0-9]\+\)\..*/\1/'` 3.24 - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.$VERSION 3.25 - install -m755 libungif.so.${VERSION} "$DESTDIR/usr/lib/" 3.26 - ln -sf libungif.so.$VERSIN "$DESTDIR/usr/lib/libungif.so.4" 3.27 - ln -sf libungif.so.4 "$DESTDIR/usr/lib/libungif.so" 3.28 + case "$ARCH" in 3.29 + i?86) 3.30 + # libungif compatibility - instructions taken from Redhat specfile 3.31 + MAJOR=`echo $VERSION | sed 's/\([0-9]\+\)\..*/\1/'` 3.32 + gcc -shared -Wl,-soname,libungif.so.${MAJOR} \ 3.33 + -Llib/.libs -lgif -o libungif.so.$VERSION 3.34 + install -m755 libungif.so.${VERSION} "$DESTDIR/usr/lib/" 3.35 + ln -sf libungif.so.$VERSIN "$DESTDIR/usr/lib/libungif.so.4" 3.36 + ln -sf libungif.so.4 "$DESTDIR/usr/lib/libungif.so" ;; 3.37 + esac 3.38 } 3.39 3.40 # Rules to gen a SliTaz package suitable for Tazpkg.
4.1 --- a/hsetroot/receipt Wed Mar 12 19:55:40 2014 +0100 4.2 +++ b/hsetroot/receipt Wed Mar 12 20:54:03 2014 +0100 4.3 @@ -10,20 +10,20 @@ 4.4 WEB_SITE="http://thegraveyard.org/hsetroot.php" 4.5 WGET_URL="http://thegraveyard.org/files/$TARBALL" 4.6 TAGS="wallpaper" 4.7 +HOST_ARCH="i486 arm" 4.8 4.9 DEPENDS="imlib2 libpng freetype xorg-libX11 xorg-libXau xorg-libXdmcp \ 4.10 xorg-libXext" 4.11 BUILD_DEPENDS="imlib2-dev libpng-dev" 4.12 4.13 +# ARM: imlib2-dev must be installed in build chroot 4.14 + 4.15 # Rules to configure and make the package. 4.16 compile_rules() 4.17 { 4.18 - cd $src 4.19 ./configure \ 4.20 - --prefix=/usr \ 4.21 $CONFIGURE_ARGS && 4.22 - make && 4.23 - make DESTDIR=$DESTDIR install 4.24 + make && make install 4.25 } 4.26 4.27 # Rules to gen a SliTaz package suitable for Tazpkg.
5.1 --- a/imlib2-dev/receipt Wed Mar 12 19:55:40 2014 +0100 5.2 +++ b/imlib2-dev/receipt Wed Mar 12 20:54:03 2014 +0100 5.3 @@ -8,6 +8,7 @@ 5.4 LICENSE="GPL LGPL2" 5.5 WANTED="imlib2" 5.6 WEB_SITE="http://sourceforge.net/projects/enlightenment/" 5.7 +HOST_ARCH="i486 arm" 5.8 5.9 DEPENDS="imlib2 pkg-config" 5.10
6.1 --- a/imlib2/receipt Wed Mar 12 19:55:40 2014 +0100 6.2 +++ b/imlib2/receipt Wed Mar 12 20:54:03 2014 +0100 6.3 @@ -9,18 +9,21 @@ 6.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 6.5 WEB_SITE="http://sourceforge.net/projects/enlightenment/" 6.6 WGET_URL="$SF_MIRROR/enlightenment/$TARBALL" 6.7 +HOST_ARCH="i486 arm" 6.8 6.9 DEPENDS="libpng tiff jpeg xorg-libXpm bzlib freetype libid3tag \ 6.10 xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext giflib xorg-libSM \ 6.11 xorg-libICE" 6.12 BUILD_DEPENDS="libpng-dev tiff-dev jpeg-dev giflib-dev bzip2-dev \ 6.13 -xorg-libXpm-dev xorg-xextproto libid3tag-dev xorg-dev pkg-config \ 6.14 -freetype-dev zlib-dev util-linux-uuid-dev" 6.15 +xorg-libXpm-dev xorg-xextproto libid3tag-dev pkg-config freetype-dev \ 6.16 +zlib-dev util-linux-uuid-dev" 6.17 + 6.18 +# ARM: jpeg-dev must be installed in build chroot and libjpeg.la must 6.19 +# be modified manually 6.20 6.21 # Rules to configure and make the package. 6.22 compile_rules() 6.23 { 6.24 - cd $src 6.25 ./configure \ 6.26 --prefix=/usr \ 6.27 --infodir=/usr/share/info \
7.1 --- a/jwm/receipt Wed Mar 12 19:55:40 2014 +0100 7.2 +++ b/jwm/receipt Wed Mar 12 20:54:03 2014 +0100 7.3 @@ -10,11 +10,17 @@ 7.4 WEB_SITE="http://www.joewing.net/programs/jwm/" 7.5 WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL" 7.6 TAGS="wm window-manager" 7.7 +HOST_ARCH="i486 arm" 7.8 7.9 DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \ 7.10 xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \ 7.11 libpng slitaz-configs-base xorg-xload xorg-xclock nano imlib2 hsetroot compton" 7.12 -BUILD_DEPENDS="xorg-dev xorg-libXft-dev jpeg-dev libpng-dev" 7.13 +BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng-dev" 7.14 + 7.15 +# Handle cross compilation 7.16 +case "$ARCH" in 7.17 + arm) ARCH_ARGS="--disable-nls" ;; 7.18 +esac 7.19 7.20 # Rules to configure and make the package. 7.21 compile_rules() 7.22 @@ -26,11 +32,18 @@ 7.23 --mandir=/usr/share/man \ 7.24 --sysconfdir=/etc/xdg/jwm \ 7.25 --disable-fribidi \ 7.26 - $CONFIGURE_ARGS 2>&1 | \ 7.27 - sed 's/config.rpath: No such/config.rpath: no such/' && 7.28 + --disable-rpath \ 7.29 + --disable-rsvg \ 7.30 + --disable-confirm \ 7.31 + $CONFIGURE_ARGS $ARCH_ARGS 2>/dev/null && 7.32 make && make install 7.33 } 7.34 7.35 +testsuite() 7.36 +{ 7.37 + readelf -h $install/usr/bin/jwm 7.38 +} 7.39 + 7.40 # Rules to gen a SliTaz package suitable for Tazpkg. 7.41 genpkg_rules() 7.42 {
8.1 --- a/kmod-dev/receipt Wed Mar 12 19:55:40 2014 +0100 8.2 +++ b/kmod-dev/receipt Wed Mar 12 20:54:03 2014 +0100 8.3 @@ -1,13 +1,14 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="kmod-dev" 8.7 -VERSION="14" 8.8 +VERSION="16" 8.9 CATEGORY="development" 8.10 SHORT_DESC="Kmod devel files." 8.11 MAINTAINER="pankso@slitaz.org" 8.12 LICENSE="GPL2" 8.13 WANTED="kmod" 8.14 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/" 8.15 +HOST_ARCH="i486 arm" 8.16 8.17 DEPENDS="kmod liblzma-dev pkg-config" 8.18 8.19 @@ -15,7 +16,7 @@ 8.20 genpkg_rules() 8.21 { 8.22 mkdir -p $fs/lib $fs/usr/lib 8.23 - cp -a $install/lib/*.*a $fs/lib 8.24 + cp -a $install/usr/lib/*.*a $fs/usr/lib 8.25 cp -a $install/usr/lib/pkgconfig $fs/usr/lib 8.26 cp -a $install/usr/include $fs/usr 8.27 }
9.1 --- a/kmod/receipt Wed Mar 12 19:55:40 2014 +0100 9.2 +++ b/kmod/receipt Wed Mar 12 20:54:03 2014 +0100 9.3 @@ -10,14 +10,19 @@ 9.4 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/" 9.5 WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/$TARBALL" 9.6 PROVIDE="modules-init-tools" 9.7 +HOST_ARCH="i486 arm" 9.8 9.9 DEPENDS="zlib liblzma" 9.10 BUILD_DEPENDS="zlib-dev liblzma-dev tar" 9.11 9.12 +# Handle cross compilation. ARM use build host: tar 9.13 +case "$ARCH" in 9.14 + arm) BUILD_DEPENDS="zlib-dev liblzma-dev" ;; 9.15 +esac 9.16 + 9.17 # Rules to configure and make the package. 9.18 compile_rules() 9.19 { 9.20 - cd $src 9.21 ./configure \ 9.22 --bindir=/sbin \ 9.23 --with-rootlibdir=/lib \ 9.24 @@ -32,9 +37,11 @@ 9.25 # Rules to gen a SliTaz package suitable for Tazpkg. 9.26 genpkg_rules() 9.27 { 9.28 - mkdir -p $fs/lib $fs/bin 9.29 + mkdir -p $fs/lib $fs/bin $fs/usr/lib 9.30 + cp -a $install/sbin $fs 9.31 cp -a $install/lib/*.so* $fs/lib 9.32 - cp -a $install/sbin $fs 9.33 + cp -a $install/usr/lib/*.so* $fs/usr/lib 9.34 + 9.35 cd $fs/sbin 9.36 # The kmod tools symlinks 9.37 for tool in rmmod insmod modinfo modprobe depmod
10.1 --- a/libgudev-dev/receipt Wed Mar 12 19:55:40 2014 +0100 10.2 +++ b/libgudev-dev/receipt Wed Mar 12 20:54:03 2014 +0100 10.3 @@ -8,6 +8,7 @@ 10.4 LICENSE="GPL2" 10.5 WANTED="udev" 10.6 WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" 10.7 +HOST_ARCH="i486 arm" 10.8 10.9 DEPENDS="udev udev-dev pkg-config" 10.10
11.1 --- a/libgudev/receipt Wed Mar 12 19:55:40 2014 +0100 11.2 +++ b/libgudev/receipt Wed Mar 12 20:54:03 2014 +0100 11.3 @@ -8,6 +8,7 @@ 11.4 LICENSE="GPL2" 11.5 WANTED="udev" 11.6 WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" 11.7 +HOST_ARCH="i486 arm" 11.8 11.9 DEPENDS="udev" 11.10
12.1 --- a/udev-dev/receipt Wed Mar 12 19:55:40 2014 +0100 12.2 +++ b/udev-dev/receipt Wed Mar 12 20:54:03 2014 +0100 12.3 @@ -8,6 +8,7 @@ 12.4 LICENSE="GPL2" 12.5 WANTED="udev" 12.6 WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" 12.7 +HOST_ARCH="i486 arm" 12.8 12.9 DEPENDS="udev pkg-config" 12.10
13.1 --- a/udev/receipt Wed Mar 12 19:55:40 2014 +0100 13.2 +++ b/udev/receipt Wed Mar 12 20:54:03 2014 +0100 13.3 @@ -10,16 +10,30 @@ 13.4 TARBALL="$PACKAGE-$VERSION.tar.xz" 13.5 WEB_SITE="http://www.freedesktop.org/software/systemd/man/udev.html" 13.6 WGET_URL="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$TARBALL" 13.7 +HOST_ARCH="i486 arm" 13.8 13.9 DEPENDS="util-linux-blkid pciids usbids acl kmod" 13.10 BUILD_DEPENDS="util-linux-blkid-dev gperf pkg-config pciutils acl-dev \ 13.11 libgio-dev usbutils-dev libusb-dev glib-dev pciids usbids kmod-dev \ 13.12 libgudev-dev pcre-dev liblzma-dev util-linux-uuid-dev" 13.13 13.14 +# Use build host: gperf 13.15 +BUILD_DEPENDS="util-linux-blkid-dev kmod-dev acl-dev glib-dev" 13.16 + 13.17 # Rules to configure and make the package. 13.18 compile_rules() 13.19 { 13.20 - cd $src 13.21 + case "$ARCH" in 13.22 + arm*) 13.23 + # ARM Hack 13.24 + for la in libgthread-2.0.la libglib-2.0.la 13.25 + do 13.26 + if grep -q "^libdir='/usr/lib'" /usr/lib/${la}; then 13.27 + sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \ 13.28 + /usr/lib/${la} 13.29 + fi 13.30 + done ;; 13.31 + esac 13.32 ./configure \ 13.33 --exec-prefix="" \ 13.34 --with-rootprefix="" \
14.1 --- a/xorg-libXcomposite-dev/receipt Wed Mar 12 19:55:40 2014 +0100 14.2 +++ b/xorg-libXcomposite-dev/receipt Wed Mar 12 20:54:03 2014 +0100 14.3 @@ -7,6 +7,7 @@ 14.4 MAINTAINER="pankso@slitaz.org" 14.5 LICENSE="other" 14.6 WEB_SITE="http://www.x.org/" 14.7 +HOST_ARCH="i486 arm" 14.8 14.9 WANTED="xorg-libXcomposite" 14.10 DEPENDS="xorg-libXcomposite xorg-compositeproto xorg-libXfixes-dev pkg-config"
15.1 --- a/xorg-libXcomposite/receipt Wed Mar 12 19:55:40 2014 +0100 15.2 +++ b/xorg-libXcomposite/receipt Wed Mar 12 20:54:03 2014 +0100 15.3 @@ -10,6 +10,7 @@ 15.4 SOURCE="libXcomposite" 15.5 TARBALL="$SOURCE-$VERSION.tar.bz2" 15.6 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 15.7 +HOST_ARCH="i486 arm" 15.8 15.9 DEPENDS="xorg-libX11" 15.10 BUILD_DEPENDS="xorg-compositeproto xorg-libXfixes-dev"
16.1 --- a/xorg-libXfixes-dev/receipt Wed Mar 12 19:55:40 2014 +0100 16.2 +++ b/xorg-libXfixes-dev/receipt Wed Mar 12 20:54:03 2014 +0100 16.3 @@ -7,6 +7,7 @@ 16.4 MAINTAINER="pankso@slitaz.org" 16.5 LICENSE="other" 16.6 WEB_SITE="http://www.x.org/" 16.7 +HOST_ARCH="i486 arm" 16.8 16.9 WANTED="xorg-libXfixes" 16.10 DEPENDS="xorg-libXfixes xorg-fixesproto xorg-libX11-dev pkg-config"
17.1 --- a/xorg-libXfixes/receipt Wed Mar 12 19:55:40 2014 +0100 17.2 +++ b/xorg-libXfixes/receipt Wed Mar 12 20:54:03 2014 +0100 17.3 @@ -10,6 +10,7 @@ 17.4 SOURCE="libXfixes" 17.5 TARBALL="$SOURCE-$VERSION.tar.bz2" 17.6 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 17.7 +HOST_ARCH="i486 arm" 17.8 17.9 DEPENDS="xorg-libX11" 17.10 BUILD_DEPENDS="xorg-fixesproto xorg-libX11-dev"
18.1 --- a/xorg-libXxf86vm-dev/receipt Wed Mar 12 19:55:40 2014 +0100 18.2 +++ b/xorg-libXxf86vm-dev/receipt Wed Mar 12 20:54:03 2014 +0100 18.3 @@ -9,6 +9,7 @@ 18.4 WANTED="xorg-libXxf86vm" 18.5 SOURCE="libXxf86vm" 18.6 WEB_SITE="http://www.x.org/" 18.7 +HOST_ARCH="i486 arm" 18.8 18.9 DEPENDS="xorg-libXxf86vm xorg-libXext-dev xorg-xf86vidmodeproto pkg-config" 18.10
19.1 --- a/xorg-libXxf86vm/receipt Wed Mar 12 19:55:40 2014 +0100 19.2 +++ b/xorg-libXxf86vm/receipt Wed Mar 12 20:54:03 2014 +0100 19.3 @@ -10,7 +10,7 @@ 19.4 TARBALL="$SOURCE-$VERSION.tar.bz2" 19.5 WEB_SITE="http://www.x.org/" 19.6 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 19.7 -#HOST_ARCH="i486 arm" 19.8 +HOST_ARCH="i486 arm" 19.9 19.10 DEPENDS="xorg-libX11 xorg-libXext" 19.11 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-xf86vidmodeproto"
20.1 --- a/xorg-server-Xfbdev/receipt Wed Mar 12 19:55:40 2014 +0100 20.2 +++ b/xorg-server-Xfbdev/receipt Wed Mar 12 20:54:03 2014 +0100 20.3 @@ -9,91 +9,17 @@ 20.4 WANTED="xorg-server" 20.5 SOURCE="xorg-server" 20.6 WEB_SITE="http://www.x.org/" 20.7 -HOST_ARCH="i486 arm" 20.8 +HOST_ARCH="i486" 20.9 20.10 DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \ 20.11 xorg-libxkbfile xorg-xkeyboard-config" 20.12 20.13 -# 20.14 -# This is the default Xserver for ARM platform until full Xorg or Xorg light 20.15 -# dont cross compile nicely. Note: on the RPi the Xorg driver is fbdev so 20.16 -# using Kdrive Xfbdev is a light and fast solution. 20.17 -# 20.18 -case "$ARCH" in 20.19 - arm) 20.20 - unset WANTED 20.21 - SOURCE="xorg-server" 20.22 - TARBALL="$SOURCE-$VERSION.tar.bz2" 20.23 - WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" 20.24 - PROVIDE="xorg-server" 20.25 - BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ 20.26 -xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ 20.27 -xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ 20.28 -xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ 20.29 -xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ 20.30 -libxcb-dev bzip2-dev" 20.31 - export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 20.32 - export LIBTOOL=${HOST_SYSTEM}-libtool 20.33 - export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \ 20.34 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 20.35 - export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \ 20.36 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;; 20.37 -esac 20.38 - 20.39 -# Rules to configure and make the package. 20.40 -compile_rules() 20.41 -{ 20.42 - case "$ARCH" in 20.43 - arm*) 20.44 - ./configure \ 20.45 - --prefix=/usr \ 20.46 - --sysconfdir=/etc \ 20.47 - --localstatedir=/var \ 20.48 - --with-module-dir=/usr/lib/X11/modules \ 20.49 - --with-xkb-output=/var/lib/xkb \ 20.50 - --with-serverconfig-path=/etc/X11 \ 20.51 - --with-fontrootdir=/usr/share/fonts \ 20.52 - --with-os-name="SliTaz ARM" \ 20.53 - --with-vendor-web="http://arm.slitaz.org/" \ 20.54 - --with-builder-addr="$MAINTAINER" \ 20.55 - --enable-install-setuid \ 20.56 - --enable-kdrive \ 20.57 - --enable-kdrive-kbd \ 20.58 - --enable-kdrive-mouse \ 20.59 - --enable-kdrive-evdev \ 20.60 - --enable-xfbdev \ 20.61 - --disable-config-dbus \ 20.62 - --disable-config-udev \ 20.63 - --disable-screensaver \ 20.64 - --disable-glx \ 20.65 - --disable-dri \ 20.66 - --disable-dri2 \ 20.67 - --disable-xinerama \ 20.68 - --disable-libdrm \ 20.69 - --disable-xvfb \ 20.70 - --disable-xnest \ 20.71 - --disable-xephyr \ 20.72 - --disable-xfake \ 20.73 - --disable-xv \ 20.74 - --disable-xorg \ 20.75 - ${CONFIGURE_ARGS} && 20.76 - make && make install ;; 20.77 - *) 20.78 - echo "Nothing to do for: $ARCH" ;; 20.79 - esac 20.80 -} 20.81 - 20.82 # Rules to gen a SliTaz package suitable for Tazpkg. 20.83 genpkg_rules() 20.84 { 20.85 mkdir -p $fs/usr/bin 20.86 cp -a $install/usr/bin/Xfbdev $fs/usr/bin 20.87 chmod 4711 $fs/usr/bin/Xfbdev 20.88 - case "$ARCH" in 20.89 - arm) 20.90 - cp -a $install/etc $fs 20.91 - cp -a $install/var $fs ;; 20.92 - esac 20.93 } 20.94 20.95 # We need /var/tmp rw to let xkbcomp builr XKB definition.
21.1 --- a/xorg-server-dev/receipt Wed Mar 12 19:55:40 2014 +0100 21.2 +++ b/xorg-server-dev/receipt Wed Mar 12 20:54:03 2014 +0100 21.3 @@ -6,8 +6,8 @@ 21.4 SHORT_DESC="Xorg server devel files needed to build drivers." 21.5 MAINTAINER="pankso@slitaz.org" 21.6 LICENSE="MIT" 21.7 -WANTED="xorg-server" 21.8 WEB_SITE="http://www.x.org/" 21.9 +HOST_ARCH="i486 arm" 21.10 21.11 DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \ 21.12 xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config \ 21.13 @@ -18,6 +18,15 @@ 21.14 xorg-fontcacheproto xorg-printproto xorg-resourceproto xorg-xineramaproto \ 21.15 xorg-xf86bigfontproto xorg-xf86miscproto xorg-trapproto" 21.16 21.17 +# Use devel files from ARCH default Xserver 21.18 +case "$ARCH" in 21.19 + i?86) 21.20 + WANTED="xorg-server" ;; 21.21 + arm) 21.22 + WANTED="xorg-server-light" 21.23 + DEPENDS="" ;; 21.24 +esac 21.25 + 21.26 # Rules to gen a SliTaz package suitable for Tazpkg. 21.27 genpkg_rules() 21.28 {
22.1 --- a/xorg-server-light/receipt Wed Mar 12 19:55:40 2014 +0100 22.2 +++ b/xorg-server-light/receipt Wed Mar 12 20:54:03 2014 +0100 22.3 @@ -1,44 +1,47 @@ 22.4 # SliTaz package receipt. 22.5 22.6 PACKAGE="xorg-server-light" 22.7 -VERSION="1.12.4" 22.8 +VERSION="1.12.1" 22.9 CATEGORY="x-window" 22.10 SHORT_DESC="Xorg core server light version (no dri, gl, and friends)." 22.11 MAINTAINER="pankso@slitaz.org" 22.12 LICENSE="MIT" 22.13 -SUGGESTED="xorg-xf86-video-vesa" 22.14 SOURCE="xorg-server" 22.15 TARBALL="$SOURCE-$VERSION.tar.bz2" 22.16 WEB_SITE="http://www.x.org/" 22.17 WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" 22.18 PROVIDE="xorg-server" 22.19 -#HOST_ARCH="i486 arm" 22.20 +HOST_ARCH="i486 arm" 22.21 22.22 +SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev" 22.23 DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \ 22.24 -xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \ 22.25 -xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb bzip2" 22.26 -BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \ 22.27 -xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \ 22.28 -flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev" 22.29 - 22.30 -# Handle cross compilation: ARM can't find -lmd 22.31 -case "$ARCH" in 22.32 - arm) 22.33 - BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ 22.34 +xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman \ 22.35 +xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb \ 22.36 +xorg-libXcomposite bzip2" 22.37 +BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ 22.38 xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ 22.39 xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ 22.40 xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ 22.41 xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ 22.42 -libxcb-dev bzip2-dev" 22.43 - ARCH_ARGS="--disable-config-udev --disable-xf86vidmode" 22.44 - export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 22.45 - export LIBTOOL=${HOST_SYSTEM}-libtool 22.46 - export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \ 22.47 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 22.48 - export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \ 22.49 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;; 22.50 +libxcb-dev xorg-libXcomposite-dev xorg-libXxf86vm-dev bzip2-dev" 22.51 + 22.52 +# Handle arch installation 22.53 +case "$SLITAZ_ARCH" in 22.54 + i?86) DEPENDS="$DEPENDS udev" ;; 22.55 +esac 22.56 + 22.57 +# Handle cross compilation. ARM use build host: perl flex 22.58 +case "$ARCH" in 22.59 + arm) 22.60 + #--disable-static 22.61 + ARCH_ARGS="--disable-config-udev --enable-malloc0returnsnull" 22.62 + OS_NAME="SliTaz ARM" 22.63 + VENDOR="http://arm.slitaz.org" ;; 22.64 i?86) 22.65 - ARCH_ARGS="--enable-config-udev" ;; 22.66 + BUILD_DEPENDS="$BUILD_DEPENDS perl flex udev-dev" 22.67 + ARCH_ARGS="--enable-config-udev" 22.68 + OS_NAME="SliTaz GNU/Linux" 22.69 + VENDOR="http://www.slitaz.org" ;; 22.70 esac 22.71 22.72 # Rules to configure and make the package. 22.73 @@ -52,8 +55,8 @@ 22.74 --with-xkb-output=/var/lib/xkb \ 22.75 --with-serverconfig-path=/etc/X11 \ 22.76 --with-fontrootdir=/usr/share/fonts \ 22.77 - --with-os-name="SliTaz GNU/Linux" \ 22.78 - --with-vendor-web="http://www.slitaz.org/" \ 22.79 + --with-os-name="$OS_NAME" \ 22.80 + --with-vendor-web="$VENDOR" \ 22.81 --with-builder-addr="$MAINTAINER" \ 22.82 --enable-install-setuid \ 22.83 --enable-xorg \ 22.84 @@ -70,10 +73,19 @@ 22.85 --disable-xephyr \ 22.86 --disable-xfake \ 22.87 --disable-xv \ 22.88 + --disable-ipv6 \ 22.89 + --disable-docs \ 22.90 + --disable-devel-docs \ 22.91 ${CONFIGURE_ARGS} ${ARCH_ARGS} && 22.92 make && make install 22.93 } 22.94 22.95 +# Be sure it as cross compile 22.96 +testsuite() 22.97 +{ 22.98 + readelf -h $install/usr/bin/Xorg 22.99 +} 22.100 + 22.101 # Rules to gen a SliTaz package suitable for Tazpkg. 22.102 genpkg_rules() 22.103 {
23.1 --- a/xorg-xclock/receipt Wed Mar 12 19:55:40 2014 +0100 23.2 +++ b/xorg-xclock/receipt Wed Mar 12 20:54:03 2014 +0100 23.3 @@ -10,6 +10,7 @@ 23.4 TARBALL="$SOURCE-$VERSION.tar.bz2" 23.5 WEB_SITE="http://www.x.org/" 23.6 WGET_URL="$XORG_MIRROR/app/$TARBALL" 23.7 +HOST_ARCH="i486 arm" 23.8 23.9 DEPENDS="xorg-libxkbfile xorg-libXft xorg-libXmu xorg-libXaw zlib" 23.10 BUILD_DEPENDS="xorg-libXft-dev xorg-libXmu-dev xorg-libXaw-dev" 23.11 @@ -17,7 +18,6 @@ 23.12 # Rules to configure and make the package. 23.13 compile_rules() 23.14 { 23.15 - cd $src 23.16 ./configure \ 23.17 --mandir=/usr/share/man \ 23.18 $CONFIGURE_ARGS &&
24.1 --- a/xorg-xf86-input-evdev/receipt Wed Mar 12 19:55:40 2014 +0100 24.2 +++ b/xorg-xf86-input-evdev/receipt Wed Mar 12 20:54:03 2014 +0100 24.3 @@ -10,17 +10,22 @@ 24.4 TARBALL="$SOURCE-$VERSION.tar.bz2" 24.5 WEB_SITE="http://www.x.org/" 24.6 WGET_URL="$XORG_MIRROR/driver/$TARBALL" 24.7 +HOST_ARCH="i486 arm" 24.8 24.9 # We can use xorg-server-light with evdev and vesa driver. 24.10 #DEPENDS="xorg-server" 24.11 -BUILD_DEPENDS="xorg-server-dev" 24.12 +BUILD_DEPENDS="xorg-server-dev udev-dev" 24.13 24.14 MODS='/usr/lib/X11/modules' 24.15 24.16 +# ARM use build system xorg-server-dev or manually install it in sysroot 24.17 +case "$ARCH" in 24.18 + arm) BUILD_DEPENDS="udev-dev" ;; 24.19 +esac 24.20 + 24.21 # Rules to configure and make the package. 24.22 compile_rules() 24.23 { 24.24 - cd $src 24.25 ./configure \ 24.26 --sysconfdir=/etc \ 24.27 --localstatedir=/var \
25.1 --- a/xorg-xf86-video-fbdev/receipt Wed Mar 12 19:55:40 2014 +0100 25.2 +++ b/xorg-xf86-video-fbdev/receipt Wed Mar 12 20:54:03 2014 +0100 25.3 @@ -10,15 +10,20 @@ 25.4 TARBALL="$SOURCE-$VERSION.tar.bz2" 25.5 WEB_SITE="http://www.x.org/" 25.6 WGET_URL="$XORG_MIRROR/driver/$TARBALL" 25.7 +HOST_ARCH="i486 arm" 25.8 25.9 -# We can use xorg-server-light with evdev and vesa driver. 25.10 +# We can use xorg-server-light with evdev and fbdev driver. 25.11 #DEPENDS="xorg-server" 25.12 BUILD_DEPENDS="xorg-server-dev" 25.13 25.14 +# ARM use build system xorg-server-dev or manually install it in sysroot 25.15 +case "$ARCH" in 25.16 + arm) BUILD_DEPENDS="" ;; 25.17 +esac 25.18 + 25.19 # Rules to configure and make the package. 25.20 compile_rules() 25.21 { 25.22 - cd $src 25.23 ./configure \ 25.24 --prefix=/usr \ 25.25 --sysconfdir=/etc \