!13 [sync] PR-10: Build ecore_sdl versioned so. So efl no longer requires efl-devel

From: @openeuler-sync-bot 
Reviewed-by: @jianminw 
Signed-off-by: @jianminw

efl-1.21.0-use-pragma-to-ignore-safe-printf.patch

@@ -1,14 +0,0 @@
-diff -up efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c
---- efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma	2018-08-18 15:27:24.073708072 -0400
-+++ efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c	2018-08-18 15:28:38.690980709 -0400
-@@ -130,7 +130,10 @@ _default_format_cb(void *data, Eina_Strb
-      }
-    else if (sd->format_type == FORMAT_TYPE_STATIC)
-      {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-security"
-         eina_strbuf_append_printf(str, sd->template);
-+#pragma GCC diagnostic pop
-      }
-    else
-      {

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)
+      {

efl-1.25.0-gettextfix.patch

@@ -0,0 +1,46 @@
+diff -up efl-1.25.0/src/examples/edje/en_IN/domain_name.po.gettextfix efl-1.25.0/src/examples/edje/en_IN/domain_name.po
+--- efl-1.25.0/src/examples/edje/en_IN/domain_name.po.gettextfix	2023-08-01 09:52:10.936518532 -0400
++++ efl-1.25.0/src/examples/edje/en_IN/domain_name.po	2023-08-01 09:55:27.127168512 -0400
+@@ -1,3 +1,19 @@
++msgid ""
++msgstr ""
++"Project-Id-Version: Efl\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2023-08-01 14:55+0100\n"
++"PO-Revision-Date: 2023-08-01 14:55+0100\n"
++"Last-Translator: Unknown\n"
++"Language-Team: General\n"
++"Language: en_IN\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"#-#-#-#-#  domain_name.po (Efl)  #-#-#-#-#\n"
++"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
++"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
++
+ msgid "LOADING"
+ msgstr "Loading..."
+ 
+diff -up efl-1.25.0/src/examples/edje/hi_IN/domain_name.po.gettextfix efl-1.25.0/src/examples/edje/hi_IN/domain_name.po
+--- efl-1.25.0/src/examples/edje/hi_IN/domain_name.po.gettextfix	2023-08-01 09:55:39.594328276 -0400
++++ efl-1.25.0/src/examples/edje/hi_IN/domain_name.po	2023-08-01 09:56:01.270606047 -0400
+@@ -1,3 +1,19 @@
++msgid ""
++msgstr ""
++"Project-Id-Version: Efl\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2023-08-01 14:55+0100\n"
++"PO-Revision-Date: 2023-08-01 14:55+0100\n"
++"Last-Translator: Unknown\n"
++"Language-Team: General\n"
++"Language: hi_IN\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"#-#-#-#-#  domain_name.po (Efl)  #-#-#-#-#\n"
++"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
++"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
++
+ msgid "LOADING"
+ msgstr "लोड हो रहा है..."
+ 

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

efl-sdl-version-build.patch

@@ -0,0 +1,10 @@
+--- efl-1.25.1/src/lib/ecore_sdl/meson.build.orig	2024-08-05 00:11:18.614688500 +0800
++++ efl-1.25.1/src/lib/ecore_sdl/meson.build	2024-08-05 00:11:37.234804100 +0800
+@@ -19,6 +19,7 @@
+     include_directories : config_dir + [include_directories(join_paths('..','..'))],
+     install: true,
+     c_args : package_c_args,
++    version : meson.project_version()
+ )
+ 
+ ecore_sdl = declare_dependency(

efl.spec

@@ -1,12 +1,15 @@
 Name:             efl
-Version:          1.21.0
+Version:          1.25.1
 Release:          3
 Summary:          Collection of Enlightenment libraries
 License:          BSD and LGPLv2+ and GPLv2 and zlib
-URL:              http://enlightenment.org/
+URL:              https://enlightenment.org/
-Source0:          http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
+Source0:          https://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
-Patch0001:        efl-1.21.0-use-pragma-to-ignore-safe-printf.patch
+Patch3:           efl-1.25.0-no-neon.patch
-BuildRequires:    gcc-c++
+Patch4:           efl-1.25.0-check-fix.patch
+Patch5:           efl-1.25.0-gettextfix.patch
+Patch6:           efl-sdl-version-build.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
 BuildRequires:    curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel
@@ -17,14 +20,13 @@ BuildRequires:    libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-
 BuildRequires:    libXp-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel
 BuildRequires:    libblkid-devel libmount-devel systemd-devel harfbuzz-devel
 BuildRequires:    libwebp-devel tslib-devel SDL2-devel SDL-devel c-ares-devel
-BuildRequires:    libxkbcommon-devel uuid-devel libxkbcommon-x11-devel
+BuildRequires:    libxkbcommon-devel uuid-devel libxkbcommon-x11-devel avahi-devel
 BuildRequires:    pkgconfig(poppler-cpp) >= 0.12 pkgconfig(libspectre) pkgconfig(libraw)
 BuildRequires:    pkgconfig(librsvg-2.0) >= 2.14.0 pkgconfig(cairo) >= 1.0.0 ibus-devel
 BuildRequires:    doxygen systemd giflib-devel openjpeg2-devel libdrm-devel
-BuildRequires:    mesa-libwayland-egl-devel libwayland-client-devel >= 1.11.0
+BuildRequires:    wayland-devel >= 1.11.0 wayland-protocols-devel >= 1.7
-BuildRequires:    libwayland-cursor-devel libwayland-server-devel wayland-protocols-devel >= 1.7
+BuildRequires:    ninja-build meson gettext-devel mesa-libGLES-devel
-BuildRequires:    autoconf automake libtool gettext-devel mesa-libGLES-devel
+BuildRequires:    mesa-libgbm-devel libinput-devel luajit-devel cmake 
-BuildRequires:    mesa-libgbm-devel libinput-devel lua-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}
@@ -63,30 +65,29 @@ for the efl library.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-autoreconf -ifv
-sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' data/libeo.so.%{version}-gdb.py
 
 %build
