[packages/wpe-cog] - updated to 0.12.4 - removed obsolete link patch
qboosh
qboosh at pld-linux.org
Fri Apr 22 21:35:47 CEST 2022
commit 86b7c1841383ec3c9a1e3310872dd926ea87e88e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Apr 22 21:36:00 2022 +0200
- updated to 0.12.4
- removed obsolete link patch
cog-link.patch | 20 ------------
wpe-cog.spec | 99 ++++++++++++++++++++++++++++++++++++----------------------
2 files changed, 61 insertions(+), 58 deletions(-)
---
diff --git a/wpe-cog.spec b/wpe-cog.spec
index 82669f7..05f6119 100644
--- a/wpe-cog.spec
+++ b/wpe-cog.spec
@@ -1,31 +1,37 @@
#
# Conditional build:
-%bcond_without apidocs # API documentation
-%bcond_without drm # DRM platform module
-%bcond_without fdo # FDO platform module
-%bcond_without gtk4 # GTK4 platform module
-%bcond_without x11 # X11 platform module
-%bcond_with weston # direct display support for FDO platform module (requires private protocol files)
+%bcond_without apidocs # API documentation
+%bcond_without drm # DRM platform module
+%bcond_without gtk4 # GTK4 platform module
+%bcond_without headless # headless platform module
+%bcond_without wayland # Wayland (FDO) platform module
+%bcond_without x11 # X11 platform module
+%bcond_with libsoup3 # libsoup3 instead of libsoup 2.x
+%bcond_with weston # direct display support for FDO platform module (requires private protocol files)
#
Summary: Cog Core - WPE WebKit base launcher
Summary(pl.UTF-8): Cog Core - narzędzie do uruchamiania środowiska WPE WebKit
Name: wpe-cog
-Version: 0.10.0
+Version: 0.12.4
Release: 1
License: MIT
Group: Libraries
Source0: https://wpewebkit.org/releases/cog-%{version}.tar.xz
-# Source0-md5: 1b0407b6163a3a01afdfc0fb454a7570
-Patch0: cog-link.patch
+# Source0-md5: cdb8acdc3acc9b5082e7db9c279155c3
URL: https://wpewebkit.org/
BuildRequires: cmake >= 3.3
BuildRequires: gcc >= 5:3.2
-BuildRequires: glib2-devel >= 1:2.44
+%{!?with_libsoup3:BuildRequires: glib2-devel >= 1:2.44}
+%{?with_libsoup3:BuildRequires: glib2-devel >= 1:2.67.4}
+%{!?with_libsoup3:BuildRequires: libsoup-devel >= 2.4}
+%{?with_libsoup3:BuildRequires: libsoup3-devel >= 3.0}
BuildRequires: libsoup-devel >= 2.4
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: tar >= 1:1.22
+%{!?with_libsoup3:BuildRequires: wpe-webkit-devel >= 2.28.0}
+%{?with_libsoup3:BuildRequires: wpe-webkit1.1-devel >= 2.33.1}
BuildRequires: wpe-webkit-devel >= 2.28.0
BuildRequires: xz
%if %{with apidocs}
@@ -38,45 +44,54 @@ BuildRequires: Mesa-libgbm-devel >= 13.0
BuildRequires: libdrm-devel >= 2.4.71
BuildRequires: libinput-devel
BuildRequires: udev-devel
+# wayland-server
BuildRequires: wayland-devel
-BuildRequires: wpebackend-fdo-devel >= 1.3.1
+BuildRequires: wpebackend-fdo-devel >= 1.4.0
%endif
-%if %{with fdo}
+%if %{with gtk4}
+BuildRequires: gtk4-devel >= 4.0
+BuildRequires: wpebackend-fdo-devel
+%endif
+%if %{with headless}
+BuildRequires: wpebackend-fdo-devel >= 1.8.0
+%endif
+%if %{with wayland}
BuildRequires: EGL-devel
+BuildRequires: cairo-devel
+# wayland-client wayland-cursor
BuildRequires: wayland-devel >= 1.10
BuildRequires: wayland-egl-devel
BuildRequires: wayland-protocols
-BuildRequires: wpebackend-fdo-devel >= 1.3.1
+BuildRequires: wpebackend-fdo-devel >= 1.6.0
BuildRequires: xorg-lib-libxkbcommon-devel
%if %{with weston}
BuildRequires: weston-protocols >= 9.0.0
%endif
%endif
-%if %{with gtk4}
-BuildRequires: gtk4-devel >= 4.0
-BuildRequires: wpebackend-fdo-devel
-%endif
%if %{with x11}
BuildRequires: EGL-devel
BuildRequires: libxcb-devel
-BuildRequires: wpebackend-fdo-devel >= 1.3.1
+BuildRequires: wpebackend-fdo-devel >= 1.6.0
BuildRequires: xorg-lib-libxkbcommon-x11-devel
%endif
Requires: %{name}-libs = %{version}-%{release}
%if %{with drm}
Requires: Mesa-libgbm >= 13.0
Requires: libdrm >= 2.4.71
-Requires: wpebackend-fdo >= 1.3.1
+Requires: wpebackend-fdo >= 1.4.0
%endif
-%if %{with fdo}
+%if %{with headless}
+BuildRequires: wpebackend-fdo >= 1.8.0
+%endif
+%if %{with wayland}
Requires: wayland >= 1.10
-Requires: wpebackend-fdo >= 1.3.1
+Requires: wpebackend-fdo >= 1.6.0
%if %{with weston}
Requires: weston >= 9
%endif
%endif
%if %{with x11}
-Requires: wpebackend-fdo >= 1.3.1
+Requires: wpebackend-fdo >= 1.6.0
%endif
# cog in PLD used to be different project: http://www.krakoa.dk/old-linux-software.html#COG
Conflicts: cog
@@ -92,8 +107,12 @@ Cog Core - narzędzie do uruchamiania środowiska WPE WebKit.
Summary: Cog Core library
Summary(pl.UTF-8): Biblioteka Cog Core
Group: Libraries
-Requires: glib2 >= 1:2.44
-Requires: wpe-webkit >= 2.28.0
+%{!?with_libsoup3:Requires: glib2 >= 1:2.44}
+%{?with_libsoup3:Requires: glib2 >= 1:2.67.4}
+%{!?with_libsoup3:Requires: libsoup >= 2.4}
+%{?with_libsoup3:Requires: libsoup3 >= 3.0}
+%{!?with_libsoup3:Requires: wpe-webkit >= 2.28.0}
+%{?with_libsoup3:Requires: wpe-webkit1.1 >= 2.33.1}
%description libs
Cog Core library.
@@ -106,7 +125,8 @@ Summary: Header files for Cog Core library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Cog Core
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: wpe-webkit-devel >= 2.28.0
+%{!?with_libsoup3:Requires: wpe-webkit-devel >= 2.28.0}
+%{?with_libsoup3:Requires: wpe-webkit1.1-devel >= 2.33.1}
%description devel
Header files for Cog Core library.
@@ -128,7 +148,6 @@ Dokumentacja API biblioteki Cog Core.
%prep
%setup -q -n cog-%{version}
-%patch0 -p1
%build
install -d build
@@ -138,12 +157,14 @@ cd build
%{?with_apidocs:-DBUILD_DOCS=ON} \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
-DCOG_HOME_URI="https://www.pld-linux.org/" \
- %{?with_drm:-DCOG_PLATFORM_DRM=ON} \
- %{!?with_fdo:-DCOG_PLATFORM_FDO=OFF} \
+ %{!?with_drm:-DCOG_PLATFORM_DRM=OFF} \
%{?with_gtk4:-DCOG_PLATFORM_GTK4=ON} \
+ %{!?with_headless:-DCOG_PLATFORM_HEADLESS=OFF} \
+ %{!?with_wayland:-DCOG_PLATFORM_WL=OFF} \
%{?with_x11:-DCOG_PLATFORM_X11=ON} \
- %{?with_gtk:-DCOG_USE_WEBKITGTK=ON} \
- %{?with_weston:-DCOG_WESTON_DIRECT_DISPLAY=ON}
+ %{?with_gtk4:-DCOG_USE_WEBKITGTK=ON} \
+ %{?with_weston:-DCOG_WESTON_DIRECT_DISPLAY=ON} \
+ %{?with_libsoup3:-DUSE_SOUP2=OFF}
%{__make}
@@ -164,18 +185,20 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING NEWS README.md
%attr(755,root,root) %{_bindir}/cog
%attr(755,root,root) %{_bindir}/cogctl
-%attr(755,root,root) %{_libdir}/libcogplatform-headless.so
+%dir %{_libdir}/cog
+%dir %{_libdir}/cog/modules
+%attr(755,root,root) %{_libdir}/cog/modules/libcogplatform-headless.so
%if %{with drm}
-%attr(755,root,root) %{_libdir}/libcogplatform-drm.so
-%endif
-%if %{with fdo}
-%attr(755,root,root) %{_libdir}/libcogplatform-fdo.so
+%attr(755,root,root) %{_libdir}/cog/modules/libcogplatform-drm.so
%endif
%if %{with gtk4}
-%attr(755,root,root) %{_libdir}/libcogplatform-gtk4.so
+%attr(755,root,root) %{_libdir}/cog/modules/libcogplatform-gtk4.so
+%endif
+%if %{with wayland}
+%attr(755,root,root) %{_libdir}/cog/modules/libcogplatform-wl.so
%endif
%if %{with x11}
-%attr(755,root,root) %{_libdir}/libcogplatform-x11.so
+%attr(755,root,root) %{_libdir}/cog/modules/libcogplatform-x11.so
%endif
%{_mandir}/man1/cog.1*
%{_mandir}/man1/cogctl.1*
@@ -183,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcogcore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcogcore.so.1
+%attr(755,root,root) %ghost %{_libdir}/libcogcore.so.7
%files devel
%defattr(644,root,root,755)
diff --git a/cog-link.patch b/cog-link.patch
deleted file mode 100644
index e1e6fd0..0000000
--- a/cog-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cog-0.10.0/CMakeLists.txt.orig 2021-05-18 17:03:23.000000000 +0200
-+++ cog-0.10.0/CMakeLists.txt 2021-08-17 18:55:07.355282549 +0200
-@@ -159,7 +159,7 @@
- VERSION ${COGCORE_VERSION}
- SOVERSION ${COGCORE_VERSION_MAJOR}
- )
--target_link_libraries(cogcore PkgConfig::WEB_ENGINE PkgConfig::SOUP)
-+target_link_libraries(cogcore PkgConfig::WEB_ENGINE PkgConfig::SOUP -ldl)
- target_compile_definitions(cogcore PRIVATE G_LOG_DOMAIN=\"Cog-Core\")
- if (HAS_WALL)
- target_compile_options(cogcore PUBLIC -Wall)
-@@ -172,7 +172,7 @@
- target_compile_options(cog PUBLIC "-Wall")
- endif ()
- target_compile_definitions(cog PRIVATE G_LOG_DOMAIN=\"Cog\")
-- target_link_libraries(cog cogcore -ldl)
-+ target_link_libraries(cog cogcore)
-
- add_executable(cogctl cogctl.c core/cog-utils.c)
- set_property(TARGET cogctl PROPERTY C_STANDARD 99)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wpe-cog.git/commitdiff/86b7c1841383ec3c9a1e3310872dd926ea87e88e
More information about the pld-cvs-commit
mailing list