efl: upgrade, rename, add options.mk

1) Rename from efl-current to efl, no efl package in pkgsrc

2) Add options.mk
	- debug: enable debug on build
	- g-mainloop: use glib to run the main loop in efl [suggested]
		efreetd with efl own main loop cause segfault on NetBSD
		https://phab.enlightenment.org/T8812
	- gcc8: build with gcc8

3) Upgrade to 1.25.0

Changes since 1.24.0:
---------------------

Features:

   * ecore-drm2: Add support for using page_flip_handler2
   * ecore-drm2: Add API function to return default depth

Fixes:

   * ecore_evas: only define these eina errors once
   * exactness: remove no longer needed _evas_new()
   * edje - don't set font sizes less than 1
   * ecore_evas_x - fix maximize/unmaximize request corner case
   * exactness_player: do not test for delay_ms
   * evas + gl - fix callback-to-app-changes-state issue with pixel data
   * canvas render: don't apply mask if the objects in the map.
   * evas_object_textblock: fix to free style properly by edje's style_user_pop
   * evas_vg_shape: return NULL in evas_vg_shape_add when the parent of shape is NULL
   * efl_ui_image: fix to call "clicked" smart callback when there is no img
   * ecore-x - ensure we fully look at all xkb events and refresh all binds
   * evas_vg_container: return NULL in evas_vg_container_add when the parent of container is NULL
   * ecore thread - feedback threads should not be background threads...
   * ecore_evas_wayland_common: keep the backword compatibility for wayland dnd handler
   * edje: fix animation memory leak.
   * canvas vg: fix dangling vector containers.
   * evas vg: clean up dangling instances
   * canvas vg: fix vector file data memory leak.
   * evas - csd and wl csd - fix alpha zeroing to avoid framespace junk
   * efl gfx_path: fix memory leak.
   * evas - genetic update regions smart merge - merge v adjacent regions
   * efreet - handle runtime relocation right with default XDG_DATA_DIRS
   * efl_ui_image: fixed elm_image_preload_disabled_set api is not working when it is called before file set
   * elm_image: keep backword compatibility for elm_image_file_set API when setting url file set twice
   * efreetd - cache - add more statinfo work around 0 mtime distros
   * elm_code: on newline ensure line number visible. (T2798)
   * elm_code: cursor visbility fix.
   * edje - fix edje_cc mis-re-iding images in image sets
   * efl_ui_image: remove the unnecessary code in efl_file_unload
   * win - x io errors really just have to exit, so call the iorr cb + exit
   * evas - render - dont crash is private data is null
   * eina vpath - fix windows ~username handling to only error when used
   * efl ui image - fix scal to fill - broken with non-rect src images
   * embryo: fix a integer(cell) overflow problem
   * elput - support libelogind.so.0 as well as libelogind-shared.so.0
   * edje - calce - really respect max image size for img sets
   * ecore - don't do anything with heap between fork and exec
   * evas - fix deadlock with sw async rendering calling cbs in post flush
   * ecore con - curl - fix error map to map right enum
   * eina - statgen (stat generation) - fix enable api to actually enable
   * evas - image cache - fix loading with skip head on to load changed files
   * evas_textblock: remove style padding from native width and formatted height
   * elm icon/thumb - fix handling of a wider range of video extns
   * edje - calc - handle swallow disappearing mid-calc due to callabcks
   * ecore drm - increase timeout for flips from 0.05 to 2.0 sec
   * docs: Correct the mismatched group name in Evas.
   * elm - toolbar - use correct theme icon for more items
This commit is contained in:
kikadf 2020-09-11 11:42:09 +02:00
parent 4eceed4736
commit 37ed811c42
17 changed files with 189 additions and 130 deletions

View File

@ -726,7 +726,7 @@ SUBDIR+= edbrowse
SUBDIR+= edelib
SUBDIR+= eduke32
SUBDIR+= efgallery
SUBDIR+= efl-current
SUBDIR+= efl
SUBDIR+= efltk
SUBDIR+= eic
SUBDIR+= eina-musicplayer

View File

