From 529c65c36bdf3e48797ea97ab5e9ab9f6945b107 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 5 Aug 2024 00:13:56 +0800 Subject: [PATCH] Build ecore_sdl versioned so. So efl no longer requires efl-devel (cherry picked from commit cc086d422c5b85ef708399d38e4cde999dc26705) --- efl-sdl-version-build.patch | 10 ++++++++++ efl.spec | 12 +++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 efl-sdl-version-build.patch diff --git a/efl-sdl-version-build.patch b/efl-sdl-version-build.patch new file mode 100644 index 0000000..a1e68a3 --- /dev/null +++ b/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( diff --git a/efl.spec b/efl.spec index 7f99c1a..e2921cf 100644 --- a/efl.spec +++ b/efl.spec @@ -1,13 +1,14 @@ Name: efl Version: 1.25.1 -Release: 2 +Release: 3 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 +URL: https://enlightenment.org/ +Source0: https://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 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 @@ -84,11 +85,9 @@ chmod 644 src/bin/edje/edje_cc_out.c %find_lang %{name} %post -/sbin/ldconfig %systemd_user_post ethumb.service %postun -/sbin/ldconfig %systemd_user_postun ethumb.service %preun @@ -149,6 +148,9 @@ chmod 644 src/bin/edje/edje_cc_out.c %{_libdir}/libexactness*.so %changelog +* Mon Aug 05 2024 Funda Wang - 1.25.1-3 +- Build ecore_sdl versioned so. So efl no longer requires efl-devel + * Wed Aug 16 2023 chenchen - 1.25.1-2 - fix build error due to gettext upgrade to 0.22 -- Gitee