diff --git a/bugfix-of-gcc-10.patch b/bugfix-of-gcc-10.patch deleted file mode 100644 index de3c577164f1939ffdb8e7ef1544f9a647bb87cf..0000000000000000000000000000000000000000 --- a/bugfix-of-gcc-10.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff -Nur efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c efl-1.23.3-new/src/benchmarks/eina/eina_bench_crc_hash.c ---- efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c 2019-11-28 02:27:00.000000000 +0800 -+++ efl-1.23.3-new/src/benchmarks/eina/eina_bench_crc_hash.c 2021-08-02 17:41:32.000000000 +0800 -@@ -26,6 +26,7 @@ - uint64_t CityHash64(const char *buf, size_t len); - #endif - -+int key_size; - char *key_str=NULL; - - void repchar(int n) -diff -Nur efl-1.23.3/src/benchmarks/eina/eina_bench.h efl-1.23.3-new/src/benchmarks/eina/eina_bench.h ---- efl-1.23.3/src/benchmarks/eina/eina_bench.h 2019-11-28 02:27:00.000000000 +0800 -+++ efl-1.23.3-new/src/benchmarks/eina/eina_bench.h 2021-08-02 17:39:56.000000000 +0800 -@@ -21,7 +21,7 @@ - - #include "eina_benchmark.h" - --int key_size; -+extern int key_size; - - void eina_bench_hash(Eina_Benchmark *bench); - void eina_bench_crc_hash_short(Eina_Benchmark *bench); -diff -Nur efl-1.23.3/src/bin/elementary/test_ui_clock.c efl-1.23.3-new/src/bin/elementary/test_ui_clock.c ---- efl-1.23.3/src/bin/elementary/test_ui_clock.c 2019-11-28 02:27:01.000000000 +0800 -+++ efl-1.23.3-new/src/bin/elementary/test_ui_clock.c 2021-08-02 17:48:00.000000000 +0800 -@@ -6,7 +6,7 @@ - #include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h - /* A simple test, just displaying clock in its default format */ - --Evas_Object *dt1, *dt2, *dt3, *dt4; -+Evas_Object *uicdt1, *uicdt2, *uicdt3, *uicdt4; - - static void - _changed_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) -@@ -28,19 +28,19 @@ - new_time.tm_mday = 26; - new_time.tm_hour = 9; - new_time.tm_min = 0; -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); -- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); -- efl_ui_clock_time_set(dt1, new_time); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); -+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); -+ efl_ui_clock_time_set(uicdt1, new_time); - -- elm_object_disabled_set(dt1, EINA_TRUE); -+ elm_object_disabled_set(uicdt1, EINA_TRUE); - elm_object_disabled_set(ev->object, EINA_TRUE); - -- efl_del(dt2); -- efl_del(dt3); -- dt2 = dt3 = NULL; -+ efl_del(uicdt2); -+ efl_del(uicdt3); -+ uicdt2 = uicdt3 = NULL; - } - - void -@@ -56,33 +56,33 @@ - efl_content_set(win, efl_added), - efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240))); - -- dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE), -- efl_ui_clock_pause_set(efl_added, EINA_TRUE), -- efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), -- efl_pack(bx, efl_added)); -- -- dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), -- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -- efl_ui_clock_pause_set(efl_added, EINA_TRUE), -- efl_pack(bx, efl_added)); -- elm_object_disabled_set(dt2, EINA_TRUE); -- -- dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_pack(bx, efl_added)); -+ uicdt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE), -+ efl_ui_clock_pause_set(efl_added, EINA_TRUE), -+ efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), -+ efl_pack(bx, efl_added)); -+ -+ uicdt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), -+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), -+ efl_ui_clock_pause_set(efl_added, EINA_TRUE), -+ efl_pack(bx, efl_added)); -+ elm_object_disabled_set(uicdt2, EINA_TRUE); -+ -+ uicdt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_pack(bx, efl_added)); - - efl_add(EFL_UI_TEXT_CLASS, bx, - efl_text_set(efl_added, "Editable Clock:"), -@@ -92,12 +92,13 @@ - efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)), - efl_pack(bx, efl_added)); - -- dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, -- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -- efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), -- efl_ui_clock_pause_set(efl_added, EINA_TRUE), -- efl_pack(bx, efl_added)); -+ uicdt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, -+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), -+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), -+ efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), -+ efl_ui_clock_pause_set(efl_added, EINA_TRUE), -+ efl_pack(bx, efl_added)); -+ - - efl_add(EFL_UI_BUTTON_CLASS, win, - efl_text_set(efl_added, "Back to the future..."), -diff -Nur efl-1.23.3/src/tests/eio/eio_test_map.c efl-1.23.3-new/src/tests/eio/eio_test_map.c ---- efl-1.23.3/src/tests/eio/eio_test_map.c 2019-11-28 02:27:01.000000000 +0800 -+++ efl-1.23.3-new/src/tests/eio/eio_test_map.c 2021-08-02 17:50:54.000000000 +0800 -@@ -14,7 +14,7 @@ - - #include "eio_suite.h" - --Eina_File *ee; -+Eina_File *eie; - - static void - _done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED) -@@ -25,7 +25,7 @@ - static void - _open_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, Eina_File *ef) - { -- ee = ef; -+ eie = ef; - ecore_main_loop_quit(); - } - -@@ -70,17 +70,17 @@ - ecore_main_loop_begin(); - fail_if(!ef); - -- ef = eio_file_map_all(ee, EINA_FILE_POPULATE, _filter_cb, _map_cb, -+ ef = eio_file_map_all(eie, EINA_FILE_POPULATE, _filter_cb, _map_cb, - _error_cb, data); - ecore_main_loop_begin(); - fail_if(!ef); - -- ef = eio_file_map_new(ee, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb, -+ ef = eio_file_map_new(eie, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb, - _map_cb, _error_cb, data); - ecore_main_loop_begin(); - fail_if(!ef); - -- ef = eio_file_close(ee, _done_cb, _error_cb, NULL); -+ ef = eio_file_close(eie, _done_cb, _error_cb, NULL); - ecore_main_loop_begin(); - fail_if(!ef); - diff --git a/efl-1.25.0-check-fix.patch b/efl-1.25.0-check-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..353f1e2d25df1df9f43a0d16e5c029d40111e7a6 --- /dev/null +++ b/efl-1.25.0-check-fix.patch @@ -0,0 +1,17 @@ +diff -up efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c.checkfix efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c +--- efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c.checkfix 2020-09-22 13:54:51.000000000 -0400 ++++ efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c 2020-09-22 15:24:41.384828189 -0400 +@@ -170,11 +170,11 @@ _fake_server_name_request_cb(void *data + { + const char *name, *text; + if (eldbus_message_error_get(msg, &name, &text)) +- ck_abort_msg("error on _fake_server_name_request_cb: %s %s", name, text); ++ fail("error on _fake_server_name_request_cb: %s %s", name, text); + + unsigned int reply; + if (!eldbus_message_arguments_get(msg, "u", &reply)) +- ck_abort_msg("error geting arguments on _fake_server_name_request_cb"); ++ fail("error geting arguments on _fake_server_name_request_cb"); + + if (ELDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER != reply) + { diff --git a/efl-1.25.0-no-neon.patch b/efl-1.25.0-no-neon.patch new file mode 100644 index 0000000000000000000000000000000000000000..e468625bf6024a634f3c45d1d514cfeb1e101622 --- /dev/null +++ b/efl-1.25.0-no-neon.patch @@ -0,0 +1,16 @@ +diff -up efl-1.25.0/meson.build.noneon efl-1.25.0/meson.build +--- efl-1.25.0/meson.build.noneon 2020-09-22 15:23:31.483346900 -0400 ++++ efl-1.25.0/meson.build 2020-09-22 15:23:54.264503743 -0400 +@@ -177,12 +177,6 @@ if get_option('native-arch-optimization' + config_h.set10('BUILD_SSE3', true) + native_arch_opt_c_args = [ '-msse3' ] + message('x86 build - MMX + SSE3 enabled') +- elif host_machine.cpu_family() == 'arm' +- cpu_neon = true +- config_h.set10('BUILD_NEON', true) +- add_project_arguments('-mfpu=neon', language: 'c') +- add_project_arguments('-ftree-vectorize', language: 'c') +- message('ARM build - NEON enabled') + elif host_machine.cpu_family() == 'aarch64' + cpu_neon = true + cpu_neon_intrinsics = true diff --git a/efl-1.23.3.tar.xz b/efl-1.25.1.tar.xz similarity index 82% rename from efl-1.23.3.tar.xz rename to efl-1.25.1.tar.xz index ceba786c0f671c0d8778f29af525492efaac5f34..876ad8e7128e0a4e9544f2e9bdde11a5396b235d 100644 Binary files a/efl-1.23.3.tar.xz and b/efl-1.25.1.tar.xz differ diff --git a/efl.spec b/efl.spec index 6605df8bc441e2d96359078d12de5c4ef16685e8..9beecd96fc8158b4f22064e615e4d67203ccc186 100644 --- a/efl.spec +++ b/efl.spec @@ -1,10 +1,12 @@ Name: efl -Version: 1.23.3 -Release: 2 +Version: 1.25.1 +Release: 1 Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz +Patch3: efl-1.25.0-no-neon.patch +Patch4: efl-1.25.0-check-fix.patch BuildRequires: libunwind-devel gcc-c++ BuildRequires: bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel BuildRequires: gstreamer1-plugins-base-devel libtiff-devel openssl-devel @@ -22,7 +24,7 @@ BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 pkgconfig(cairo) >= 1.0.0 ibu BuildRequires: doxygen systemd giflib-devel openjpeg2-devel libdrm-devel BuildRequires: wayland-devel >= 1.11.0 wayland-protocols-devel >= 1.7 BuildRequires: ninja-build meson gettext-devel mesa-libGLES-devel -BuildRequires: mesa-libgbm-devel libinput-devel luajit-devel cmake +BuildRequires: mesa-libgbm-devel libinput-devel luajit-devel cmake Provides: e_dbus = %{version}-%{release} ecore = %{version}-%{release} edje = %{version}-%{release} Provides: eet = %{version}-%{release} eeze = %{version}-%{release} efreet = %{version}-%{release} Provides: eina = %{version}-%{release} eio = %{version}-%{release} eldbus = %{version}-%{release} @@ -34,8 +36,6 @@ Obsoletes: e_dbus <= 1.7.10 ecore <= 1.7.10 edje <= 1.7.10 eet <= 1.7.10 Obsoletes: efreet <= 1.7.10 eio <= 1.7.10 elementary <= 1.17.1 embryo <= 1.7.10 emotion <= 1.7.10 Obsoletes: ethumb <= 1.7.10 evas <= 1.7.10 evas-generic-loaders <= 1.17.0 libeina <= 1.7.10 -Patch0001: bugfix-of-gcc-10.patch - %description Enlightenment Foundation Libraries, or EFL, are the set of libraries used to create the Enlightenment Window Manager DR17 (E17). This set @@ -65,9 +65,10 @@ for the efl library. %autosetup -n %{name}-%{version} -p1 %build -%{meson} -Dxinput22=true -Dsystemd=true -Devas-loaders-disabler=json -Dharfbuzz=true -Dsdl=true -Dfb=true \ - -Dwl=true -Ddrm=true -Dopengl=full -Dinstall-eo-files=true -Dbindings=luajit,cxx -Dlua-interpreter=luajit \ - -Dsystemdunitdir=%{_userunitdir} +%{meson} -Dxinput22=true -Dsystemd=true -Devas-loaders-disabler=json,avif -Dharfbuzz=true \ + -Dsdl=true -Dbuffer=true -Davahi=true -Decore-imf-loaders-disabler=scim -Dglib=true \ + -Dfb=true -Dwl=true -Ddrm=true -Dinstall-eo-files=true -Dbindings=lua,cxx -Dlua-interpreter=luajit \ + -Delua=true -Dphysics=true %{meson_build} %install @@ -126,10 +127,14 @@ chmod 644 src/bin/edje/edje_cc_out.c %{_datadir}/mime/packages/edje.xml %{_userunitdir}/ethumb.service %{_datadir}/elua/ +# exactness +%{_bindir}/exactness* +%{_libdir}/libexactness*.so.* +%{_datadir}/exactness/ %files devel %{_includedir}/* -%{_bindir}/efl_wl_test* +%{_bindir}/efl_canvas_wl_test* %{_libdir}/cmake/* %{_libdir}/libe*.so %{_libdir}/pkgconfig/* @@ -139,8 +144,13 @@ chmod 644 src/bin/edje/edje_cc_out.c %{_datadir}/em* %{_datadir}/eo* %exclude %{_libdir}/cmake/Elua/ +# exactness +%{_libdir}/libexactness*.so %changelog +* Thu Dec 30 2021 liyanan - 1.25.1-1 +- update to 1.25.1 + * Mon Aug 2 2021 Shenemi Tu - 1.23.3-2 - bugfix-of-gcc-10.patch