# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1396822431 -7200
# Node ID a1b05b1a9d1d9e6a11ab3fd4bbe1d4f4123d8989
# Parent  c6a95de2d272d2404448d7455343a0d6dd1637dd
ARM: add x11vnc

diff -r c6a95de2d272 -r a1b05b1a9d1d python/receipt
--- a/python/receipt	Sun Apr 06 22:35:50 2014 +0200
+++ b/python/receipt	Mon Apr 07 00:13:51 2014 +0200
@@ -1,18 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="python"
-VERSION="2.7.5"
+VERSION="2.7.3"
 CATEGORY="development"
 SHORT_DESC="The Python programming language."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="PSL"
 SOURCE="Python"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
+TARBALL="$SOURCE-$VERSION.tar.xz"
 WEB_SITE="http://www.python.org/"
-WGET_URL="http://www.python.org/ftp/python/$VERSION/$TARBALL"
-#HOST_ARCH="i486 arm"
+WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm"
+DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm libffi"
 BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
 ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev"
 SUGGESTED="tcl tk"
@@ -20,7 +20,7 @@
 # Handle cross compilation
 case "$ARCH" in
 	arm*) BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev ncursesw-dev \
-tcl-dev db-dev" ;;
+tcl-dev db-dev wget libffi-dev gdbm-dev" ;;
 esac
 
 # Rules to configure and make the package.
@@ -29,28 +29,59 @@
 	# Temporary workaround for FS#22322
 	# See http://bugs.python.org/issue10835 for upstream report
 	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+	
 	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
 	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+	
 	case "$ARCH" in
 		arm*)
-			#ac_cv_file__dev_ptmx=no
-			#ac_cv_file__dev_ptc=no
-			cp -s $CONFIG_SITE .
+			# First pass for build host tools
+			unset CFLAGS CXXFLAGS
+			cp -f $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 \
+			cat >> $CONFIG_SITE << EOT
+ac_cv_have_long_long_format=yes
+EOT
+			./configure CC=gcc \
+				--disable-ipv6 \
+				--build=i486-slitaz-linux \
+				--host=${BUILD_SYSTEM} && 
+			make python Parser/pgen &&
+			mv python hostpython &&
+			mv Parser/pgen Parser/hostpgen || exit 1
+			make distclean
+			rm -f $CONFIG_SITE
+			# Second pass for host tools
+			. /etc/slitaz/cook.conf
+			patch -p1 < $stuff/python-2.7.3-xcompile.patch || exit 1
+			cp -f $CONFIG_SITE .
+			CONFIG_SITE="$(pwd)/cook.site"
+			cat >> $CONFIG_SITE << EOT
+ac_cv_have_long_long_format=yes
+ac_cv_buggy_getaddrinfo=no
+ac_cv_file__dev_ptmx=yes
+ac_cv_file__dev_ptc=no
+EOT
+			./configure CC=${HOST_SYSTEM}-gcc \
 				--disable-ipv6 \
 				--enable-shared \
-				--build=i486-slitaz-linux \
-				--host=${ARCH}-slitaz-linux-gnueabi ;;
+				--with-system-ffi \
+				${CONFIGURE_ARGS} &&
+			make \
+				PYTHON_FOR_BUILD=${src}/hostpython \
+				HOSTPYTHON=${src}/hostpython \
+				HOSTPGEN=${src}/Parser/hostpgen \
+				CROSS_COMPILE_TARGET=yes \
+				HOSTARCH=${HOST_SYSTEM} \
+				BUILDARCH=${BUILD_SYSTEM} || exit 1
+			make DESTDIR=$DESTDIR install || exit 1 ;;
 		i?86)
 			./configure \
 				--enable-shared \
 				--build=${HOST_SYSTEM} \
-				--host=${HOST_SYSTEM} ;;
-	esac &&
-	make &&	make DESTDIR=$DESTDIR install
+				--host=${HOST_SYSTEM} &&
+				make &&	make DESTDIR=$DESTDIR install ;;
+	esac
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -60,6 +91,11 @@
 	mkdir -p $fs/usr/include/${PACKAGE}$python_version
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
+	# Create /usr/bin/python for ARM
+	if [ ! -f "$fs/usr/python" ]; then
+		cd $fs/usr/bin && ln -s python2.7 python
+		mkdir -p $fs/usr/lib/python2.7
+	fi
 	# needed for mercurial to work now
 	cp -a $install/usr/include/${PACKAGE}$python_version/pyconfig.h \
 		$fs/usr/include/${PACKAGE}$python_version
diff -r c6a95de2d272 -r a1b05b1a9d1d x11vnc-extra/receipt
--- a/x11vnc-extra/receipt	Sun Apr 06 22:35:50 2014 +0200
+++ b/x11vnc-extra/receipt	Mon Apr 07 00:13:51 2014 +0200
@@ -9,6 +9,7 @@
 WEB_SITE="http://www.karlrunge.com/x11vnc/"
 WANTED="x11vnc"
 TAGS="vnc"
+HOST_ARCH="i486 arm"
 
 DEPENDS="x11vnc"
 
diff -r c6a95de2d272 -r a1b05b1a9d1d x11vnc/receipt
--- a/x11vnc/receipt	Sun Apr 06 22:35:50 2014 +0200
+++ b/x11vnc/receipt	Mon Apr 07 00:13:51 2014 +0200
@@ -9,15 +9,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.karlrunge.com/x11vnc/"
 WGET_URL="$SF_MIRROR/libvncserver/$TARBALL"
-TAGS="vnc"
+TAGS="vnc server"
+HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-libXtst openssl slitaz-base-files jpeg xorg-libXdamage zlib"
-BUILD_DEPENDS="openssl-dev"
+DEPENDS="xorg-libXtst openssl jpeg xorg-libXdamage zlib"
+BUILD_DEPENDS="openssl-dev jpeg-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure --prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
@@ -28,7 +28,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/usr/share $fs/etc/init.d
+	mkdir -p $fs/usr/bin $fs/etc/init.d
 	cp -a $install/usr/bin/x11vnc $fs/usr/bin
 	cp -a $stuff/x11vnc $fs/etc/init.d
 }