@ -1,11 +0,0 @@
$NetBSD$
SHA1 (efl-1.24.3.tar.xz) = 6e8e7fe8920db8c6533c174cb1d93a6527c7a19d
RMD160 (efl-1.24.3.tar.xz) = 2f57c423bc620cb4299d95faaccc332409cf6318
SHA512 (efl-1.24.3.tar.xz) = 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
Size (efl-1.24.3.tar.xz) = 72278592 bytes
SHA1 (patch-src_lib_ecore_Ecore.h) = 89e11da7e514bc37beb889466edc6164f47e8f0c
SHA1 (patch-src_lib_ecore_Efl__Core.h) = 5f6720fbb737a54bc73dc07208280972af6d8dfb
SHA1 (patch-src_lib_ecore_efl__core__proc__env.c) = 1efcc1a40f5da8990fe489f8120c95566fbbaeb4
SHA1 (patch-src_lib_ecore_efl__exe.c) = 7422ef573e8c244bae06c621975b6a5103ef24c0
SHA1 (patch-src_lib_elementary_Efl__Ui.h) = d319c6242ca420ad788a82dfa80b5c5f03ea29ca

View File

@ -1,24 +0,0 @@
$NetBSD$
* Add NetBSD support
--- src/lib/ecore/efl_exe.c.orig 2020-05-11 11:32:41.000000000 +0000
+++ src/lib/ecore/efl_exe.c
@@ -32,7 +32,7 @@
# include <sys/wait.h>
# endif
# ifndef HAVE_CLEARENV
-# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
# include <dlfcn.h>
static char ***_dl_environ;
# else
@@ -531,7 +531,7 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_D
# ifdef HAVE_CLEARENV
clearenv();
# else
-# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
_dl_environ = dlsym(NULL, "environ");
if (_dl_environ) *_dl_environ = NULL;
else ERR("Can't find envrion symbol");

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 0.3 2018/09/07 20:03:10 andyb Exp $
DISTNAME= efl-1.24.3
DISTNAME= efl-1.25.0
CATEGORIES= x11
#PKGREVISION= 1
MASTER_SITES= https://download.enlightenment.org/rel/libs/efl/
@ -29,16 +29,13 @@ MESON_ARGS+= -Dsystemd=false
MESON_ARGS+= -Deeze=false
MESON_ARGS+= -Dbuild-tests=false
MESON_ARGS+= -Dbuild-examples=false
#MESON_ARGS+= -Dv4l2=false
MESON_ARGS+= -Dphysics=true
MESON_ARGS+= -Dglib=true
MESON_ARGS+= -Dg-mainloop=true
CFLAGS+= -g -ggdb3
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
USE_TOOLS= pkg-config
ICON_THEMES= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
USE_TOOLS= pkg-config
ICON_THEMES= yes
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
@ -71,6 +68,8 @@ SUBST_SED.fix-options= -e "s|'es-egl', 'none'|'es-egl', 'base', 'none'|g"
MESON_ARGS+= -Dopengl=base
.endif
.include "options.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"
.include "../../devel/bullet/buildlink3.mk"

View File

