wok-next rev 16064

ARM: add a bunch of packages including Xterm
author Christophe Lincoln <pankso@slitaz.org>
date Wed Mar 12 03:53:08 2014 +0100 (2014-03-12)
parents a2fdd7af31a2
children e80d114e6087
files xorg-libSM-dev/receipt xorg-libSM/receipt xorg-libXaw-dev/receipt xorg-libXaw/receipt xorg-libXext-dev/receipt xorg-libXext/receipt xorg-libXft-dev/receipt xorg-libXft/receipt xorg-libXmu-dev/receipt xorg-libXmu/receipt xorg-libXpm-dev/receipt xorg-libXpm/receipt xorg-libXrender-dev/receipt xorg-libXrender/receipt xorg-libXt-dev/receipt xorg-libXt/receipt xorg-server-Xfbdev/receipt xorg-xkeyboard-config/receipt xorg-xload/receipt xterm/receipt
line diff
     1.1 --- a/xorg-libSM-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
     1.2 +++ b/xorg-libSM-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
     1.3 @@ -7,6 +7,7 @@
     1.4  MAINTAINER="pankso@slitaz.org"
     1.5  LICENSE="other"
     1.6  WEB_SITE="http://www.x.org/"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  WANTED="xorg-libSM"
    1.10  DEPENDS="xorg-libSM xorg-libICE-dev pkg-config"
     2.1 --- a/xorg-libSM/receipt	Wed Mar 12 03:49:35 2014 +0100
     2.2 +++ b/xorg-libSM/receipt	Wed Mar 12 03:53:08 2014 +0100
     2.3 @@ -10,6 +10,7 @@
     2.4  SOURCE="libSM"
     2.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
     2.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     2.7 +HOST_ARCH="i486 arm"
     2.8  
     2.9  DEPENDS="util-linux-uuid xorg-libICE"
    2.10  BUILD_DEPENDS="xorg-libICE-dev xorg-xtrans util-linux-uuid-dev"
     3.1 --- a/xorg-libXaw-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
     3.2 +++ b/xorg-libXaw-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
     3.3 @@ -7,6 +7,7 @@
     3.4  MAINTAINER="pankso@slitaz.org"
     3.5  LICENSE="other"
     3.6  WEB_SITE="http://www.x.org/"
     3.7 +HOST_ARCH="i486 arm"
     3.8  
     3.9  WANTED="xorg-libXaw"
    3.10  DEPENDS="xorg-libXaw xorg-libXmu-dev xorg-libXpm-dev pkg-config"
     4.1 --- a/xorg-libXaw/receipt	Wed Mar 12 03:49:35 2014 +0100
     4.2 +++ b/xorg-libXaw/receipt	Wed Mar 12 03:53:08 2014 +0100
     4.3 @@ -10,6 +10,7 @@
     4.4  SOURCE="libXaw"
     4.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
     4.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     4.7 +HOST_ARCH="i486 arm"
     4.8  
     4.9  DEPENDS="xorg-libXmu xorg-libXpm"
    4.10  BUILD_DEPENDS="xorg-libXmu-dev xorg-libXpm-dev util-linux-uuid-dev"
     5.1 --- a/xorg-libXext-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
     5.2 +++ b/xorg-libXext-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
     5.3 @@ -7,6 +7,7 @@
     5.4  MAINTAINER="pankso@slitaz.org"
     5.5  LICENSE="other"
     5.6  WEB_SITE="http://www.x.org/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  WANTED="xorg-libXext"
    5.10  DEPENDS="xorg-libXext xorg-libX11-dev pkg-config"
     6.1 --- a/xorg-libXext/receipt	Wed Mar 12 03:49:35 2014 +0100
     6.2 +++ b/xorg-libXext/receipt	Wed Mar 12 03:53:08 2014 +0100
     6.3 @@ -10,7 +10,7 @@
     6.4  SOURCE="libXext"
     6.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
     6.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     6.7 -#HOST_ARCH="i486 arm"
     6.8 +HOST_ARCH="i486 arm"
     6.9  
    6.10  DEPENDS="xorg-libX11"
    6.11  BUILD_DEPENDS="xorg-libX11-dev"
     7.1 --- a/xorg-libXft-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
     7.2 +++ b/xorg-libXft-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
     7.3 @@ -7,6 +7,7 @@
     7.4  MAINTAINER="pankso@slitaz.org"
     7.5  LICENSE="other"
     7.6  WEB_SITE="http://www.x.org/"
     7.7 +HOST_ARCH="i486 arm"
     7.8  
     7.9  WANTED="xorg-libXft"
    7.10  DEPENDS="xorg-libXft xorg-libXrender-dev fontconfig-dev freetype-dev pkg-config"
     8.1 --- a/xorg-libXft/receipt	Wed Mar 12 03:49:35 2014 +0100
     8.2 +++ b/xorg-libXft/receipt	Wed Mar 12 03:53:08 2014 +0100
     8.3 @@ -10,6 +10,7 @@
     8.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
     8.5  WEB_SITE="http://www.x.org/"
     8.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     8.7 +HOST_ARCH="i486 arm"
     8.8  
     8.9  DEPENDS="fontconfig xorg-libXrender"
    8.10  BUILD_DEPENDS="xorg-libXrender-dev freetype-dev fontconfig-dev libxml2-dev"
     9.1 --- a/xorg-libXmu-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
     9.2 +++ b/xorg-libXmu-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
     9.3 @@ -7,9 +7,10 @@
     9.4  MAINTAINER="pankso@slitaz.org"
     9.5  LICENSE="other"
     9.6  WEB_SITE="http://www.x.org/"
     9.7 +HOST_ARCH="i486 arm"
     9.8  
     9.9  WANTED="xorg-libXmu"
    9.10 -DEPENDS="xorg-libXmu xorg-libXt-dev xorg-libXext-dev pkg-config"
    9.11 +DEPENDS="xorg-libXmu xorg-libXt-dev xorg-libXext-dev"
    9.12  
    9.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.14  genpkg_rules()
    10.1 --- a/xorg-libXmu/receipt	Wed Mar 12 03:49:35 2014 +0100
    10.2 +++ b/xorg-libXmu/receipt	Wed Mar 12 03:53:08 2014 +0100
    10.3 @@ -10,6 +10,7 @@
    10.4  SOURCE="libXmu"
    10.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
    10.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    10.7 +HOST_ARCH="i486 arm"
    10.8  
    10.9  DEPENDS="xorg-libXext xorg-libXt"
   10.10  BUILD_DEPENDS="xorg-libXext-dev xorg-libXt-dev util-linux-uuid-dev"
    11.1 --- a/xorg-libXpm-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
    11.2 +++ b/xorg-libXpm-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
    11.3 @@ -7,6 +7,7 @@
    11.4  MAINTAINER="pankso@slitaz.org"
    11.5  LICENSE="other"
    11.6  WEB_SITE="http://www.x.org/"
    11.7 +HOST_ARCH="i486 arm"
    11.8  
    11.9  WANTED="xorg-libXpm"
   11.10  DEPENDS="xorg-libXpm xorg-libX11-dev pkg-config"
    12.1 --- a/xorg-libXpm/receipt	Wed Mar 12 03:49:35 2014 +0100
    12.2 +++ b/xorg-libXpm/receipt	Wed Mar 12 03:53:08 2014 +0100
    12.3 @@ -10,13 +10,25 @@
    12.4  SOURCE="libXpm"
    12.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
    12.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    12.7 +HOST_ARCH="i486 arm"
    12.8  
    12.9 -DEPENDS="xorg-libX11"
   12.10 -BUILD_DEPENDS="xorg-libXt-dev xorg-libXext-dev util-linux-uuid-dev"
   12.11 +DEPENDS="xorg-libX11 xorg-libXt"
   12.12 +BUILD_DEPENDS="xorg-libXt-dev xorg-libXext-dev xorg-libSM-dev util-linux-uuid-dev"
   12.13  
   12.14  # Rules to configure and make the package.
   12.15  compile_rules()
   12.16  {
   12.17 +	case "$ARCH" in
   12.18 +		arm*) 
   12.19 +			# ARM Hack
   12.20 +			for la in libICE.la libSM.la libuuid.la
   12.21 +			do
   12.22 +				if grep -q "^libdir='/usr/lib'" /usr/lib/${la}; then
   12.23 +					sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \
   12.24 +						/usr/lib/${la}
   12.25 +				fi 
   12.26 +			done ;;
   12.27 +	esac
   12.28  	./configure \
   12.29  		--sysconfdir=/etc \
   12.30  		--localstatedir=/var \
    13.1 --- a/xorg-libXrender-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
    13.2 +++ b/xorg-libXrender-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
    13.3 @@ -7,6 +7,7 @@
    13.4  MAINTAINER="pankso@slitaz.org"
    13.5  LICENSE="other"
    13.6  WEB_SITE="http://www.x.org/"
    13.7 +HOST_ARCH="i486 arm"
    13.8  
    13.9  WANTED="xorg-libXrender"
   13.10  DEPENDS="xorg-libXrender xorg-libX11-dev xorg-renderproto pkg-config"
    14.1 --- a/xorg-libXrender/receipt	Wed Mar 12 03:49:35 2014 +0100
    14.2 +++ b/xorg-libXrender/receipt	Wed Mar 12 03:53:08 2014 +0100
    14.3 @@ -10,6 +10,7 @@
    14.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    14.5  WEB_SITE="http://www.x.org/"
    14.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    14.7 +HOST_ARCH="i486 arm"
    14.8  
    14.9  DEPENDS="xorg-libX11"
   14.10  BUILD_DEPENDS="xorg-libX11-dev xorg-renderproto"
   14.11 @@ -22,8 +23,7 @@
   14.12  		--localstatedir=/var \
   14.13  		--disable-static \
   14.14  		$CONFIGURE_ARGS &&
   14.15 -	make &&
   14.16 -	make install
   14.17 +	make && make install
   14.18  }
   14.19  
   14.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    15.1 --- a/xorg-libXt-dev/receipt	Wed Mar 12 03:49:35 2014 +0100
    15.2 +++ b/xorg-libXt-dev/receipt	Wed Mar 12 03:53:08 2014 +0100
    15.3 @@ -7,6 +7,7 @@
    15.4  MAINTAINER="pankso@slitaz.org"
    15.5  LICENSE="other"
    15.6  WEB_SITE="http://www.x.org/"
    15.7 +HOST_ARCH="i486 arm"
    15.8  
    15.9  WANTED="xorg-libXt"
   15.10  DEPENDS="xorg-libXt xorg-libX11-dev xorg-libSM-dev pkg-config"
    16.1 --- a/xorg-libXt/receipt	Wed Mar 12 03:49:35 2014 +0100
    16.2 +++ b/xorg-libXt/receipt	Wed Mar 12 03:53:08 2014 +0100
    16.3 @@ -10,10 +10,16 @@
    16.4  SOURCE="libXt"
    16.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
    16.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    16.7 +HOST_ARCH="i486 arm"
    16.8  
    16.9  DEPENDS="xorg-libSM xorg-libX11"
   16.10  BUILD_DEPENDS="xorg-libSM-dev xorg-libX11-dev glib-dev util-linux-uuid-dev"
   16.11  
   16.12 +# Handle cross compilation.
   16.13 +case "$ARCH" in
   16.14 +	arm) unset CFLAGS ;;
   16.15 +esac
   16.16 +
   16.17  # Rules to configure and make the package.
   16.18  compile_rules()
   16.19  {
    17.1 --- a/xorg-server-Xfbdev/receipt	Wed Mar 12 03:49:35 2014 +0100
    17.2 +++ b/xorg-server-Xfbdev/receipt	Wed Mar 12 03:53:08 2014 +0100
    17.3 @@ -11,7 +11,8 @@
    17.4  WEB_SITE="http://www.x.org/"
    17.5  HOST_ARCH="i486 arm"
    17.6  
    17.7 -DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt"
    17.8 +DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \
    17.9 +xorg-libxkbfile xorg-xkeyboard-config"
   17.10  
   17.11  #
   17.12  # This is the default Xserver for ARM platform until full Xorg or Xorg light
    18.1 --- a/xorg-xkeyboard-config/receipt	Wed Mar 12 03:49:35 2014 +0100
    18.2 +++ b/xorg-xkeyboard-config/receipt	Wed Mar 12 03:53:08 2014 +0100
    18.3 @@ -10,24 +10,26 @@
    18.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    18.5  WEB_SITE="http://www.x.org/"
    18.6  WGET_URL="http://xorg.freedesktop.org/releases/individual/data/$SOURCE/$TARBALL"
    18.7 +HOST_ARCH="i486 arm"
    18.8  
    18.9  DEPENDS="xorg-xkbcomp"
   18.10  BUILD_DEPENDS="perl-xml-parser xorg-xkbcomp xorg-xproto xorg-libX11-dev intltool"
   18.11  
   18.12 +# Handle cross compilation. Use build host: xorg-xkbcomp perl-xml-parser
   18.13 +case "$ARCH" in
   18.14 +	arm) BUILD_DEPENDS="xorg-xproto xorg-libX11-dev" ;;
   18.15 +esac
   18.16 +
   18.17  # Rules to configure and make the package.
   18.18  compile_rules()
   18.19  {
   18.20 -	cd $src
   18.21 -    ./configure \
   18.22 -    	--prefix=/usr\
   18.23 -    	--sysconfdir=/etc \
   18.24 -    	--mandir=/usr/share/man \
   18.25 -    	--localstatedir=/var \
   18.26 -    	--with-xkb-base=/usr/share/X11/xkb \
   18.27 -    	--with-xkb-rules-symlink=xorg \
   18.28 -    	$CONFIGURE_ARGS &&
   18.29 -    make &&
   18.30 -    make DESTDIR=$DESTDIR install
   18.31 +	./configure \
   18.32 +		--sysconfdir=/etc \
   18.33 +		--localstatedir=/var \
   18.34 +		--with-xkb-base=/usr/share/X11/xkb \
   18.35 +		--with-xkb-rules-symlink=xorg \
   18.36 +		$CONFIGURE_ARGS &&
   18.37 +	make && make install
   18.38  }
   18.39  
   18.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    19.1 --- a/xorg-xload/receipt	Wed Mar 12 03:49:35 2014 +0100
    19.2 +++ b/xorg-xload/receipt	Wed Mar 12 03:53:08 2014 +0100
    19.3 @@ -10,6 +10,7 @@
    19.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    19.5  WEB_SITE="http://www.x.org/"
    19.6  WGET_URL="$XORG_MIRROR/app/$TARBALL"
    19.7 +HOST_ARCH="i486 arm"
    19.8  
    19.9  DEPENDS="xorg-libXaw"
   19.10  BUILD_DEPENDS="xorg-libXaw-dev"
    20.1 --- a/xterm/receipt	Wed Mar 12 03:49:35 2014 +0100
    20.2 +++ b/xterm/receipt	Wed Mar 12 03:53:08 2014 +0100
    20.3 @@ -9,36 +9,48 @@
    20.4  TARBALL="$PACKAGE-$VERSION.tgz"
    20.5  WEB_SITE="http://invisible-island.net/xterm/"
    20.6  WGET_URL="ftp://invisible-island.net/xterm/$TARBALL"
    20.7 +HOST_ARCH="i486 arm"
    20.8  
    20.9  DEPENDS="expat fontconfig freetype ncurses xorg-libXft xorg-libXt xorg-libXaw"
   20.10  BUILD_DEPENDS="expat-dev fontconfig-dev freetype-dev ncurses-dev \
   20.11  xorg-libXft-dev xorg-libXt-dev xorg-libXaw-dev imagemagick libltdl"
   20.12  
   20.13 +# Handle cross compilation.
   20.14 +case "$ARCH" in
   20.15 +	arm) BUILD_DEPENDS="expat-dev fontconfig-dev freetype-dev ncurses-dev \
   20.16 +xorg-libXft-dev xorg-libXt-dev xorg-libXaw-dev "
   20.17 +esac
   20.18 +
   20.19  # Rules to configure and make the package.
   20.20  compile_rules()
   20.21  {
   20.22 -    cd $src
   20.23 -    mkdir -p $DESTDIR/usr/share/pixmaps $DESTDIR/usr/share/applications
   20.24 -    cp xterm.desktop $DESTDIR/usr/share/applications
   20.25 -    convert icons/xterm_32x32.xpm $DESTDIR/usr/share/pixmaps/xterm.png
   20.26 -    ./configure \
   20.27 -    	--prefix=/usr \
   20.28 -    	--sysconfdir=/etc \
   20.29 -    	--mandir=/usr/share/man \
   20.30 -    	--localstatedir=/var \
   20.31 -    	--with-app-defaults=/usr/share/X11/app-defaults \
   20.32 +	./configure \
   20.33 +		--prefix=/usr \
   20.34 +		--sysconfdir=/etc \
   20.35 +		--mandir=/usr/share/man \
   20.36 +		--localstatedir=/var \
   20.37 +		--with-app-defaults=/usr/share/X11/app-defaults \
   20.38  		--enable-wide-chars \
   20.39  		--enable-freetype \
   20.40  		--enable-doublechars \
   20.41 -    	$CONFIGURE_ARGS &&
   20.42 -    make &&
   20.43 -    make DESTDIR=$DESTDIR install
   20.44 +		$CONFIGURE_ARGS &&
   20.45 +	make &&
   20.46 +	make DESTDIR=$DESTDIR install
   20.47  }
   20.48  
   20.49  # Rules to gen a SliTaz package suitable for Tazpkg.
   20.50  genpkg_rules()
   20.51  {
   20.52 -	mkdir -p $fs/usr
   20.53 +	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
   20.54 +	[ -x "/usr/bin/convert" ] &&
   20.55 +		convert icons/xterm_32x32.xpm $DESTDIR/usr/share/pixmaps/xterm.png
   20.56  	cp -a $install/usr/bin $fs/usr
   20.57  	cp -a $install/usr/share $fs/usr
   20.58 +	cp $src/xterm.desktop $DESTDIR/usr/share/applications
   20.59  }
   20.60 +
   20.61 +# One of the first X apps cross compiled. Be sure all went well
   20.62 +testsuite()
   20.63 +{
   20.64 +	readelf -h $install/usr/bin/xterm
   20.65 +}