Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glfw for openSUSE:Factory checked in at 2021-04-06 17:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glfw (Old) and /work/SRC/openSUSE:Factory/.glfw.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glfw" Tue Apr 6 17:28:41 2021 rev:15 rq:880773 version:3.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/glfw/glfw.changes 2021-03-10 08:48:38.354355378 +0100 +++ /work/SRC/openSUSE:Factory/.glfw.new.2401/glfw.changes 2021-04-06 17:28:43.359051911 +0200 @@ -1,0 +2,6 @@ +Mon Mar 22 04:31:59 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Added wayland build flavor + * New -wayland library package + +------------------------------------------------------------------- New: ---- _multibuild glfw-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glfw.spec ++++++ --- /var/tmp/diff_new_pack.4R2EVM/_old 2021-04-06 17:28:44.015052652 +0200 +++ /var/tmp/diff_new_pack.4R2EVM/_new 2021-04-06 17:28:44.019052657 +0200 @@ -16,12 +16,13 @@ # -%define sover 3 -%if 0%{?is_opensuse} -%bcond_without geany +%define flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "-wayland" +%bcond_without wayland %else -%bcond_with geany +%bcond_with wayland %endif +%define sover 3 Name: glfw Version: 3.3.3 Release: 0 @@ -30,6 +31,7 @@ Group: Development/Libraries/C and C++ URL: https://www.glfw.org/ Source: https://github.com/glfw/glfw/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source99: %{name}-rpmlintrc BuildRequires: cmake >= 2.8.12 BuildRequires: doxygen BuildRequires: gcc-c++ @@ -37,12 +39,16 @@ BuildRequires: vulkan-devel BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) +%if %{with wayland} +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(xkbcommon) +%else +BuildRequires: geany BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) -%if %{with geany} -BuildRequires: geany %endif %description @@ -51,28 +57,36 @@ operating system specific tasks such as opening an OpenGL window, and reading keyboard, time, mouse and joystick input. -%package -n libglfw%{sover} +%package -n libglfw%{sover}%{flavor} Summary: Framework for OpenGL application development Group: System/Libraries +%if %{with wayland} +Provides: libglfw%{sover} = %{version} +Conflicts: libglfw%{sover} +%else +Conflicts: libglfw%{sover}-wayland = %{version} +%endif -%description -n libglfw%{sover} +%description -n libglfw%{sover}%{flavor} GLFW is a framework for OpenGL application development. It is a single library providing a powerful, portable API for otherwise operating system specific tasks such as opening an OpenGL window, and reading keyboard, time, mouse and joystick input. -%package -n libglfw-devel +%if %{without wayland} +%package -n libglfw%{flavor}-devel Summary: Development files for GLFW, an OpenGL application framework Group: Development/Libraries/C and C++ Requires: cmake Requires: libglfw%{sover} = %{version} Requires: pkgconfig(gl) -%description -n libglfw-devel +%description -n libglfw%{flavor}-devel GLFW is a framework for OpenGL application development. It is a single library providing a powerful, portable API for otherwise operating system specific tasks such as opening an OpenGL window, and reading keyboard, time, mouse and joystick input. +%endif %prep %setup -q @@ -82,40 +96,47 @@ mkdir -p geany_config %build +%if %{without wayland} # generate geany tags -%if %{with geany} geany -c geany_config -g glfw.c.tags $(find src \( ! -name CMakeFiles \) -type f \( -iname "*.c" -o -iname "*.h" \) \( ! -iname "win32*" \) \( ! -iname "cocoa*" \) | sort ) include/GLFW/glfw3.h %endif -%cmake -make %{?_smp_mflags} all +%cmake \ +%if %{with wayland} + -DGLFW_USE_WAYLAND=ON +%endif + +%make_build %install %cmake_install +%if %{with wayland} +# Only in main package +rm -rfv %{buildroot}%{_includedir} %{buildroot}%{_libdir}/{cmake,libglfw.so,pkgconfig} +%else # install geany tags -%if %{with geany} install -d %{buildroot}/%{_datadir}/geany/tags/ install -m0644 glfw.c.tags %{buildroot}/%{_datadir}/geany/tags/ %endif -%post -n libglfw%{sover} -p /sbin/ldconfig -%postun -n libglfw%{sover} -p /sbin/ldconfig +%post -n libglfw%{sover}%{flavor} -p /sbin/ldconfig +%postun -n libglfw%{sover}%{flavor} -p /sbin/ldconfig -%files -n libglfw%{sover} +%files -n libglfw%{sover}%{flavor} %license LICENSE.md %doc README.md %{_libdir}/libglfw.so.%{sover}* +%if %{without wayland} %files -n libglfw-devel %doc examples/*.c %{_includedir}/GLFW/ %{_libdir}/cmake/glfw3 %{_libdir}/libglfw.so %{_libdir}/pkgconfig/glfw3.pc -%if %{with geany} -%{_datadir}/geany/ +%{_datadir}/geany/* %endif %changelog ++++++ _multibuild ++++++ <multibuild> <flavor>-wayland</flavor> </multibuild> ++++++ glfw-rpmlintrc ++++++ addFilter("libglfw3-wayland.*: E: shlib-policy-name-error")