@ -25,7 +25,6 @@ bin/elementary_quicklaunch
bin/elementary_run
bin/elementary_test
bin/elm_prefs_cc
bin/elua
bin/embryo_cc
bin/eo_debug
bin/eolian_cxx
@ -312,7 +311,6 @@ include/eet-cxx-1/eet_composite.hh
include/eet-cxx-1/eet_register.hh
include/eet-cxx-1/eet_type.hh
include/efl-1/Efl.h
include/efl-1/Efl_Config.h
include/efl-1/Efl_MVVM_Common.h
include/efl-1/interfaces/efl_audio_control.eo.h
include/efl-1/interfaces/efl_cached_item.eo.h
@ -561,6 +559,7 @@ include/efreet-1/efreet_ini.h
include/efreet-1/efreet_menu.h
include/efreet-1/efreet_uri.h
include/efreet-1/efreet_utils.h
include/eina-1/Efl_Config.h
include/eina-1/Eina.h
include/eina-1/eina/eina_abstract_content.h
include/eina-1/eina/eina_accessor.h
@ -1683,7 +1682,6 @@ include/elementary-cxx-1/efl_ui_win_part.eo.impl.hh
include/elementary-cxx-1/efl_ui_win_socket.eo.hh
include/elementary-cxx-1/efl_ui_win_socket.eo.impl.hh
include/elementary-cxx-1/elm_general.eot.hh
include/elua-1/Elua.h
include/embryo-1/Embryo.h
include/emile-1/Emile.h
include/emile-1/emile_base64.h
@ -1799,10 +1797,6 @@ include/evas-1/canvas/efl_canvas_scale_animation.eo.h
include/evas-1/canvas/efl_canvas_scene.eo.h
include/evas-1/canvas/efl_canvas_sequential_group_animation.eo.h
include/evas-1/canvas/efl_canvas_snapshot.eo.h
include/evas-1/canvas/efl_canvas_surface.eo.h
include/evas-1/canvas/efl_canvas_surface_tbm.eo.h
include/evas-1/canvas/efl_canvas_surface_wayland.eo.h
include/evas-1/canvas/efl_canvas_surface_x11.eo.h
include/evas-1/canvas/efl_canvas_textblock.eo.h
include/evas-1/canvas/efl_canvas_textblock_eo.legacy.h
include/evas-1/canvas/efl_canvas_textblock_factory.eo.h
@ -1911,14 +1905,6 @@ include/evas-cxx-1/canvas/efl_canvas_sequential_group_animation.eo.hh
include/evas-cxx-1/canvas/efl_canvas_sequential_group_animation.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_snapshot.eo.hh
include/evas-cxx-1/canvas/efl_canvas_snapshot.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_surface.eo.hh
include/evas-cxx-1/canvas/efl_canvas_surface.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_surface_tbm.eo.hh
include/evas-cxx-1/canvas/efl_canvas_surface_tbm.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_surface_wayland.eo.hh
include/evas-cxx-1/canvas/efl_canvas_surface_wayland.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_surface_x11.eo.hh
include/evas-cxx-1/canvas/efl_canvas_surface_x11.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_textblock.eo.hh
include/evas-cxx-1/canvas/efl_canvas_textblock.eo.impl.hh
include/evas-cxx-1/canvas/efl_canvas_textblock_factory.eo.hh
@ -2064,46 +2050,46 @@ lib/cmake/Evas/EvasConfig.cmake
lib/cmake/Evas/EvasConfigVersion.cmake
lib/cmake/EvasCxx/EvasCxxConfig.cmake
lib/cmake/EvasCxx/EvasCxxConfigVersion.cmake
lib/ecore/system/upower/v-1.24/module.so
lib/ecore_con/utils/v-1.24/efl_net_proxy_helper
lib/ecore_evas/engines/extn/v-1.24/module.so
lib/ecore_evas/engines/x/v-1.24/module.so
lib/ecore_imf/modules/scim/v-1.24/module.so
lib/ecore_imf/modules/xim/v-1.24/module.so
lib/edje/modules/elm/v-1.24/module.so
lib/edje/modules/emotion/v-1.24/module.so
lib/edje/utils/v-1.24/epp
lib/efreet/v-1.24/efreet_desktop_cache_create
lib/efreet/v-1.24/efreet_icon_cache_create
lib/efreet/v-1.24/efreet_mime_cache_create
lib/elementary/modules/access_output/v-1.24/module.so
lib/elementary/modules/prefs/v-1.24/module.so
lib/elementary/modules/test_entry/v-1.24/module.so
lib/elementary/modules/test_map/v-1.24/module.so
lib/elementary/modules/web/none/v-1.24/module.so
lib/emotion/modules/gstreamer1/v-1.24/module.so
lib/ethumb/modules/emotion/v-1.24/module.so
lib/ethumb_client/utils/v-1.24/ethumbd_slave
lib/evas/modules/engines/buffer/v-1.24/module.so
lib/evas/modules/engines/gl_generic/v-1.24/module.so
lib/evas/modules/engines/gl_x11/v-1.24/module.so
lib/evas/modules/engines/software_x11/v-1.24/module.so
lib/evas/modules/image_loaders/bmp/v-1.24/module.so
lib/evas/modules/image_loaders/generic/v-1.24/module.so
lib/evas/modules/image_loaders/gif/v-1.24/module.so
lib/evas/modules/image_loaders/ico/v-1.24/module.so
lib/evas/modules/image_loaders/jp2k/v-1.24/module.so
lib/evas/modules/image_loaders/pmaps/v-1.24/module.so
lib/evas/modules/image_loaders/psd/v-1.24/module.so
lib/evas/modules/image_loaders/tga/v-1.24/module.so
lib/evas/modules/image_loaders/tgv/v-1.24/module.so
lib/evas/modules/image_loaders/tiff/v-1.24/module.so
lib/evas/modules/image_loaders/wbmp/v-1.24/module.so
lib/evas/modules/image_loaders/webp/v-1.24/module.so
lib/evas/modules/image_loaders/xpm/v-1.24/module.so
lib/evas/modules/image_savers/tgv/v-1.24/module.so
lib/evas/modules/image_savers/tiff/v-1.24/module.so
lib/evas/modules/image_savers/webp/v-1.24/module.so
lib/ecore/system/upower/v-1.25/module.so
lib/ecore_con/utils/v-1.25/efl_net_proxy_helper
lib/ecore_evas/engines/extn/v-1.25/module.so
lib/ecore_evas/engines/x/v-1.25/module.so
lib/ecore_imf/modules/scim/v-1.25/module.so
lib/ecore_imf/modules/xim/v-1.25/module.so
lib/edje/modules/elm/v-1.25/module.so
lib/edje/modules/emotion/v-1.25/module.so
lib/edje/utils/v-1.25/epp
lib/efreet/v-1.25/efreet_desktop_cache_create
lib/efreet/v-1.25/efreet_icon_cache_create
lib/efreet/v-1.25/efreet_mime_cache_create
lib/elementary/modules/access_output/v-1.25/module.so
lib/elementary/modules/prefs/v-1.25/module.so
lib/elementary/modules/test_entry/v-1.25/module.so
lib/elementary/modules/test_map/v-1.25/module.so
lib/elementary/modules/web/none/v-1.25/module.so
lib/emotion/modules/gstreamer1/v-1.25/module.so
lib/ethumb/modules/emotion/v-1.25/module.so
lib/ethumb_client/utils/v-1.25/ethumbd_slave
lib/evas/modules/engines/buffer/v-1.25/module.so
lib/evas/modules/engines/gl_generic/v-1.25/module.so
lib/evas/modules/engines/gl_x11/v-1.25/module.so
lib/evas/modules/engines/software_x11/v-1.25/module.so
lib/evas/modules/image_loaders/bmp/v-1.25/module.so
lib/evas/modules/image_loaders/generic/v-1.25/module.so
lib/evas/modules/image_loaders/gif/v-1.25/module.so
lib/evas/modules/image_loaders/ico/v-1.25/module.so
lib/evas/modules/image_loaders/jp2k/v-1.25/module.so
lib/evas/modules/image_loaders/pmaps/v-1.25/module.so
lib/evas/modules/image_loaders/psd/v-1.25/module.so
lib/evas/modules/image_loaders/tga/v-1.25/module.so
lib/evas/modules/image_loaders/tgv/v-1.25/module.so
lib/evas/modules/image_loaders/tiff/v-1.25/module.so
lib/evas/modules/image_loaders/wbmp/v-1.25/module.so
lib/evas/modules/image_loaders/webp/v-1.25/module.so
lib/evas/modules/image_loaders/xpm/v-1.25/module.so
lib/evas/modules/image_savers/tgv/v-1.25/module.so
lib/evas/modules/image_savers/tiff/v-1.25/module.so
lib/evas/modules/image_savers/webp/v-1.25/module.so
lib/evas/utils/evas_generic_pdf_loader.doc
lib/evas/utils/evas_generic_pdf_loader.docx
lib/evas/utils/evas_generic_pdf_loader.libreoffice
@ -2270,9 +2256,6 @@ lib/libeldbus.so.${PKGVERSION}
lib/libelementary.so
lib/libelementary.so.1
lib/libelementary.so.${PKGVERSION}
lib/libelua.so
lib/libelua.so.1
lib/libelua.so.${PKGVERSION}
lib/libembryo.so
lib/libembryo.so.1
lib/libembryo.so.${PKGVERSION}
@ -2342,7 +2325,6 @@ lib/pkgconfig/eldbus-cxx.pc
lib/pkgconfig/eldbus.pc
lib/pkgconfig/elementary-cxx.pc
lib/pkgconfig/elementary.pc
lib/pkgconfig/elua.pc
lib/pkgconfig/embryo.pc
lib/pkgconfig/emile.pc
lib/pkgconfig/emotion.pc
@ -2378,6 +2360,7 @@ share/elementary/config/standard/icon.png
share/elementary/config/standard/profile.desktop
share/elementary/edje_externals/icons.edj
share/elementary/images/animated_logo.gif
share/elementary/images/animated_webp_image.webp
share/elementary/images/bubble.png
share/elementary/images/bubble_sh.png
share/elementary/images/earth_normal.png
@ -2466,6 +2449,7 @@ share/elementary/images/sky_02.jpg
share/elementary/images/sky_03.jpg
share/elementary/images/sky_04.jpg
share/elementary/images/space.png
share/elementary/images/static_webp_image.webp
share/elementary/images/three_box.json
share/elementary/images/tiger.svg
share/elementary/images/twofish.jpg
@ -2485,27 +2469,7 @@ share/elementary/objects/test_prefs.epb
share/elementary/objects/test_tab_pager.edj
share/elementary/objects/test_tooltip.edj
share/elementary/themes/default.edj
share/elua/apps/lualian.lua
share/elua/checkme
share/elua/core/gettext.lua
share/elua/core/module.lua
share/elua/core/serializer.lua
share/elua/core/util.lua
share/elua/modules/benchmark.lua
share/elua/modules/eina/accessor.lua
share/elua/modules/eina/counter.lua
share/elua/modules/eina/file.lua
share/elua/modules/eina/hamster.lua
share/elua/modules/eina/iterator.lua
share/elua/modules/eina/list.lua
share/elua/modules/eina/log.lua
share/elua/modules/eina/rectangle.lua
share/elua/modules/eina/tiler.lua
share/elua/modules/eina/xattr.lua
share/elua/modules/eo.lua
share/elua/modules/eolian.lua
share/elua/modules/getopt.lua
share/elua/modules/lualian.lua
share/embryo/include/default.inc
share/emotion/checkme
share/eo/gdb/eo_gdb.py
@ -2882,10 +2846,6 @@ share/eolian/include/evas-1/efl_canvas_scale_animation.eo
share/eolian/include/evas-1/efl_canvas_scene.eo
share/eolian/include/evas-1/efl_canvas_sequential_group_animation.eo
share/eolian/include/evas-1/efl_canvas_snapshot.eo
share/eolian/include/evas-1/efl_canvas_surface.eo
share/eolian/include/evas-1/efl_canvas_surface_tbm.eo
share/eolian/include/evas-1/efl_canvas_surface_wayland.eo
share/eolian/include/evas-1/efl_canvas_surface_x11.eo
share/eolian/include/evas-1/efl_canvas_textblock.eo
share/eolian/include/evas-1/efl_canvas_textblock_factory.eo
share/eolian/include/evas-1/efl_canvas_translate_animation.eo

