pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
efl-current: use glib to run the main loop in efl
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Sat Jun 6 17:20:59 2020 +0200
Changeset: 6d48ff41350a3593193ce8dd405f0a42aefb44f3
Modified Files:
efl-current/Makefile
efl-current/TODO
efl-current/buildlink3.mk
efl-current/distinfo
Added Files:
efl-current/patches/patch-src_lib_ecore_Ecore.h
efl-current/patches/patch-src_lib_ecore_Efl__Core.h
efl-current/patches/patch-src_lib_elementary_Efl__Ui.h
Log Message:
efl-current: use glib to run the main loop in efl
This fixes enlightenment segfault
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6d48ff41350a3593193ce8dd405f0a42aefb44f3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
efl-current/Makefile | 19 +++++++++++++++++--
efl-current/TODO | 5 +++--
efl-current/buildlink3.mk | 1 +
efl-current/distinfo | 3 +++
efl-current/patches/patch-src_lib_ecore_Ecore.h | 15 +++++++++++++++
efl-current/patches/patch-src_lib_ecore_Efl__Core.h | 15 +++++++++++++++
.../patches/patch-src_lib_elementary_Efl__Ui.h | 15 +++++++++++++++
7 files changed, 69 insertions(+), 4 deletions(-)
diffs:
diff --git a/efl-current/Makefile b/efl-current/Makefile
index 96700ed315..e5e817cf75 100644
--- a/efl-current/Makefile
+++ b/efl-current/Makefile
@@ -32,6 +32,8 @@ MESON_ARGS+= -Dbuild-examples=false
MESON_ARGS+= -Dphysics=true
MESON_ARGS+= -Davahi=true
MESON_ARGS+= -Dsdl=true
+MESON_ARGS+= -Dglib=true
+MESON_ARGS+= -Dg-mainloop=true
USE_LANGUAGES= c c++
USE_TOOLS= pkg-config
@@ -48,17 +50,30 @@ SUBST_CLASSES+= xdg
SUBST_MESSAGE.xdg= Fixing XDG_DATA_DIRS and XDG_CONFIG_DIRS
SUBST_STAGE.xdg= pre-configure
SUBST_FILES.xdg= src/lib/efreet/efreet_base.c
-SUBST_SED.xdg= -e 's,/usr/share:/usr/local/share,${PREFIX}/share,'
-SUBST_SED.xdg+= -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
+SUBST_SED.xdg= -e 's,/usr/share:/usr/local/share,${PREFIX}/share,g'
+SUBST_SED.xdg+= -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,g'
REPLACE_PYTHON+= src/bin/exactness/exactness_play.in
REPLACE_PYTHON+= src/bin/exactness/exactness_record.in
BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+SUBST_CLASSES+= fix-options
+SUBST_MESSAGE.fix-options= Fixing meson opengl options
+SUBST_STAGE.fix-options= pre-configure
+SUBST_FILES.fix-options= meson_options.txt
+SUBST_SED.fix-options= -e "s|'es-egl', 'none'|'es-egl', 'base', 'none'|g"
+
+MESON_ARGS+= -Dopengl=base
+.endif
+
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"
.include "../../devel/bullet/buildlink3.mk"
+.include "../../devel/libuv/buildlink3.mk"
.include "../../devel/meson/build.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
diff --git a/efl-current/TODO b/efl-current/TODO
index d508496fff..bf595c37e7 100644
--- a/efl-current/TODO
+++ b/efl-current/TODO
@@ -1,4 +1,4 @@
-:: NetBSD 9.0_STABLE amd64, pkgsrc-current 2020-05-09 >> build OK
+:: NetBSD 9.0_STABLE amd64, pkgsrc-current 2020-06-06 >> build OK
Message: ecore_buffer disabled! <[dependency('wayland-client'), dependency('wayland-server'), ecore]
Message: ecore_cocoa disabled! < osx
@@ -14,4 +14,5 @@ Message: efl_canvas_wl disabled! <[eo, efl, evas, dependency('wayland-server', v
Message: elput disabled! < dep: eeze
:: Plan
-1. Test with enlightenment-current build
+1. Test with enlightenment-current, optimize depends
+2. Add another OS support
diff --git a/efl-current/buildlink3.mk b/efl-current/buildlink3.mk
index bf34c8c721..3348596377 100644
--- a/efl-current/buildlink3.mk
+++ b/efl-current/buildlink3.mk
@@ -11,6 +11,7 @@ BUILDLINK_PKGSRCDIR.efl?= ../../wip/efl-current
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"
.include "../../devel/bullet/buildlink3.mk"
+.include "../../devel/libuv/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/libraw/buildlink3.mk"
diff --git a/efl-current/distinfo b/efl-current/distinfo
index fe6e88956e..9da8bf61b6 100644
--- a/efl-current/distinfo
+++ b/efl-current/distinfo
@@ -4,5 +4,8 @@ SHA1 (efl-1.24.1.tar.xz) = edf97e6e8a79d847839e179e97825c8aa4d0280e
RMD160 (efl-1.24.1.tar.xz) = de15ce9a28dde6247213d6ae01e2baed6120395d
SHA512 (efl-1.24.1.tar.xz) = 6fe4d87a9db1e0022c1dff94c14d334d61e561608016072bcb1d2633054ff9a6a74c84bc9903592d716abc9e1fae48b6ff66b259a5a59114a1cd54f083ce8b51
Size (efl-1.24.1.tar.xz) = 72277640 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
diff --git a/efl-current/patches/patch-src_lib_ecore_Ecore.h b/efl-current/patches/patch-src_lib_ecore_Ecore.h
new file mode 100644
index 0000000000..653a8167fd
--- /dev/null
+++ b/efl-current/patches/patch-src_lib_ecore_Ecore.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* NetBSD support
+
+--- src/lib/ecore/Ecore.h.orig 2020-05-11 11:32:41.000000000 +0000
++++ src/lib/ecore/Ecore.h
+@@ -307,7 +307,7 @@
+ # define WIN32_LEAN_AND_MEAN
+ # include <winsock2.h>
+ # undef WIN32_LEAN_AND_MEAN
+-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+ # include <sys/select.h>
+ # include <signal.h>
+ #elif defined (__ANDROID__)
diff --git a/efl-current/patches/patch-src_lib_ecore_Efl__Core.h b/efl-current/patches/patch-src_lib_ecore_Efl__Core.h
new file mode 100644
index 0000000000..5695e3ec0f
--- /dev/null
+++ b/efl-current/patches/patch-src_lib_ecore_Efl__Core.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* NetBSD support
+
+--- src/lib/ecore/Efl_Core.h.orig 2020-05-11 11:32:41.000000000 +0000
++++ src/lib/ecore/Efl_Core.h
+@@ -36,7 +36,7 @@
+ # define WIN32_LEAN_AND_MEAN
+ # include <winsock2.h>
+ # undef WIN32_LEAN_AND_MEAN
+-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+ # include <sys/select.h>
+ # include <signal.h>
+ #elif defined (__ANDROID__)
diff --git a/efl-current/patches/patch-src_lib_elementary_Efl__Ui.h b/efl-current/patches/patch-src_lib_elementary_Efl__Ui.h
new file mode 100644
index 0000000000..865f9a4bb9
--- /dev/null
+++ b/efl-current/patches/patch-src_lib_elementary_Efl__Ui.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* NetBSD support
+
+--- src/lib/elementary/Efl_Ui.h.orig 2020-05-11 11:32:41.000000000 +0000
++++ src/lib/elementary/Efl_Ui.h
+@@ -51,7 +51,7 @@
+ # define WIN32_LEAN_AND_MEAN
+ # include <winsock2.h>
+ # undef WIN32_LEAN_AND_MEAN
+-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+ # include <sys/select.h>
+ # include <signal.h>
+ #elif defined (__ANDROID__)
Home |
Main Index |
Thread Index |
Old Index