From: Mirko Vogt Date: Mon, 1 Jun 2009 15:23:12 +0000 (+0000) Subject: upgrade efl-stuff, cleanup Makefiles, add elementary and its python-bindings, fix... X-Git-Url: http://git.openwrt.org/ubox.git?a=commitdiff_plain;h=13fee0bc67745030ed5837bfe143841372721143;p=openwrt%2Fsvn-archive%2Ffeeds.git upgrade efl-stuff, cleanup Makefiles, add elementary and its python-bindings, fix weird errors, looking forward to new ones SVN-Revision: 16258 --- diff --git a/efl/ecore/Makefile b/efl/ecore/Makefile index 63b08bb..e3d81db 100644 --- a/efl/ecore/Makefile +++ b/efl/ecore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ecore -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -20,7 +20,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME) PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -HOST_BUILD_DEPENDS:=eina/host evas/host +HOST_BUILD_DEPENDS:=eina/host evas/host fribidi/host PKG_FIXUP = libtool @@ -33,7 +33,7 @@ define Package/ecore SUBMENU:=libraries TITLE:=Ecore is the core event abstraction layer and X abstraction layer URL:=http://wiki.enlightenment.org/index.php/Ecore - DEPENDS:=+eina +evas +libiconv @!LINUX_2_4 + DEPENDS:=+fribidi +eina +evas +libiconv +libintl @!LINUX_2_4 endef define Package/ecore/description @@ -42,101 +42,76 @@ endef # iconv needed for ecore-txt TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include -TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib +TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv define Build/Configure ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); $(call Build/Configure/Default, \ - --with-x \ - --with-iconv-link \ + --disable-simple-x11 \ + --disable-doc \ + --disable-ecore-x-xcb \ + --disable-atfile-source \ + --enable-ecore-job \ + --disable-curl \ --disable-gnutls \ --disable-openssl \ - --disable-curl \ - --disable-abstract-sockets \ - --enable-ecore-job \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --disable-ecore-config \ - --enable-ecore-txt \ - --enable-ecore-evas \ - --enable-ecore-x \ - --enable-ecore-evas-xrender-x11 \ - --disable-ecore-evas-dfb \ - --disable-ecore-evas-fb \ - --disable-ecore-evas-sdl \ - --disable-ecore-evas-quartz \ - --enable-ecore-evas-buffer \ - --enable-ecore-file \ - --enable-inotify \ --disable-poll \ - --enable-ecore-imf \ - --enable-ecore-imf_evas \ - --disable-doc \ - --disable-simple-x11 \ - --disable-ecore-x-xcb \ + --enable-inotify \ + --enable-ecore-evas-software-buffer \ + --enable-ecore-evas-software-x11 \ + --enable-ecore-evas-xrender-x11 \ --disable-ecore-evas-opengl-x11 \ --disable-ecore-evas-software-16-x11 \ --disable-ecore-evas-software-xcb \ --disable-ecore-evas-xrender-xcb \ - --disable-ecore-win32 \ + --disable-ecore-evas-software-gdi \ --disable-ecore-evas-software-ddraw \ --disable-ecore-evas-direct3d \ --disable-ecore-evas-opengl-glew \ --disable-ecore-evas-software-16-ddraw \ - --disable-ecore-wince \ + --disable-ecore-evas-quartz \ + --disable-ecore-evas-software-sdl \ + --disable-ecore-evas-directfb \ + --disable-ecore-evas-fb \ --disable-ecore-evas-software-16-wince \ - --disable-ecore-directfb \ - --disable-ecore-fb \ - --disable-ecore-sdl \ - --disable-ecore-quartz \ + --enable-ecore-x \ + --with-iconv-link=-liconv \ + --with-x \ ) endef define Host/Configure ( cd $(HOST_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); $(call Host/Configure/Default, \ - --without-x \ - --with-iconv-link \ + --disable-simple-x11 \ + --disable-doc \ + --disable-ecore-x-xcb \ + --disable-atfile-source \ + --enable-ecore-job \ + --disable-curl \ --disable-gnutls \ --disable-openssl \ - --disable-curl \ - --disable-abstract-sockets \ - --enable-ecore-job \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --disable-ecore-config \ - --enable-ecore-txt \ - --enable-ecore-evas \ - --disable-ecore-x \ - --disable-ecore-evas-xrender-x11 \ - --disable-ecore-evas-dfb \ - --disable-ecore-evas-fb \ - --disable-ecore-evas-sdl \ - --disable-ecore-evas-quartz \ - --enable-ecore-evas-buffer \ - --enable-ecore-file \ - --disable-inotify \ --disable-poll \ - --enable-ecore-imf \ - --enable-ecore-imf_evas \ - --disable-doc \ - --disable-simple-x11 \ - --disable-ecore-x-xcb \ + --disable-inotify \ + --enable-ecore-evas-software-buffer \ + --disable-ecore-evas-software-x11 \ + --disable-ecore-evas-xrdisder-x11 \ --disable-ecore-evas-opengl-x11 \ --disable-ecore-evas-software-16-x11 \ --disable-ecore-evas-software-xcb \ --disable-ecore-evas-xrender-xcb \ - --disable-ecore-win32 \ + --disable-ecore-evas-software-gdi \ --disable-ecore-evas-software-ddraw \ --disable-ecore-evas-direct3d \ --disable-ecore-evas-opengl-glew \ --disable-ecore-evas-software-16-ddraw \ - --disable-ecore-wince \ + --disable-ecore-evas-quartz \ + --disable-ecore-evas-software-sdl \ + --disable-ecore-evas-directfb \ + --disable-ecore-evas-fb \ --disable-ecore-evas-software-16-wince \ - --disable-ecore-directfb \ - --disable-ecore-fb \ - --disable-ecore-sdl \ - --disable-ecore-quartz \ + --disable-ecore-x \ + --without-x \ ) endef @@ -152,9 +127,7 @@ endef define Package/ecore/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(FIND) $(1)/ -name "*.la" | $(XARGS) rm - $(FIND) $(1)/ -name "*.a" | $(XARGS) rm + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libecore*.so* $(1)/usr/lib/ endef $(eval $(call HostBuild)) diff --git a/efl/ecore/patches/000-use-exit-instead-of-Exit.patch b/efl/ecore/patches/000-use-exit-instead-of-Exit.patch new file mode 100644 index 0000000..dd8ffa4 --- /dev/null +++ b/efl/ecore/patches/000-use-exit-instead-of-Exit.patch @@ -0,0 +1,30 @@ +diff -ruN ecore-r40727.orig/src/lib/ecore_con/ecore_con_dns.c ecore-r40727/src/lib/ecore_con/ecore_con_dns.c +--- ecore-r40727.orig/src/lib/ecore_con/ecore_con_dns.c 2009-05-18 18:10:45.000000000 +0200 ++++ ecore-r40727/src/lib/ecore_con/ecore_con_dns.c 2009-05-18 18:21:43.000000000 +0200 +@@ -135,11 +135,7 @@ + write(fd[1], "", 1); + } + close(fd[1]); +-# ifdef __USE_ISOC99 +- _Exit(0); +-# else + _exit(0); +-# endif + } + /* PARENT */ + cbdata->handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _ecore_con_dns_exit_handler, cbdata); +diff -ruN ecore-r40727.orig/src/lib/ecore_con/ecore_con_info.c ecore-r40727/src/lib/ecore_con/ecore_con_info.c +--- ecore-r40727.orig/src/lib/ecore_con/ecore_con_info.c 2009-05-18 18:10:45.000000000 +0200 ++++ ecore-r40727/src/lib/ecore_con/ecore_con_info.c 2009-05-18 18:21:55.000000000 +0200 +@@ -243,11 +243,7 @@ + freeaddrinfo(result); + err = write(fd[1], "", 1); + close(fd[1]); +-# ifdef __USE_ISOC99 +- _Exit(0); +-# else + _exit(0); +-# endif + } + /* PARENT */ + cbdata->handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _ecore_con_info_exit_handler, cbdata); diff --git a/efl/ecore/patches/001-use-isfinite-instead-of-finite.patch b/efl/ecore/patches/001-use-isfinite-instead-of-finite.patch new file mode 100644 index 0000000..c6b6df9 --- /dev/null +++ b/efl/ecore/patches/001-use-isfinite-instead-of-finite.patch @@ -0,0 +1,13 @@ +diff -ruN ecore-r40853.orig/src/lib/ecore/ecore_main.c ecore-r40853/src/lib/ecore/ecore_main.c +--- ecore-r40853.orig/src/lib/ecore/ecore_main.c 2009-05-31 16:27:25.000000000 +0200 ++++ ecore-r40853/src/lib/ecore/ecore_main.c 2009-05-31 19:58:56.000000000 +0200 +@@ -337,7 +337,7 @@ + Ecore_Fd_Handler *fdh; + + t = NULL; +- if ((!finite(timeout)) || (timeout == 0.0)) /* finite() tests for NaN, too big, too small, and infinity. */ ++ if ((!isfinite(timeout)) || (timeout == 0.0)) /* finite() tests for NaN, too big, too small, and infinity. */ + { + tv.tv_sec = 0; + tv.tv_usec = 0; +Binary files ecore-r40853.orig/src/lib/ecore/.ecore_main.c.swp and ecore-r40853/src/lib/ecore/.ecore_main.c.swp differ diff --git a/efl/ecore/patches/002-fix-missing-include.patch b/efl/ecore/patches/002-fix-missing-include.patch deleted file mode 100644 index cd4d663..0000000 --- a/efl/ecore/patches/002-fix-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN ecore-r38886.orig/src/lib/ecore_con/ecore_con.c ecore-r38886/src/lib/ecore_con/ecore_con.c ---- ecore-r38886.orig/src/lib/ecore_con/ecore_con.c 2009-03-17 13:23:24.000000000 +0100 -+++ ecore-r38886/src/lib/ecore_con/ecore_con.c 2009-03-17 13:23:56.000000000 +0100 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/efl/ecore/patches/010-fix-ecore-evas-linking.patch b/efl/ecore/patches/010-fix-ecore-evas-linking.patch deleted file mode 100644 index 3daba87..0000000 --- a/efl/ecore/patches/010-fix-ecore-evas-linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/ecore_evas/Makefile.am b/src/lib/ecore_evas/Makefile.am -index 2152d47..39b13df 100644 ---- a/src/lib/ecore_evas/Makefile.am -+++ b/src/lib/ecore_evas/Makefile.am -@@ -1,7 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in - - if BUILD_ECORE_X - ECORE_X_INC = -I$(top_srcdir)/src/lib/ecore_x --ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la -+ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la -lX11 - else - ECORE_X_INC = diff --git a/efl/edbus/Makefile b/efl/edbus/Makefile index 116ef95..9edce99 100644 --- a/efl/edbus/Makefile +++ b/efl/edbus/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e_dbus -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -36,7 +36,7 @@ endef define Build/Configure ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); $(call Build/Configure/Default, \ - --enable-ehal \ + --enable-ehal \ --disable-enm \ --disable-enotify \ ) @@ -47,16 +47,15 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef define Package/edbus/install $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libe{dbus,hal}*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/e_dbus_hal $(1)/usr/bin/ endef $(eval $(call BuildPackage,edbus)) diff --git a/efl/edje/Makefile b/efl/edje/Makefile index 30e6eb7..3160560 100644 --- a/efl/edje/Makefile +++ b/efl/edje/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=edje -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -68,7 +68,7 @@ endef define Package/edje/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libedje*.so* $(1)/usr/lib/ endef $(eval $(call HostBuild)) diff --git a/efl/eet/Makefile b/efl/eet/Makefile index 0b1d22d..b5e14ef 100644 --- a/efl/eet/Makefile +++ b/efl/eet/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=eet -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -45,13 +45,14 @@ define Build/Configure $(call Build/Configure/Default, \ --disable-old-eet-file-format \ --disable-gnutls \ + --disable-new-gnutls-api \ --disable-openssl \ --disable-cipher \ --disable-signature \ - --disable-doc \ --disable-assert \ --disable-tests \ --disable-coverage \ + --disable-doc \ ) endef @@ -60,13 +61,14 @@ define Host/Configure $(call Host/Configure/Default, \ --disable-old-eet-file-format \ --disable-gnutls \ + --disable-new-gnutls-api \ --disable-openssl \ --disable-cipher \ --disable-signature \ - --disable-doc \ --disable-assert \ --disable-tests \ --disable-coverage \ + --disable-doc \ ) endef @@ -75,16 +77,14 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef define Package/eet/install - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libeet*.so* $(1)/usr/lib/ endef $(eval $(call HostBuild)) diff --git a/efl/efreet/Makefile b/efl/efreet/Makefile index 0f17cd5..1e28f95 100644 --- a/efl/efreet/Makefile +++ b/efl/efreet/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=efreet -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -40,7 +40,7 @@ endef define Build/Configure ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); $(call Build/Configure/Default, \ - --disable-sloppy-spec \ + --enable-sloppy-spec \ --disable-doc \ --enable-hidden-visibility \ ) @@ -57,9 +57,8 @@ define Build/InstallDev endef define Package/efreet/install - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libefreet*.so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,efreet)) diff --git a/efl/eina/Makefile b/efl/eina/Makefile index d6a9db1..2d71a50 100644 --- a/efl/eina/Makefile +++ b/efl/eina/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=eina -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -31,6 +31,7 @@ define Package/eina SUBMENU:=libraries TITLE:=Eina URL:=http://wiki.enlightenment.org/index.php/Eina + DEPENDS:=+libpthread endef define Build/Configure @@ -39,8 +40,12 @@ define Build/Configure --disable-cpu-mmx \ --disable-cpu-sse \ --disable-cpu-sse2 \ + --disable-cpu-altivec \ --disable-magic-debug \ --disable-doc \ + --disable-pthread \ + --disable-tests \ + --disable-benchmark \ ) endef @@ -50,8 +55,12 @@ define Host/Configure --disable-cpu-mmx \ --disable-cpu-sse \ --disable-cpu-sse2 \ + --disable-cpu-altivec \ --disable-magic-debug \ --disable-doc \ + --disable-pthread \ + --disable-tests \ + --disable-benchmark \ ) endef @@ -66,10 +75,9 @@ define Build/InstallDev endef define Package/eina/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(FIND) $(1)/ -name "*.la" | $(XARGS) rm - $(FIND) $(1)/ -name "*.a" | $(XARGS) rm + $(INSTALL_DIR) $(1)/usr/lib/eina/mp + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libeina*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/eina/mp/*.so* $(1)/usr/lib/eina/mp/ endef $(eval $(call HostBuild)) diff --git a/efl/elementary/Makefile b/efl/elementary/Makefile new file mode 100644 index 0000000..2c8cc63 --- /dev/null +++ b/efl/elementary/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=elementary +PKG_REV:=40853 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/TMP/st/$(PKG_NAME) +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_BUILD_DEPENDS:=edje/host + +PKG_FIXUP = libtool + +include $(INCLUDE_DIR)/package.mk + +define Package/elementary + SECTION:=xorg-lib + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Elementary + URL:=http://wiki.enlightenment.org/index.php/Elementary + DEPENDS:=+eina +eet +evas +ecore +edje +libpthread +endef + +define Build/Configure + ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); + $(call Build/Configure/Default, \ + --with-edje-cc=$(STAGING_DIR_HOST)/bin/edje_cc \ + ) +endef + +define Build/Compile + DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/elementary/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelementary*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,elementary)) diff --git a/efl/embryo/Makefile b/efl/embryo/Makefile index 99fb4e3..3970e6b 100644 --- a/efl/embryo/Makefile +++ b/efl/embryo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=embryo -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -62,9 +62,8 @@ define Build/InstallDev endef define Package/embryo/install - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libembryo.so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/embryo_cc $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libembryo*.so* $(1)/usr/lib/ endef $(eval $(call HostBuild)) diff --git a/efl/enlightenment/Makefile b/efl/enlightenment/Makefile index e29845e..ff6994c 100644 --- a/efl/enlightenment/Makefile +++ b/efl/enlightenment/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=enlightenment -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -20,7 +20,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/e PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_BUILD_DEPENDS:=edje/host +PKG_BUILD_DEPENDS:=edje/host eet/host PKG_FIXUP = libtool @@ -52,23 +52,24 @@ TARGET_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib define Build/Configure ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); $(call Build/Configure/Default, \ - --with-x \ - --with-edje-cc=$(STAGING_DIR_HOST)/usr/bin/edje_cc \ - --with-eet-eet=$(STAGING_DIR_HOST)/usr/bin/eet \ + --disable-pam \ + --disable-simple-x11 \ --disable-nls \ --disable-rpath \ + --enable-files \ --enable-ibar \ - --enable-dropshadow \ + --disable-dropshadow \ --enable-clock \ --enable-pager \ --enable-battery \ --enable-temperature \ - --enable-cpufreq \ + --disable-cpufreq \ --enable-ibox \ --enable-start \ --enable-exebuf \ --enable-winlist \ --enable-fileman \ + --enable-fileman-opinfo \ --disable-wizard \ --disable-msgbus-lang \ --enable-gadman \ @@ -76,9 +77,9 @@ define Build/Configure --disable-connman \ --enable-illume \ --enable-syscon \ - --disable-pam \ - --disable-simple-x11 \ - --enable-files \ + --with-x \ + --with-edje-cc=$(STAGING_DIR_HOST)/bin/edje_cc \ + --with-eet-eet=$(STAGING_DIR_HOST)/bin/eet \ ) endef @@ -90,22 +91,16 @@ PROFILES:=\ standard \ define Build/Compile - mkdir -p $(STAGING_DIR_HOST)/usr/bin - # let's see who is workarounding the edje[_cc]/eet-issue most dirrty ^^ - ln -sf `which edje_cc` $(STAGING_DIR_HOST)/usr/bin/ - ln -sf `which eet` $(STAGING_DIR_HOST)/usr/bin/ DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install $(foreach c, $(PROFILES), \ - ! [ -f ./files/config/$(c).cfg.src ] || $(STAGING_DIR_HOST)/usr/bin/eet -e $(PKG_INSTALL_DIR)/usr/share/enlightenment/data/config/$(c)/e.cfg config ./files/config/$(c).cfg.src 1 + ! [ -f ./files/config/$(c).cfg.src ] || $(STAGING_DIR_HOST)/bin/eet -e $(PKG_INSTALL_DIR)/usr/share/enlightenment/data/config/$(c)/e.cfg config ./files/config/$(c).cfg.src 1 ) - rm -f $(STAGING_DIR_HOST)/usr/bin/{edje_cc,eet} endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(1)/usr/share + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ endef @@ -114,6 +109,7 @@ define Package/enlightenment/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ $(foreach c, $(PROFILES), \ $(if $(CONFIG_E17_$(c)), \ $(INSTALL_DATA) ./files/uci-defaults/x11_$(c) $(1)/etc/uci-defaults/ @@ -124,16 +120,10 @@ define Package/enlightenment/install endef define Package/enlightenment/postinst - #!/bin/sh - [ -n "$${IPKG_INSTROOT}" ] && exit - . /etc/functions.sh - uci_apply_defaults +#!/bin/sh +[ -n "$${IPKG_INSTROOT}" ] && exit +. /etc/functions.sh +uci_apply_defaults endef $(eval $(call BuildPackage,enlightenment)) -$(eval $(call RequireCommand,edje_cc, \ - Command not found - please install edje with edje-cc enabled \ -)) -$(eval $(call RequireCommand,eet, \ - Command not found - please install eet \ -)) diff --git a/efl/enlightenment/files/uci-defaults/x11_standard b/efl/enlightenment/files/uci-defaults/x11_standard index c7c7edf..40a2d77 100644 --- a/efl/enlightenment/files/uci-defaults/x11_standard +++ b/efl/enlightenment/files/uci-defaults/x11_standard @@ -1 +1 @@ -uci set x11.@desktop[0].autostart='enlightenment_start -profile standard' +uci set x11.@desktop[0].autostart='xterm' diff --git a/efl/etk/Makefile b/efl/etk/Makefile index 3daa37f..fcf54a4 100644 --- a/efl/etk/Makefile +++ b/efl/etk/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=etk -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -62,14 +62,10 @@ define Build/InstallDev endef define Package/etk/install - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/share $(1)/usr/bin $(1)/usr/lib/etk/engines - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/share $(1)/usr/lib/etk/engines + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libetk*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/etk/engines/*.so* $(1)/usr/lib/etk/engines/ $(CP) $(PKG_INSTALL_DIR)/usr/share/etk $(1)/usr/share/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,etk)) -$(eval $(call RequireCommand,edje_cc, \ - Command not found - please install edje with edje-cc enabled \ -)) diff --git a/efl/evas/Makefile b/efl/evas/Makefile index 72211c7..2b424ff 100644 --- a/efl/evas/Makefile +++ b/efl/evas/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=evas -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -20,7 +20,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME) PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -HOST_BUILD_DEPENDS:=libjpeg/host libpng/host libfreetype/host eet/host +HOST_BUILD_DEPENDS:=fribidi/host jpeg/host libpng/host libfreetype/host eet/host PKG_FIXUP = libtool @@ -33,31 +33,66 @@ define Package/evas SUBMENU:=libraries TITLE:=Evas is a hardware-accelerated canvas API for X-Windows URL:=http://wiki.enlightenment.org/index.php/Evas - DEPENDS:=+libXext +libfreetype +libX11 +fontconfig +eet +libjpeg +libpng +libXrender +libpthread + DEPENDS:=+fribidi +libXext +libfreetype +libX11 +fontconfig +eet +libjpeg +libpng +libXrender endef define Package/evas/description Evas is a hardware-accelerated canvas API for X-Windows that can draw anti-aliased text, smooth super and sub-sampled images, alpha-blend, as well as drop down to using normal X11 primitives such as pixmaps, lines and rectangles for speed if your CPU or graphics hardware are too slow. endef -# for weird reasons libevas.so seems to not being linked against libX11 +# magic-debug needs to be enabled, otherwise e17 segmentation faults randomly... define Build/Configure ( cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); $(call Build/Configure/Default, \ - --with-x \ + --disable-strict \ + --disable-evas-cserve \ + --disable-simple-x11 \ --enable-fontconfig \ + --enable-buffer \ + --enable-software-x11 \ + --enable-xrender-x11 \ + --disable-gl-x11 \ + --disable-software-xcb \ + --disable-xrender-xcb \ + --disable-software-gdi \ + --disable-software-ddraw \ + --disable-direct3d \ + --disable-quartz \ + --disable-gl-glew \ + --disable-software-sdl \ + --disable-fb \ + --disable-directfb \ + --disable-software-16-x11 \ + --disable-software-16-ddraw \ + --disable-software-16-wince \ + --disable-sdl-primitive \ --disable-image-loader-edb \ --enable-image-loader-eet \ --enable-font-loader-eet \ - --enable-image-loader-gif \ + --disable-image-loader-gif \ --enable-image-loader-jpeg \ --disable-image-loader-pmaps \ --enable-image-loader-png \ --disable-image-loader-svg \ --disable-image-loader-tiff \ - --enable-image-loader-xpm \ - --disable-evas-magic-debug \ + --disable-image-loader-xpm \ + --enable-pthreads \ + --disable-pipe-render \ + --disable-async-events \ + --disable-async-preload \ + --disable-cpu-mmx \ + --disable-cpu-sse \ + --disable-cpu-altivec \ + --disable-cpu-neon \ + --enable-cpu-c \ + --enable-evas-magic-debug \ + --disable-scale-sample \ + --enable-scale-smooth \ + --disable-convert-yuv \ + --disable-small-dither-mask \ + --disable-line-dither-mask \ + --disable-no-dither-mask \ --enable-convert-8-rgb-332 \ --enable-convert-8-rgb-666 \ --enable-convert-8-rgb-232 \ @@ -80,20 +115,32 @@ define Build/Configure --enable-convert-32-rgbx-8888 \ --enable-convert-32-bgr-8888 \ --enable-convert-32-bgrx-8888 \ + --enable-convert-24-rgb-ezx \ + --enable-convert-32-rgb-ezx \ --enable-convert-32-rgb-rot-0 \ --enable-convert-32-rgb-rot-180 \ --enable-convert-32-rgb-rot-270 \ --enable-convert-32-rgb-rot-90 \ + --disable-valgrind \ --disable-doc \ + --with-x \ + ) +endef + +define Host/Configure + ( cd $(HOST_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); + $(call Host/Configure/Default, \ + --disable-strict \ + --disable-evas-cserve \ --disable-simple-x11 \ + --disable-fontconfig \ --enable-buffer \ - --enable-software-x11 \ - --enable-xrender-x11 \ + --disable-software-x11 \ + --disable-xrender-x11 \ --disable-gl-x11 \ - --disable-glitz-x11 \ - --disable-cairo-x11 \ --disable-software-xcb \ --disable-xrender-xcb \ + --disable-software-gdi \ --disable-software-ddraw \ --disable-direct3d \ --disable-quartz \ @@ -101,44 +148,36 @@ define Build/Configure --disable-software-sdl \ --disable-fb \ --disable-directfb \ - --disable-software-qtopia \ --disable-software-16-x11 \ --disable-software-16-ddraw \ --disable-software-16-wince \ --disable-sdl-primitive \ + --disable-image-loader-edb \ + --enable-image-loader-eet \ + --disable-font-loader-eet \ + --disable-image-loader-gif \ + --enable-image-loader-jpeg \ + --disable-image-loader-pmaps \ + --enable-image-loader-png \ + --disable-image-loader-svg \ + --disable-image-loader-tiff \ + --disable-image-loader-xpm \ --enable-pthreads \ + --disable-pipe-render \ --disable-async-events \ --disable-async-preload \ --disable-cpu-mmx \ --disable-cpu-sse \ --disable-cpu-altivec \ + --disable-cpu-neon \ --enable-cpu-c \ - --enable-scale-sample \ + --enable-evas-magic-debug \ + --disable-scale-sample \ --enable-scale-smooth \ --disable-convert-yuv \ --disable-small-dither-mask \ --disable-line-dither-mask \ --disable-no-dither-mask \ - --disable-valgrind \ - ) -endef - -define Host/Configure - ( cd $(HOST_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh ); - $(call Host/Configure/Default, \ - --without-x \ - --disable-fontconfig \ - --disable-image-loader-edb \ - --enable-image-loader-eet \ - --disable-font-loader-eet \ - --enable-image-loader-gif \ - --enable-image-loader-jpeg \ - --disable-image-loader-pmaps \ - --enable-image-loader-png \ - --disable-image-loader-svg \ - --disable-image-loader-tiff \ - --enable-image-loader-xpm \ - --disable-evas-magic-debug \ --disable-convert-8-rgb-332 \ --disable-convert-8-rgb-666 \ --disable-convert-8-rgb-232 \ @@ -161,46 +200,15 @@ define Host/Configure --disable-convert-32-rgbx-8888 \ --disable-convert-32-bgr-8888 \ --disable-convert-32-bgrx-8888 \ + --disable-convert-24-rgb-ezx \ + --disable-convert-32-rgb-ezx \ --disable-convert-32-rgb-rot-0 \ --disable-convert-32-rgb-rot-180 \ --disable-convert-32-rgb-rot-270 \ --disable-convert-32-rgb-rot-90 \ - --disable-doc \ - --disable-simple-x11 \ - --enable-buffer \ - --disable-software-x11 \ - --disable-xrender-x11 \ - --disable-gl-x11 \ - --disable-glitz-x11 \ - --disable-cairo-x11 \ - --disable-software-xcb \ - --disable-xrender-xcb \ - --disable-software-ddraw \ - --disable-direct3d \ - --disable-quartz \ - --disable-gl-glew \ - --disable-software-sdl \ - --disable-fb \ - --disable-directfb \ - --disable-software-qtopia \ - --disable-software-16-x11 \ - --disable-software-16-ddraw \ - --disable-software-16-wince \ - --disable-sdl-primitive \ - --disable-pthreads \ - --disable-async-events \ - --disable-async-preload \ - --disable-cpu-mmx \ - --disable-cpu-sse \ - --disable-cpu-altivec \ - --enable-cpu-c \ - --enable-scale-sample \ - --enable-scale-smooth \ - --disable-convert-yuv \ - --disable-small-dither-mask \ - --disable-line-dither-mask \ - --disable-no-dither-mask \ --disable-valgrind \ + --disable-doc \ + --without-x \ ) endef @@ -216,7 +224,7 @@ endef define Package/evas/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevas.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevas*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/evas $(1)/usr/lib/ $(FIND) $(1)/ -name "*.la" | $(XARGS) rm $(FIND) $(1)/ -name "*.a" | $(XARGS) rm diff --git a/efl/python-e_dbus/Makefile b/efl/python-e_dbus/Makefile index 5d54c85..0d4d3d0 100644 --- a/efl/python-e_dbus/Makefile +++ b/efl/python-e_dbus/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-e_dbus -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -30,7 +30,7 @@ define Package/python-e_dbus SECTION:=lang CATEGORY:=Languages TITLE:=python-e_dbus - DEPENDS:=+python-mini +ecore +eina +edbus +dbus-python + DEPENDS:=+python-mini +ecore +edbus +dbus-python endef define Package/python-e_dbus/description diff --git a/efl/python-ecore/Makefile b/efl/python-ecore/Makefile index 1323209..f4f53cb 100644 --- a/efl/python-ecore/Makefile +++ b/efl/python-ecore/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-ecore -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -37,6 +37,9 @@ define Package/python-ecore/description ecore python bindings endef +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include +TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib + define Build/Compile $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") endef diff --git a/efl/python-ecore/patches/001-pyrex-is-not-needed.patch b/efl/python-ecore/patches/001-pyrex-is-not-needed.patch new file mode 100644 index 0000000..1ba9fc5 --- /dev/null +++ b/efl/python-ecore/patches/001-pyrex-is-not-needed.patch @@ -0,0 +1,15 @@ +--- efl/setup.py (revision 40080) ++++ efl/setup.py (working copy) +@@ -6,12 +6,6 @@ + import Cython + except ImportError: + raise SystemExit("You need Cython -- http://cython.org/") +- try: +- import Pyrex +- except ImportError: +- raise SystemExit( +- "You need Pyrex -- " +- "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/") + + + from ez_setup import use_setuptools diff --git a/efl/python-edje/Makefile b/efl/python-edje/Makefile index 0a0af3e..8f743ac 100644 --- a/efl/python-edje/Makefile +++ b/efl/python-edje/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-edje -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 diff --git a/efl/python-edje/patches/001-pyrex-is-not-needed.patch b/efl/python-edje/patches/001-pyrex-is-not-needed.patch new file mode 100644 index 0000000..1ba9fc5 --- /dev/null +++ b/efl/python-edje/patches/001-pyrex-is-not-needed.patch @@ -0,0 +1,15 @@ +--- efl/setup.py (revision 40080) ++++ efl/setup.py (working copy) +@@ -6,12 +6,6 @@ + import Cython + except ImportError: + raise SystemExit("You need Cython -- http://cython.org/") +- try: +- import Pyrex +- except ImportError: +- raise SystemExit( +- "You need Pyrex -- " +- "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/") + + + from ez_setup import use_setuptools diff --git a/efl/python-elementary/Makefile b/efl/python-elementary/Makefile new file mode 100644 index 0000000..f11f0bb --- /dev/null +++ b/efl/python-elementary/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id: Makefile 13786 2008-12-31 15:02:25Z lars $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-elementary + +PKG_REV:=40853 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/BINDINGS/python/$(PKG_NAME) + +PKG_BUILD_DEPENDS:=cython python + +include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) + +define Package/python-elementary + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=python-elementary + DEPENDS:=+python-mini +elementary +evas +eina +python-evas +endef + +define Package/python-elementary/description + elementary python bindings +endef + +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include +TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib + +define Build/Compile + $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") +endef + +define Package/python-elementary/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ + $(1)$(PYTHON_PKG_DIR) +endef + +$(eval $(call BuildPackage,python-elementary)) diff --git a/efl/python-elementary/patches/000-prevent-using-setuptools.patch b/efl/python-elementary/patches/000-prevent-using-setuptools.patch new file mode 100644 index 0000000..26fb083 --- /dev/null +++ b/efl/python-elementary/patches/000-prevent-using-setuptools.patch @@ -0,0 +1,20 @@ +diff -ruN python-elementary.orig/setup.py python-elementary/setup.py +--- python-elementary.orig/setup.py 2009-05-20 21:14:09.000000000 +0200 ++++ python-elementary/setup.py 2009-05-20 21:22:29.000000000 +0200 +@@ -14,7 +14,6 @@ + "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/") + + from distutils.core import setup +-from setuptools import find_packages + from distutils.extension import Extension + from Cython.Distutils import build_ext + import commands +@@ -75,7 +74,7 @@ + description = 'Python bindings for Elementary', + long_description = '', + keywords = 'wrapper bindings ui elementary graphics', +- packages = find_packages(), ++ packages = ['elementary'], + # headers = headers, + # classifiers = + # packages = diff --git a/efl/python-elementary/patches/001-pyrex-is-not-needed.patch b/efl/python-elementary/patches/001-pyrex-is-not-needed.patch new file mode 100644 index 0000000..1ba9fc5 --- /dev/null +++ b/efl/python-elementary/patches/001-pyrex-is-not-needed.patch @@ -0,0 +1,15 @@ +--- efl/setup.py (revision 40080) ++++ efl/setup.py (working copy) +@@ -6,12 +6,6 @@ + import Cython + except ImportError: + raise SystemExit("You need Cython -- http://cython.org/") +- try: +- import Pyrex +- except ImportError: +- raise SystemExit( +- "You need Pyrex -- " +- "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/") + + + from ez_setup import use_setuptools diff --git a/efl/python-etk/Makefile b/efl/python-etk/Makefile index 9e63211..ea348c0 100644 --- a/efl/python-etk/Makefile +++ b/efl/python-etk/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-etk -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -37,6 +37,9 @@ define Package/python-etk/description etk python bindings endef +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include +TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib + define Build/Compile $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") endef diff --git a/efl/python-etk/patches/001-pyrex-is-not-needed.patch b/efl/python-etk/patches/001-pyrex-is-not-needed.patch new file mode 100644 index 0000000..1ba9fc5 --- /dev/null +++ b/efl/python-etk/patches/001-pyrex-is-not-needed.patch @@ -0,0 +1,15 @@ +--- efl/setup.py (revision 40080) ++++ efl/setup.py (working copy) +@@ -6,12 +6,6 @@ + import Cython + except ImportError: + raise SystemExit("You need Cython -- http://cython.org/") +- try: +- import Pyrex +- except ImportError: +- raise SystemExit( +- "You need Pyrex -- " +- "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/") + + + from ez_setup import use_setuptools diff --git a/efl/python-evas/Makefile b/efl/python-evas/Makefile index f012efa..123b2d2 100644 --- a/efl/python-evas/Makefile +++ b/efl/python-evas/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-evas -PKG_REV:=38886 +PKG_REV:=40853 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -30,7 +30,7 @@ define Package/python-evas SECTION:=lang CATEGORY:=Languages TITLE:=python-evas - DEPENDS:=+python-mini +evas +eina + DEPENDS:=+python-mini +evas endef define Package/python-evas/description @@ -41,6 +41,11 @@ define Build/Compile $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") endef +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ +endef + define Package/python-evas/install $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(CP) \ diff --git a/efl/python-evas/patches/001-pyrex-is-not-needed.patch b/efl/python-evas/patches/001-pyrex-is-not-needed.patch new file mode 100644 index 0000000..1ba9fc5 --- /dev/null +++ b/efl/python-evas/patches/001-pyrex-is-not-needed.patch @@ -0,0 +1,15 @@ +--- efl/setup.py (revision 40080) ++++ efl/setup.py (working copy) +@@ -6,12 +6,6 @@ + import Cython + except ImportError: + raise SystemExit("You need Cython -- http://cython.org/") +- try: +- import Pyrex +- except ImportError: +- raise SystemExit( +- "You need Pyrex -- " +- "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/") + + + from ez_setup import use_setuptools