View File

@ -5,8 +5,15 @@ BUILDLINK_TREE+= efl
.if !defined(EFL_BUILDLINK3_MK)
EFL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.efl+= efl>=1.24.3
BUILDLINK_PKGSRCDIR.efl?= ../../wip/efl-current
BUILDLINK_API_DEPENDS.efl+= efl>=1.25.0
BUILDLINK_PKGSRCDIR.efl?= ../../wip/efl
pkgbase := efl
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_OPTIONS.efl:Mg-mainloop)
.include "../../devel/libuv/buildlink3.mk"
.endif
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"

13
efl/distinfo Normal file
View File

@ -0,0 +1,13 @@
$NetBSD$
SHA1 (efl-1.25.0.tar.xz) = 4a5e3c381bc9c2610ffb9cded2c6cb45f634522b
RMD160 (efl-1.25.0.tar.xz) = 7724bcf801d519c964d57ebdcccee178d9b80916
SHA512 (efl-1.25.0.tar.xz) = 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f
Size (efl-1.25.0.tar.xz) = 72308216 bytes
SHA1 (patch-src_lib_ecore_Ecore.h) = 89e11da7e514bc37beb889466edc6164f47e8f0c
SHA1 (patch-src_lib_ecore_Efl__Core.h) = 5f6720fbb737a54bc73dc07208280972af6d8dfb
SHA1 (patch-src_lib_ecore_ecore__exe__posix.c) = 22d8ebb9df3e8b0f59f07bbd238a1cf5b6e02e28
SHA1 (patch-src_lib_ecore_efl__core__proc__env.c) = 1efcc1a40f5da8990fe489f8120c95566fbbaeb4
SHA1 (patch-src_lib_ecore_efl__exe.c) = caacd04dd2a9338371c6f4fe778dea7f024c1847
SHA1 (patch-src_lib_eina_eina__file.c) = 5b77a04f39da9b5ae5ba5eedf7713b18e66ef534
SHA1 (patch-src_lib_elementary_Efl__Ui.h) = d319c6242ca420ad788a82dfa80b5c5f03ea29ca

