API tools faq
paste
Advertisement
rbelem

Untitled

rbelem
Nov 20th, 2015
101
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 18.99 KB | None | 0 0
raw download clone embed print report
  1. From 4555718e94ab0fbe89f12dca9a73f2680d4b91a3 Mon Sep 17 00:00:00 2001
  2. From: Rodrigo Belem <rodrigo.belem@gmail.com>
  3. Date: Tue, 17 Nov 2015 15:27:23 -0200
  4. Subject: [PATCH] Update EFL to version 1.16
  5.  
  6. Signed-off-by: Rodrigo Belem <rodrigo.belem@gmail.com>
  7. ---
  8. package/efl/Config.in                              |  14 +-
  9.  package/efl/efl.mk                                 |   3 +-
  10.  package/efl/libecore/Config.in                     |  46 -----
  11.  package/efl/libecore/libecore.mk                   | 114 -----------
  12.  package/efl/libefl/Config.in                       |  49 +++++
  13.  package/efl/libefl/libefl.mk                       | 227 +++++++++++++++++++++
  14.  package/efl/libelementary/libelementary.mk         |  57 ++++--
  15.  .../libevas-generic-loaders.mk                     |   6 +-
  16.  8 files changed, 328 insertions(+), 188 deletions(-)
  17.  delete mode 100644 package/efl/libecore/Config.in
  18.  delete mode 100644 package/efl/libecore/libecore.mk
  19.  create mode 100644 package/efl/libefl/Config.in
  20.  create mode 100644 package/efl/libefl/libefl.mk
  21.  
  22. diff --git a/package/efl/Config.in b/package/efl/Config.in
  23. index 3d31a26..c31649d 100644
  24. --- a/package/efl/Config.in
  25. +++ b/package/efl/Config.in
  26. @@ -10,19 +10,9 @@ menuconfig BR2_PACKAGE_EFL
  27.  
  28.  if BR2_PACKAGE_EFL
  29.  
  30. -source "package/efl/expedite/Config.in"
  31. -source "package/efl/libeina/Config.in"
  32. -source "package/efl/libecore/Config.in"
  33. -source "package/efl/libeet/Config.in"
  34. -source "package/efl/libefreet/Config.in"
  35. -source "package/efl/libeio/Config.in"
  36. -source "package/efl/libevas/Config.in"
  37. -source "package/efl/libevas-generic-loaders/Config.in"
  38. -source "package/efl/libembryo/Config.in"
  39. -source "package/efl/libedje/Config.in"
  40. -source "package/efl/libethumb/Config.in"
  41. +source "package/efl/libefl/Config.in"
  42.  source "package/efl/libelementary/Config.in"
  43. -source "package/efl/libedbus/Config.in"
  44. +source "package/efl/libevas-generic-loaders/Config.in"
  45.  
  46.  endif # BR2_PACKAGE_EFL
  47.  
  48. diff --git a/package/efl/efl.mk b/package/efl/efl.mk
  49. index aa6630c..9f9e505 100644
  50. --- a/package/efl/efl.mk
  51. +++ b/package/efl/efl.mk
  52. @@ -1,3 +1,4 @@
  53. -EFL_VERSION = 1.7.10
  54. +EFL_VERSION = 1.16.0
  55. +EFL_SITE = http://download.enlightenment.org/rel/libs
  56.  
  57.  include $(sort $(wildcard package/efl/*/*.mk))
  58. diff --git a/package/efl/libecore/Config.in b/package/efl/libecore/Config.in
  59. deleted file mode 100644
  60. index a9408dc..0000000
  61. --- a/package/efl/libecore/Config.in
  62. +++ /dev/null
  63. @@ -1,46 +0,0 @@
  64. -config BR2_PACKAGE_LIBECORE
  65. -   bool "libecore"
  66. -   select BR2_PACKAGE_LIBEINA
  67. -   help
  68. -     Ecore is the event/X abstraction layer that makes doing
  69. -     selections, Xdnd, general X stuff, event loops, timeouts and
  70. -     idle handlers fast, optimized, and convenient.
  71. -
  72. -     http://trac.enlightenment.org/e/wiki/Ecore
  73. -
  74. -if BR2_PACKAGE_LIBECORE
  75. -
  76. -config BR2_PACKAGE_LIBECORE_DIRECTFB
  77. -   bool "libecore DirectFB support"
  78. -   depends on BR2_PACKAGE_DIRECTFB
  79. -   default y
  80. -
  81. -config BR2_PACKAGE_LIBECORE_FB
  82. -   bool "libecore framebuffer support"
  83. -
  84. -config BR2_PACKAGE_LIBECORE_SDL
  85. -   bool "libecore SDL support"
  86. -   select BR2_PACKAGE_SDL
  87. -
  88. -config BR2_PACKAGE_LIBECORE_X
  89. -   bool "libecore X support"
  90. -   depends on BR2_PACKAGE_XORG7
  91. -   select BR2_PACKAGE_XLIB_LIBX11
  92. -   select BR2_PACKAGE_XLIB_LIBXEXT
  93. -
  94. -config BR2_PACKAGE_LIBECORE_X_XCB
  95. -   bool "libecore XCB support"
  96. -   depends on BR2_PACKAGE_XORG7
  97. -   select BR2_PACKAGE_LIBXCB
  98. -   select BR2_PACKAGE_XLIB_LIBX11
  99. -   select BR2_PACKAGE_XCB_UTIL
  100. -
  101. -config BR2_PACKAGE_LIBECORE_EVAS
  102. -   bool "libecore Evas support"
  103. -   select BR2_PACKAGE_LIBEVAS
  104. -   depends on BR2_TOOLCHAIN_HAS_THREADS
  105. -
  106. -comment "evas support needs a toolchain w/ threads"
  107. -   depends on !BR2_TOOLCHAIN_HAS_THREADS
  108. -
  109. -endif # BR2_PACKAGE_LIBECORE
  110. diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
  111. deleted file mode 100644
  112. index 1f711a8..0000000
  113. --- a/package/efl/libecore/libecore.mk
  114. +++ /dev/null
  115. @@ -1,114 +0,0 @@
  116. -################################################################################
  117. -#
  118. -# libecore
  119. -#
  120. -################################################################################
  121. -
  122. -LIBECORE_VERSION = $(EFL_VERSION)
  123. -LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
  124. -LIBECORE_SITE = http://download.enlightenment.org/releases
  125. -LIBECORE_LICENSE = BSD-2c
  126. -LIBECORE_LICENSE_FILES = COPYING
  127. -
  128. -LIBECORE_INSTALL_STAGING = YES
  129. -
  130. -LIBECORE_DEPENDENCIES = host-pkgconf libeina
  131. -
  132. -HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
  133. -HOST_LIBECORE_CONF_OPTS +=         \
  134. -   --enable-ecore-evas         \
  135. -   --disable-simple-x11        \
  136. -   --disable-ecore-directfb    \
  137. -   --disable-ecore-x       \
  138. -   --disable-ecore-x-xcb       \
  139. -   --disable-ecore-imf-xim
  140. -
  141. -# default options
  142. -LIBECORE_CONF_OPTS = --disable-simple-x11
  143. -
  144. -ifeq ($(BR2_PACKAGE_TSLIB),y)
  145. -LIBECORE_DEPENDENCIES += tslib
  146. -endif
  147. -
  148. -ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
  149. -LIBECORE_DEPENDENCIES += libglib2
  150. -endif
  151. -
  152. -ifeq ($(BR2_PACKAGE_OPENSSL),y)
  153. -LIBECORE_DEPENDENCIES += openssl
  154. -LIBECORE_CONF_OPTS += --enable-openssl
  155. -else
  156. -LIBECORE_CONF_OPTS += --disable-openssl
  157. -endif
  158. -
  159. -ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
  160. -LIBECORE_DEPENDENCIES += gnutls libgcrypt
  161. -LIBECORE_CONF_OPTS += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
  162. -else
  163. -LIBECORE_CONF_OPTS += --disable-gnutls
  164. -endif
  165. -
  166. -ifeq ($(BR2_PACKAGE_LIBCURL),y)
  167. -LIBECORE_DEPENDENCIES += libcurl
  168. -endif
  169. -
  170. -# libecore
  171. -ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
  172. -LIBECORE_CONF_OPTS += --enable-ecore-directfb
  173. -LIBECORE_DEPENDENCIES += directfb
  174. -else
  175. -LIBECORE_CONF_OPTS += --disable-ecore-directfb
  176. -endif
  177. -
  178. -ifeq ($(BR2_PACKAGE_LIBECORE_FB),y)
  179. -LIBECORE_CONF_OPTS += --enable-ecore-fb
  180. -else
  181. -LIBECORE_CONF_OPTS += --disable-ecore-fb
  182. -endif
  183. -
  184. -ifeq ($(BR2_PACKAGE_LIBECORE_SDL),y)
  185. -LIBECORE_CONF_OPTS += --enable-ecore-sdl
  186. -LIBECORE_DEPENDENCIES += sdl
  187. -else
  188. -LIBECORE_CONF_OPTS += --disable-ecore-sdl
  189. -endif
  190. -
  191. -ifeq ($(BR2_PACKAGE_LIBECORE_X),y)
  192. -LIBECORE_CONF_OPTS += --enable-ecore-x \
  193. -   --with-x=$(STAGING_DIR) \
  194. -   --x-includes=$(STAGING_DIR)/usr/include \
  195. -   --x-libraries=$(STAGING_DIR)/usr/lib
  196. -LIBECORE_DEPENDENCIES += xlib_libXext xlib_libX11
  197. -else
  198. -LIBECORE_CONF_OPTS += --disable-ecore-x --disable-ecore-imf-xim
  199. -endif
  200. -
  201. -ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)
  202. -LIBECORE_CONF_OPTS += --enable-ecore-x-xcb
  203. -LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util pixman
  204. -
  205. -# src/util/makekeys is executed at build time to generate
  206. -# ecore_xcb_keysym_table.h, so it should get compiled for the host.
  207. -# The ecore makefile unfortunately doesn't know about cross
  208. -# compilation so this doesn't work.  Long term, we should probably
  209. -# teach it about CC_FOR_BUILD, but for now simply build makekeys by
  210. -# hand in advance
  211. -define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
  212. -   $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/src/util makekeys.o makekeys
  213. -endef
  214. -
  215. -LIBECORE_POST_EXTRACT_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
  216. -else
  217. -LIBECORE_CONF_OPTS += --disable-ecore-x-xcb
  218. -endif
  219. -
  220. -# libecore-evas
  221. -ifeq ($(BR2_PACKAGE_LIBECORE_EVAS),y)
  222. -LIBECORE_CONF_OPTS += --enable-ecore-evas
  223. -LIBECORE_DEPENDENCIES += libevas
  224. -else
  225. -LIBECORE_CONF_OPTS += --disable-ecore-evas
  226. -endif
  227. -
  228. -$(eval $(autotools-package))
  229. -$(eval $(host-autotools-package))
  230. diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
  231. new file mode 100644
  232. index 0000000..35658c3
  233. --- /dev/null
  234. +++ b/package/efl/libefl/Config.in
  235. @@ -0,0 +1,49 @@
  236. +config BR2_PACKAGE_LIBEFL
  237. +   bool "libefl"
  238. +   select BR2_PACKAGE_LIBEINA
  239. +   help
  240. +     Ecore is the event/X abstraction layer that makes doing
  241. +     selections, Xdnd, general X stuff, event loops, timeouts and
  242. +     idle handlers fast, optimized, and convenient.
  243. +
  244. +     http://trac.enlightenment.org/e/wiki/Ecore
  245. +
  246. +if BR2_PACKAGE_LIBEFL
  247. +
  248. +
  249. +config BR2_PACKAGE_LIBEFL_LUAJIT
  250. +   bool "libefl Lua JIT support"
  251. +   default y
  252. +
  253. +config BR2_PACKAGE_LIBEFL_LUA
  254. +   bool "libefl Lua support"
  255. +
  256. +config BR2_PACKAGE_LIBEFL_DIRECTFB
  257. +   bool "libefl DirectFB support"
  258. +   depends on BR2_PACKAGE_DIRECTFB
  259. +
  260. +config BR2_PACKAGE_LIBEFL_FB
  261. +   bool "libefl framebuffer support"
  262. +   default y
  263. +
  264. +config BR2_PACKAGE_LIBEFL_SDL
  265. +   bool "libefl SDL support"
  266. +   select BR2_PACKAGE_SDL
  267. +
  268. +config BR2_PACKAGE_LIBEFL_X
  269. +   bool "libefl X support"
  270. +   depends on BR2_PACKAGE_XORG7
  271. +   select BR2_PACKAGE_XLIB_LIBX11
  272. +   select BR2_PACKAGE_XLIB_LIBXEXT
  273. +
  274. +config BR2_PACKAGE_LIBEFL_X_XCB
  275. +   bool "libefl XCB support"
  276. +   depends on BR2_PACKAGE_XORG7
  277. +   select BR2_PACKAGE_LIBXCB
  278. +   select BR2_PACKAGE_XLIB_LIBX11
  279. +   select BR2_PACKAGE_XCB_UTIL
  280. +
  281. +comment "evas support needs a toolchain w/ threads"
  282. +   depends on !BR2_TOOLCHAIN_HAS_THREADS
  283. +
  284. +endif # BR2_PACKAGE_LIBEFL
  285. diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
  286. new file mode 100644
  287. index 0000000..d5c4fe7
  288. --- /dev/null
  289. +++ b/package/efl/libefl/libefl.mk
  290. @@ -0,0 +1,227 @@
  291. +################################################################################
  292. +#
  293. +# libecore
  294. +#
  295. +################################################################################
  296. +
  297. +LIBEFL_VERSION = $(EFL_VERSION)
  298. +LIBEFL_SOURCE = efl-$(EFL_VERSION).tar.xz
  299. +LIBEFL_SITE = $(EFL_SITE)/efl
  300. +LIBEFL_LICENSE = BSD-2c
  301. +LIBEFL_LICENSE_FILES = COPYING
  302. +
  303. +LIBEFL_INSTALL_STAGING = YES
  304. +
  305. +LIBEFL_DEPENDENCIES = host-pkgconf host-libefl tiff dbus
  306. +
  307. +HOST_LIBEFL_DEPENDENCIES = host-pkgconf host-openssl host-luajit host-freetype host-dbus host-fontconfig
  308. +HOST_LIBEFL_CONF_OPTS += \
  309. +   --disable-audio \
  310. +   --disable-multisense \
  311. +   --disable-libeeze \
  312. +   --with-x11=none \
  313. +   --disable-fribidi \
  314. +   --disable-gstreamer \
  315. +   --disable-gstreamer1 \
  316. +   --disable-physics \
  317. +   --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \
  318. +   --disable-image-loader-bmp \
  319. +   --disable-image-loader-generic \
  320. +   --disable-image-loader-gif \
  321. +   --disable-image-loader-ico \
  322. +   --disable-image-loader-jp2k \
  323. +   --disable-image-loader-pmaps \
  324. +   --disable-image-loader-psd \
  325. +   --disable-image-loader-tga \
  326. +   --disable-image-loader-wbmp \
  327. +   --disable-image-loader-webp \
  328. +   --disable-image-loader-xpm \
  329. +   --disable-image-loader-tgv \
  330. +   --disable-image-loader-dds \
  331. +   --disable-fontconfig \
  332. +   --disable-cserve \
  333. +# Fail to build when use this option
  334. +#  --disable-image-loader-eet \
  335. +
  336. +LIBEFL_CONF_OPTS += \
  337. +   --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
  338. +   --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
  339. +   --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx \
  340. +   --with-elua=$(HOST_DIR)/usr/bin/elua
  341. +
  342. +# default options
  343. +LIBEFL_CONF_OPTS += --disable-doc \
  344. +   --disable-fribidi \
  345. +   --disable-cserve \
  346. +   --disable-fontconfig \
  347. +   --disable-image-loader-bmp \
  348. +   --disable-image-loader-gif \
  349. +   --disable-image-loader-ico \
  350. +   --disable-image-loader-jp2k \
  351. +   --disable-image-loader-pmaps \
  352. +   --disable-image-loader-psd \
  353. +   --disable-image-loader-tga \
  354. +   --disable-image-loader-wbmp \
  355. +   --disable-image-loader-webp \
  356. +   --disable-image-loader-xpm \
  357. +   --disable-image-loader-tgv \
  358. +   --disable-image-loader-dds \
  359. +#  --disable-image-loader-generic \
  360. +# Fail to build when use this option
  361. +#: --disable-image-loader-eet \
  362. +
  363. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y)
  364. +LIBEFL_CONF_OPTS += --enable-cxx-bindings
  365. +else
  366. +LIBEFL_CONF_OPTS += --disable-cxx-bindings
  367. +endif
  368. +
  369. +ifeq ($(BR2_PACKAGE_LIBEFL_LUAJIT),y)
  370. +LIBEFL_DEPENDENCIES += luajit
  371. +LIBEFL_CONF_OPTS += --disable-lua-old
  372. +endif
  373. +
  374. +ifeq ($(BR2_PACKAGE_LIBEFL_LUA),y)
  375. +LIBEFL_DEPENDENCIES += lua
  376. +LIBEFL_CONF_OPTS += --enable-lua-old
  377. +endif
  378. +
  379. +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
  380. +LIBEFL_DEPENDENCIES += systemd
  381. +LIBEFL_CONF_OPTS += --enable-systemd
  382. +else
  383. +LIBEFL_CONF_OPTS += --disable-systemd
  384. +endif
  385. +
  386. +ifeq ($(BR2_PACKAGE_AVAHI),y)
  387. +LIBEFL_DEPENDENCIES += avahi
  388. +LIBEFL_CONF_OPTS += --enable-avahi
  389. +else
  390. +LIBEFL_CONF_OPTS += --disable-avahi
  391. +endif
  392. +
  393. +ifeq ($(BR2_PACKAGE_GSTREAMER),y)
  394. +LIBEFL_DEPENDENCIES += gstreamer
  395. +LIBEFL_CONF_OPTS += --enable-gstreamer
  396. +else
  397. +LIBEFL_CONF_OPTS += --disable-gstreamer
  398. +endif
  399. +
  400. +ifeq ($(BR2_PACKAGE_GSTREAMER1),y)
  401. +LIBEFL_DEPENDENCIES += gstreamer1
  402. +LIBEFL_CONF_OPTS += --enable-gstreamer1
  403. +else
  404. +LIBEFL_CONF_OPTS += --disable-gstreamer1
  405. +endif
  406. +
  407. +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
  408. +LIBEFL_DEPENDENCIES += pulseaudio
  409. +LIBEFL_CONF_OPTS += --enable-pulseaudio
  410. +else
  411. +LIBEFL_CONF_OPTS += --disable-pulseaudio
  412. +endif
  413. +
  414. +ifeq ($(BR2_PACKAGE_TSLIB),y)
  415. +LIBEFL_DEPENDENCIES += tslib
  416. +LIBEFL_CONF_OPTS += --enable-tslib
  417. +endif
  418. +
  419. +ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
  420. +LIBEFL_DEPENDENCIES += libglib2
  421. +LIBEFL_CONF_OPTS += --with-glib=yes
  422. +else
  423. +LIBEFL_CONF_OPTS += --with-glib=no
  424. +endif
  425. +
  426. +BR2_PACKAGE_LIBEFL_OPENSSL=y
  427. +ifeq ($(BR2_PACKAGE_LIBEFL_OPENSSL),y)
  428. +LIBEFL_DEPENDENCIES += openssl
  429. +LIBEFL_CONF_OPTS += --with-crypto=openssl
  430. +else ifeq ($(BR2_PACKAGE_LIBEFL_GNUTLS),y)
  431. +LIBEFL_DEPENDENCIES += gnutls libgcrypt
  432. +LIBEFL_CONF_OPTS += --with-crypto=gnutls
  433. +else
  434. +# Fails to build when disable this
  435. +LIBEFL_CONF_OPTS += --with-crypto=none
  436. +endif
  437. +
  438. +ifeq ($(BR2_PACKAGE_LIBEFL_OPENGL),y)
  439. +LIBEFL_CONF_OPTS += --with-opengl=full
  440. +else ifeq ($(BR2_PACKAGE_LIBEFL_OPENGLES),y)
  441. +LIBEFL_CONF_OPTS += --with-opengl=es
  442. +else
  443. +LIBEFL_CONF_OPTS += --with-opengl=none
  444. +endif
  445. +
  446. +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
  447. +LIBEFL_CONF_OPTS += --enable-egl
  448. +endif
  449. +
  450. +BR2_PACKAGE_LIBEFL_FB=y
  451. +ifeq ($(BR2_PACKAGE_LIBEFL_FB),y)
  452. +LIBEFL_CONF_OPTS += --enable-fb
  453. +endif
  454. +
  455. +ifeq ($(BR2_PACKAGE_LIBEFL_SDL),y)
  456. +LIBEFL_DEPENDENCIES += sdl
  457. +LIBEFL_CONF_OPTS += --enable-sdl
  458. +endif
  459. +
  460. +ifeq ($(BR2_PACKAGE_WAYLAND),y)
  461. +LIBEFL_CONF_OPTS += --enable-wayland --enable-wayland-ivi-shell
  462. +else
  463. +LIBEFL_CONF_OPTS += --disable-wayland --disable-wayland-ivi-shell
  464. +endif
  465. +
  466. +ifeq ($(BR2_PACKAGE_LIBEFL_X),y)
  467. +LIBEFL_CONF_OPTS += --with-x \
  468. +   --x-includes=$(STAGING_DIR)/usr/include \
  469. +   --x-libraries=$(STAGING_DIR)/usr/lib
  470. +LIBEFL_DEPENDENCIES += xlib_libXext xlib_libX11
  471. +else
  472. +LIBEFL_CONF_OPTS += --with-x11=none
  473. +endif
  474. +
  475. +ifeq ($(BR2_PACKAGE_LIBEFL_X_XLIB),y)
  476. +LIBEFL_CONF_OPTS += --with-x11=xlib
  477. +else ifeq ($(BR2_PACKAGE_LIBEFL_X_XCB),y)
  478. +LIBEFL_CONF_OPTS += --with-x11=xcb
  479. +LIBEFL_DEPENDENCIES += libxcb xlib_libX11 xcb-util pixman
  480. +
  481. +# src/util/makekeys is executed at build time to generate
  482. +# ecore_xcb_keysym_table.h, so it should get compiled for the host.
  483. +# The ecore makefile unfortunately doesn't know about cross
  484. +# compilation so this doesn't work.  Long term, we should probably
  485. +# teach it about CC_FOR_BUILD, but for now simply build makekeys by
  486. +# hand in advance
  487. +define LIBEFL_BUILD_MAKEKEYS_FOR_HOST
  488. +   $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/src/util makekeys.o makekeys
  489. +endef
  490. +
  491. +LIBEFL_POST_EXTRACT_HOOKS += LIBEFL_BUILD_MAKEKEYS_FOR_HOST
  492. +endif
  493. +
  494. +# libudev
  495. +ifeq ($(BR2_PACKAGE_LIBEFL_EEZE),y)
  496. +LIBEFL_CONF_OPTS += --enable-libeeze
  497. +else
  498. +LIBEFL_CONF_OPTS += --disable-libeeze
  499. +endif
  500. +
  501. +# libsndfile
  502. +ifeq ($(BR2_PACKAGE_LIBEFL_ECORE_AUDIO),y)
  503. +LIBEFL_CONF_OPTS += --enable-audio
  504. +else
  505. +LIBEFL_CONF_OPTS += --disable-audio --disable-multisense
  506. +endif
  507. +
  508. +# bullet
  509. +ifeq ($(BR2_PACKAGE_LIBEFL_PHYSICS),y)
  510. +LIBEFL_CONF_OPTS +=--enable-physics
  511. +else
  512. +LIBEFL_CONF_OPTS +=--disable-physics \
  513. +   --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
  514. +endif
  515. +
  516. +$(eval $(autotools-package))
  517. +$(eval $(host-autotools-package))
  518. diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
  519. index 474e67f..c56edc5 100644
  520. --- a/package/efl/libelementary/libelementary.mk
  521. +++ b/package/efl/libelementary/libelementary.mk
  522. @@ -5,28 +5,61 @@
  523.  ################################################################################
  524.  
  525.  LIBELEMENTARY_VERSION = $(EFL_VERSION)
  526. -LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
  527. -LIBELEMENTARY_SITE = http://download.enlightenment.org/releases
  528. +LIBELEMENTARY_SOURCE = elementary-$(EFL_VERSION).tar.xz
  529. +LIBELEMENTARY_SITE = $(EFL_SITE)/elementary
  530.  LIBELEMENTARY_LICENSE = LGPLv2.1
  531.  LIBELEMENTARY_LICENSE_FILES = COPYING
  532.  
  533.  LIBELEMENTARY_INSTALL_STAGING = YES
  534.  
  535. -LIBELEMENTARY_DEPENDENCIES = \
  536. -   libeina libevas libecore libedje host-libedje \
  537. -   host-libeet
  538. +LIBELEMENTARY_DEPENDENCIES = host-libefl host-libelementary libefl
  539.  
  540. -LIBELEMENTARY_CONF_OPTS = \
  541. +HOST_LIBELEMENTARY_DEPENDENCIES = host-libefl
  542. +
  543. +HOST_LIBELEMENTARY_CONF_OPTS += \
  544. +   --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
  545. +   --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
  546. +   --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
  547. +   --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx \
  548. +
  549. +LIBELEMENTARY_CONF_OPTS += \
  550. +   --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
  551.     --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
  552. -   --with-eet-eet=$(HOST_DIR)/usr/bin/eet
  553. +   --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
  554. +   --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx \
  555. +   --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \
  556. +   --with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \
  557. +
  558. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y)
  559. +LIBEFL_CONF_OPTS += --enable-cxx-bindings
  560. +else
  561. +LIBEFL_CONF_OPTS += --disable-cxx-bindings
  562. +endif
  563.  
  564.  # libethumb_client is only built when ethumbd is built.
  565.  # ethumbd is only built if edbus is built.
  566. -ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
  567. -LIBELEMENTARY_DEPENDENCIES += libethumb
  568. -LIBELEMENTARY_CONF_OPTS += --enable-ethumb
  569. -else
  570. -LIBELEMENTARY_CONF_OPTS += --disable-ethumb
  571. +#ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
  572. +#LIBELEMENTARY_CONF_OPTS += --enable-ethumb
  573. +#else
  574. +#LIBELEMENTARY_CONF_OPTS += --disable-ethumb
  575. +#endif
  576. +
  577. +BR2_PACKAGE_LIBEFL_FB=y
  578. +ifeq ($(BR2_PACKAGE_LIBEFL_FB),y)
  579. +LIBELEMENTARY_CONF_OPTS += --enable-ecore-fb
  580. +endif
  581. +
  582. +ifeq ($(BR2_PACKAGE_LIBEFL_SDL),y)
  583. +LIBELEMENTARY_CONF_OPTS += --enable-ecore-sdl
  584. +endif
  585. +
  586. +ifeq ($(BR2_PACKAGE_WAYLAND),y)
  587. +LIBELEMENTARY_CONF_OPTS +=--enable-ecore-wayland
  588. +endif
  589. +
  590. +ifeq ($(BR2_PACKAGE_LIBEFL_X),y)
  591. +LIBELEMENTARY_CONF_OPTS += --enable-ecore-x
  592.  endif
  593.  
  594.  $(eval $(autotools-package))
  595. +$(eval $(host-autotools-package))
  596. diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
  597. index 3f4e1b2..dae0730 100644
  598. --- a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
  599. +++ b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
  600. @@ -5,14 +5,14 @@
  601.  ################################################################################
  602.  
  603.  LIBEVAS_GENERIC_LOADERS_VERSION = $(EFL_VERSION)
  604. -LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
  605. -LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases
  606. +LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(EFL_VERSION).tar.xz
  607. +LIBEVAS_GENERIC_LOADERS_SITE = $(EFL_SITE)/evas_generic_loaders
  608.  LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2
  609.  LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING
  610.  
  611.  LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES
  612.  
  613. -LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib
  614. +LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = zlib libefl
  615.  
  616.  # For now, we only support the SVG loader
  617.  LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
  618. --
  619. 2.1.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!