From ee364187f59f7ad6c3d125f53f06d33559f014e4 Mon Sep 17 00:00:00 2001 From: barbieri Date: Mon, 13 Aug 2007 19:45:47 +0000 Subject: [PATCH] Update to last version, add configure.addopts --- scripts/e17/apps/build-expedite-maemo-deb.sh | 4 +-- scripts/e17/libs/build-efl-core-maemo-deb.sh | 5 ++-- scripts/e17/libs/build-etk-maemo-deb.sh | 7 ++--- scripts/e17/libs/ecore/configure.addopts-arm | 1 + scripts/e17/libs/evas/configure.addopts-arm | 2 ++ .../build-python-efl-examples-maemo-deb.sh | 27 ++++++++++++++++---- .../proto/python-efl/build-python-efl-maemo-deb.sh | 8 +++--- 7 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 scripts/e17/libs/ecore/configure.addopts-arm create mode 100644 scripts/e17/libs/evas/configure.addopts-arm diff --git a/scripts/e17/apps/build-expedite-maemo-deb.sh b/scripts/e17/apps/build-expedite-maemo-deb.sh index b3a9949..1edb463 100755 --- a/scripts/e17/apps/build-expedite-maemo-deb.sh +++ b/scripts/e17/apps/build-expedite-maemo-deb.sh @@ -1,6 +1,6 @@ #!/bin/bash -PRELEASE="indt1" +PRELEASE="indt3" PNAME="expedite" PVER="$(pkg-config --modversion evas)_${PRELEASE}" SECTION="user/accessories" @@ -12,7 +12,7 @@ LONG_DESC="\ Homepage: http://www.enlightenment.org/ " BDEPENDS="pkg-config, efl-core" -DEPENDS="efl-core" +DEPENDS="efl-core (>= 0.9.9.040_indt3)" ARCH="$(arch)" diff --git a/scripts/e17/libs/build-efl-core-maemo-deb.sh b/scripts/e17/libs/build-efl-core-maemo-deb.sh index 8f7a712..f22f98b 100755 --- a/scripts/e17/libs/build-efl-core-maemo-deb.sh +++ b/scripts/e17/libs/build-efl-core-maemo-deb.sh @@ -1,8 +1,8 @@ #!/bin/bash -PRELEASE="indt2" +PRELEASE="indt3" PNAME="efl-core" -PVER="$(pkg-config --modversion evas)_${PRELEASE}" +PVER="$(grep AM_INIT_AUTOMAKE evas/configure.in | sed 's/AM_INIT_AUTOMAKE(evas, \([^)]\+\))/\1/')_${PRELEASE}" SECTION="libs" #DEF_PKGS="imlib2 eet edb imlib2_loaders evas ecore epeg embryo edje epsilon esmart efreet ewl emotion engrave etk exml enhance " @@ -56,6 +56,7 @@ for p in $PKGS; do if [ -f Makefile ] && [ x"$NOMAKE" != x1 ]; then (make uninstall && make distclean) >/dev/null 2>> "$LOG" fi + libtoolize --copy --force >/dev/null 2>> "$LOG" || die "failed to run libtoolize $p" NOCONFIGURE=1 ./autogen.sh >/dev/null 2>> "$LOG" || die "failed to autogen.sh $p" OPTS="--prefix=/usr" diff --git a/scripts/e17/libs/build-etk-maemo-deb.sh b/scripts/e17/libs/build-etk-maemo-deb.sh index 8f63105..2a47e72 100755 --- a/scripts/e17/libs/build-etk-maemo-deb.sh +++ b/scripts/e17/libs/build-etk-maemo-deb.sh @@ -1,8 +1,8 @@ #!/bin/bash -PRELEASE="indt1" +PRELEASE="indt2" PNAME="etk" -PVER="$(pkg-config --modversion etk)_${PRELEASE}" +PVER="$(grep AM_INIT_AUTOMAKE etk/configure.in | sed 's/AM_INIT_AUTOMAKE(etk, \([^)]\+\))/\1/')_${PRELEASE}" SECTION="libs" DEF_PKGS="etk" @@ -14,7 +14,7 @@ LONG_DESC="\ Homepage: http://www.enlightenment.org/ " BDEPENDS="pkg-config" -DEPENDS="efl-core" +DEPENDS="efl-core (>= 0.9.9.040_indt2)" ARCH="$(arch)" @@ -51,6 +51,7 @@ for p in $PKGS; do if [ -f Makefile ] && [ x"$NOMAKE" != x1 ]; then (make uninstall && make distclean) >/dev/null 2>> "$LOG" fi + libtoolize --copy --force >/dev/null 2>> "$LOG" || die "failed to libtoolize $p" NOCONFIGURE=1 ./autogen.sh >/dev/null 2>> "$LOG" || die "failed to autogen.sh $p" OPTS="--prefix=/usr" diff --git a/scripts/e17/libs/ecore/configure.addopts-arm b/scripts/e17/libs/ecore/configure.addopts-arm new file mode 100644 index 0000000..3389802 --- /dev/null +++ b/scripts/e17/libs/ecore/configure.addopts-arm @@ -0,0 +1 @@ +--disable-ecore-fb --disable-ecore-directfb --disable-ecore-evas-gl --disable-ecore-evas-dfb --disable-ecore-evas-xrender --disable-ecore-evas-fb --disable-ecore-evas-buffer --disable-openssl --disable-abstract-sockets --disable-ecore-ipc --disable-ecore-dbus --disable-ecore-config --disable-ecore-desktop diff --git a/scripts/e17/libs/evas/configure.addopts-arm b/scripts/e17/libs/evas/configure.addopts-arm new file mode 100644 index 0000000..e8ea557 --- /dev/null +++ b/scripts/e17/libs/evas/configure.addopts-arm @@ -0,0 +1,2 @@ +--enable-software-16-x11 --enable-software-x11 --disable-scale-smooth --disable-pthreads --enable-no-dither-mask --enable-small-dither-mask --disable-fb --disable-xrender-x11 --disable-image-loader-tiff --disable-image-loader-edb --disable-image-loader-gif --disable-image-loader-xpm --disable-image-loader-svg --disable-convert-yuv --disable-convert-8-rgb-332 --disable-convert-8-rgb-666 --disable-convert-8-rgb-232 --disable-convert-8-rgb-222 --disable-convert-8-rgb-221 --disable-convert-8-rgb-121 --disable-convert-8-rgb-111 --disable-convert-16-bgr-565 --disable-convert-16-rgb-555 --disable-convert-16-rgb-444 --disable-convert-16-rgb-ipq --disable-convert-16-rgb-rot-180 --disable-convert-16-rgb-rot-270 --disable-convert-16-rgb-rot-90 --disable-convert-24-rgb-888 --disable-convert-24-bgr-888 --disable-convert-32-rgb-8888 --disable-convert-32-rgbx-8888 --disable-convert-32-bgr-8888 --disable-convert-32-bgrx-8888 --disable-convert-32-rgb-rot-0 --disable-convert-32-rgb-rot-180 --disable-convert-32-rgb-rot-270 --disable-convert-32-rgb-rot-90 + diff --git a/scripts/e17/proto/python-efl/build-python-efl-examples-maemo-deb.sh b/scripts/e17/proto/python-efl/build-python-efl-examples-maemo-deb.sh index ad66b15..a308eba 100755 --- a/scripts/e17/proto/python-efl/build-python-efl-examples-maemo-deb.sh +++ b/scripts/e17/proto/python-efl/build-python-efl-examples-maemo-deb.sh @@ -1,8 +1,8 @@ #!/bin/bash -PRELEASE="indt1" +PRELEASE="indt3" PNAME="python-efl-core-demo" -PVER="0.1_$PRELEASE" +PVER="0.1.1_$PRELEASE" SECTION="user/accessories" DESC="Enlightenment Foundation Libraries Core - Python Bindings Demos" @@ -12,7 +12,7 @@ LONG_DESC="\ Homepage: http://www.enlightenment.org/ " BDEPENDS="" -DEPENDS="python-efl-core" +DEPENDS="python-efl-core (>= 0.1.1_indt3)" ARCH="$(arch)" DESTDIR="/tmp/$PNAME-$ARCH" @@ -46,14 +46,31 @@ Name=Edje App Launcher Demo Exec=/usr/share/python-efl-core-demo/examples/01-app_launcher.py EOF -cd python-edje/examples/evas-demo/ +cd python-edje/examples/evas-demo/01-app_launcher/ cp 01-app_launcher.py $EXAMPLES_DIR chmod +x $EXAMPLES_DIR/01-app_launcher.py -edje_cc 01-app_launcher.edc || die "Failed to compile theme 01-app_launcher" +#edje_cc 01-app_launcher.edc || die "Failed to compile theme 01-app_launcher" cp 01-app_launcher.edj $EXAMPLES_DIR cd $CWD +cat > "$MENU_DIR/02-vkbd.desktop" <> "$LOG" cd $CWD/$p || die "missing package $p" + m=`echo "$p" | sed s/python-//g` + touch $m/$m.c_$m.pyx python2.5 setup.py build_ext build install --prefix /usr install_headers python2.5 setup.py install --root $DESTDIR -- 1.7.9.5