-%configure --enable-xinput22 --enable-systemd --enable-image-loader-webp --enable-harfbuzz --enable-sdl --enable-ibus --disable-scim \
+%{meson} -Dxinput22=true -Dsystemd=true -Devas-loaders-disabler=json,avif -Dharfbuzz=true \
-    --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \
+ -Dsdl=true -Dbuffer=true -Davahi=true -Decore-imf-loaders-disabler=scim -Dglib=true \
-    --enable-fb --enable-wayland --enable-elput --enable-drm --enable-drm-hw-accel --with-opengl=full --disable-cocoa \
+ -Dfb=true -Dwl=true -Ddrm=true -Dinstall-eo-files=true -Dbindings=lua,cxx -Dlua-interpreter=luajit \
-    --with-profile=release --disable-neon --enable-lua-old --with-systemdunitdir=%{_userunitdir}
+ -Delua=true  -Dphysics=true
-%make_build V=1
+%{meson_build}
 
 %install
-%make_install
+%{meson_install}
 sed -i 's|ecore_sdl|ecore-sdl|g' %{buildroot}%{_libdir}/pkgconfig/elementary.pc
 sed -i 's|ecore_sdl|ecore-sdl|g' %{buildroot}%{_libdir}/pkgconfig/elementary-cxx.pc
+%if 0%{?__isa_bits} == 64
+mv %{buildroot}%{_datadir}/gdb/auto-load/usr/lib %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}
+%endif
 chmod 644 src/bin/edje/edje_cc_out.c
 %delete_la
 %find_lang %{name}
 
 %post
-/sbin/ldconfig
 %systemd_user_post ethumb.service
 
 %postun
-/sbin/ldconfig
 %systemd_user_postun ethumb.service
 
 %preun
@@ -107,9 +108,9 @@ chmod 644 src/bin/edje/edje_cc_out.c
 %{_bindir}/eina_modinfo
 %{_bindir}/el*
 %{_bindir}/embryo_cc
+%{_bindir}/emotion_test*
 %{_bindir}/eo*
 %{_bindir}/ethumb*
-%{_bindir}/evas_*
 %{_bindir}/vieet
 %attr(0755,root,root) %caps(cap_audit_write,cap_chown,cap_setuid,cap_sys_admin=pe) %{_bindir}/eeze_scanner
 %dir %{_datadir}/dbus-1/
@@ -125,12 +126,15 @@ chmod 644 src/bin/edje/edje_cc_out.c
 %{_datadir}/icons/hicolor/*/apps/elementary.png
 %{_datadir}/mime/packages/edje.xml
 %{_userunitdir}/ethumb.service
-%exclude %{_datadir}/elua/
+%{_datadir}/elua/
+# exactness
+%{_bindir}/exactness*
+%{_libdir}/libexactness*.so.*
+%{_datadir}/exactness/ 
 
 %files devel
 %{_includedir}/*
-%{_bindir}/efl_wl_test*
+%{_bindir}/efl_canvas_wl_test*
-%{_bindir}/eina-bench-cmp
 %{_libdir}/cmake/*
 %{_libdir}/libe*.so
 %{_libdir}/pkgconfig/*
@@ -140,7 +144,24 @@ chmod 644 src/bin/edje/edje_cc_out.c
 %{_datadir}/em*
 %{_datadir}/eo*
 %exclude %{_libdir}/cmake/Elua/
+# exactness
+%{_libdir}/libexactness*.so 
 
 %changelog
+* Mon Aug 05 2024 Funda Wang <fundawang@yeah.net> - 1.25.1-3
+- Build ecore_sdl versioned so. So efl no longer requires efl-devel
+
+* Wed Aug 16 2023 chenchen <chen_aka_jan@163.com> - 1.25.1-2
+- fix build error due to gettext upgrade to 0.22
+
+* Thu Dec 30 2021 liyanan <liyanan32@huawei.com> - 1.25.1-1
+- update to 1.25.1
+
+* Mon Aug 2 2021 Shenemi Tu <tushenmei@huawei.com> - 1.23.3-2
+- bugfix-of-gcc-10.patch
+
+* Fri Oct 16 2020 maminjie <maminjie1@huawei.com> - 1.23.3-1
+- Upgrade to 1.23.3
+
 * Fri Dec 06 2019 gulining<gulining1@huawei.com> - 1.21.0-3
 - Pakcage init