26
efl/options.mk Normal file
View File

@ -0,0 +1,26 @@
# $NetBSD$
PKG_OPTIONS_VAR= PKG_OPTIONS.efl
PKG_SUPPORTED_OPTIONS= debug g-mainloop gcc8
PKG_SUGGESTED_OPTIONS= g-mainloop
.include "../../mk/bsd.options.mk"
# Build with debug options
.if !empty(PKG_OPTIONS:Mdebug)
MESON_ARGS+= -Ddebug-threads=true
CFLAGS+= -g -ggdb3
.endif
# Use glib to run the main loop in efl
.if !empty(PKG_OPTIONS:Mg-mainloop)
MESON_ARGS+= -Dglib=true
MESON_ARGS+= -Dg-mainloop=true
.include "../../devel/libuv/buildlink3.mk"
.endif
# Use gcc8 to build efl
.if !empty(PKG_OPTIONS:Mgcc8)
USE_PKGSRC_GCC= yes
GCC_REQD= 8
.endif

View File

@ -0,0 +1,24 @@
$NetBSD$
* Add NetBSD support
--- src/lib/ecore/ecore_exe_posix.c.orig 2020-09-22 17:54:50.000000000 +0000
+++ src/lib/ecore/ecore_exe_posix.c
@@ -218,7 +218,7 @@ _impl_ecore_exe_run_priority_get(void)
return run_pri;
}
-#if defined (__FreeBSD__) || defined (__OpenBSD__)
+#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (NetBSD)
# include <dlfcn.h>
static char ***_dl_environ;
#else
@@ -350,7 +350,7 @@ _impl_ecore_exe_efl_object_finalize(Eo *
#ifdef HAVE_SYSTEMD
char **env = NULL, **e;
-# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (NetBSD)
_dl_environ = dlsym(NULL, "environ");
env = *_dl_environ;
# else

View File

@ -0,0 +1,33 @@
$NetBSD$
* Add NetBSD support
--- src/lib/ecore/efl_exe.c.orig 2020-09-22 17:54:50.000000000 +0000
+++ src/lib/ecore/efl_exe.c
@@ -32,7 +32,7 @@
# include <sys/wait.h>
# endif
# ifndef HAVE_CLEARENV
-# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
# include <dlfcn.h>
static char ***_dl_environ;
# else
@@ -577,7 +577,7 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_D
// clear systemd notify socket... only relevant for systemd world,
// otherwise shouldn't be trouble
-# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
_dl_environ = dlsym(NULL, "environ");
if (_dl_environ) env = *_dl_environ;
# else
@@ -620,7 +620,7 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_D
}
// yes - we dont free itr or itr2 - we're going to exec below or exit
// also put newenv array on stack pointign to the strings in the env
-# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__) || (__NetBSD__)
if (_dl_environ) *_dl_environ = newenv;
else ERR("Can't find envrion symbol");
# else

View File

@ -0,0 +1,32 @@
$NetBSD$
* Add NetBSD support
--- src/lib/eina/eina_file.c.orig 2020-09-22 17:54:50.000000000 +0000
+++ src/lib/eina/eina_file.c
@@ -1297,6 +1297,16 @@ typedef struct
unsigned char ____pad[4];
char d_name[4096];
} Dirent;
+#elif defined(__NetBSD__)
+# define do_getdents(fd, buf, size) getdents(fd, buf, size)
+typedef struct
+{
+ ino_t d_fileno;
+ uint16_t d_reclen;
+ uint16_t d_namlen;
+ uint8_t d_type;
+ char d_name[4096];
+} Dirent;
#elif defined(__linux__)
# define do_getdents(fd, buf, size) syscall(SYS_getdents64, fd, buf, size)
// getdents64 added un glibc 2.30 ... so use raw syscall - will work
@@ -1320,7 +1330,7 @@ eina_file_close_from(int fd, int *except
#else
#ifdef HAVE_DIRENT_H
//# if 0
-# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__)
+# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__linux__)
int dirfd;
Dirent *d;
char buf[4096];