Changes - SailfishOS Open Build Service

Changes of Revision 4

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:libhybris.changes
@@ -1,5 +1,34 @@ -* Tue Oct 26 2021 Matti Kosola <matti.kosola@jolla.com> - 0.0.5.42.1 -- [libhybris] hooks: Reset reference count of condition variable before pthread_cond_destroy. Fixes JB#55761 +* Thu Jun 29 2023 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.49 +- [libhybris] compat: Include changes from Halium +- [libhybris] eglplatform: take MESA_EGL_NO_X11_HEADERS into account +- [libhybris] hybris: Add support for Android 12 and 13. JB#60211 +- [libhybris] hybris: gralloc: Use libui's GraphicBufferAllocator/GraphicBufferMapper by default +- [libhybris] hybris: Hook pthread_setschedprio +- [libhybris] hybris: Hook stpcpy and stpncpy +- [libhybris] hybris: q: backport ifunc resolvers calling convention from R linker +- [libhybris] hybris: vulkan: Fix build with vulkan headers 1.3.236 or newer + +* Tue Jan 24 2023 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.48 +- [packaging] Move libui to main package. JB#58495 + +* Mon Jan 23 2023 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.47 +- [libhybris] hybris: common: q: Backport support for linkerconfig path from r linker. JB#58495 +- [libhybris] hybris: common: q: Fix loading namespaces for non-Android processes. JB#58495 +- [libhybris] server_wlegl: fix a crash when format = 0. JB#59781 + +* Tue Jun 28 2022 martyone <martin.kampas@jolla.com> - 0.0.5.46 +- [packaging] Fix submodule URLs. JB#57795 + +* Fri Apr 29 2022 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.45 +- [packaging] Add vulkan packaging. JB#54726 +- [packaging] Obsolete removed libhybris-libOpenVG packages + +* Sun Oct 24 2021 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.44 +- [libhybris] hybris: common: o: Fix incorrect variable name. JB#56061 + +* Fri Oct 22 2021 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.43 +- [libhybris] Add support for Android 11. JB#55653 +- [libhybris] hooks: Reset reference count of condition variable before pthread_cond_destroy. JB#55761 * Sat Feb 27 2021 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 0.0.5.42 - [libhybris] hybris: common: q: Fix building q linker without HYBRIS_TRACE_(*)HOOKED support. JB#53238
[-] [+]	Changed	_service:tar_git:libhybris.spec ^
@@ -1,19 +1,18 @@ Name: libhybris -Version: 0.0.5.42.1 +Version: 0.0.5.49 Release: 1%{?dist} Summary: Utilize Bionic-based HW adaptations on glibc systems -License: ASL 2.0 -URL: https://github.com/libhybris/libhybris +License: ASL 2.0 and BSD and ISC and LGPLv2 and MIT +URL: https://github.com/mer-hybris/libhybris Source: %{name}-%{version}.tar.bz2 - -Patch1: 0001-hooks-Reset-reference-count-of-condition-variable-be.patch - BuildRequires: libtool BuildRequires: pkgconfig(wayland-client) +BuildRequires: vulkan-headers # When droid-hal-ha builds for a specific HA it should provide # droid-hal-devel via droid-hal-%%{device}-devel package BuildRequires: droid-hal-devel Conflicts: mesa-llvmpipe +Obsoletes: libhybris-libOpenVG <= 0.0.5.44 %description %{summary}. @@ -21,6 +20,7 @@ %package devel Summary: Common development headers for %{name} Requires: %{name} = %{version}-%{release} +Obsoletes: libhybris-libOpenVG-devel <= 0.0.5.44 %description devel %{summary}. @@ -113,26 +113,6 @@ %description libOpenCL-devel %{summary}. -%package libOpenVG -Summary: OpenVG for %{name} -Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Provides: libOpenVG - -%description libOpenVG -%{summary}. - -%package libOpenVG-devel -Summary: OpenVG development library for %{name} -Requires: %{name} = %{version}-%{release} -Requires: %{name}-libOpenVG = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Provides: libOpenVG-devel - -%description libOpenVG-devel -%{summary}. - %package libwayland-egl Summary: Wayland EGL for %{name} Requires: %{name} = %{version}-%{release} @@ -239,6 +219,17 @@ %description libsf-devel %{summary}. +%package libvulkan +Summary: Vulkan support helpers for %{name} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: %{name} = %{version}-%{release} +Provides: vulkan +Obsoletes: vulkan-loader + +%description libvulkan +%{summary}. + %package tests Summary: Tests for %{name} Requires: %{name} = %{version}-%{release} @@ -247,6 +238,7 @@ Requires: %{name}-libhardware = %{version}-%{release} Requires: %{name}-libsync = %{version}-%{release} Requires: %{name}-libvibrator = %{version}-%{release} +Requires: %{name}-libvulkan = %{version}-%{release} %description tests %{summary}. @@ -282,7 +274,7 @@ %{summary}. %prep -%autosetup -p1 -n %{name}-%{version}/%{name} +%autosetup -n %{name}-%{version}/%{name} %build cd hybris @@ -316,6 +308,8 @@ # Remove the static libraries. rm -f %{buildroot}/%{_libdir}/.la %{buildroot}/%{_libdir}/libhybris/.la +# Remove unneeded library symlink +rm -f %{buildroot}/%{_libdir}/libhybris-vulkanplatformcommon.so %{buildroot}/%{_libdir}/libvulkan.so mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} install -m0644 AUTHORS %{buildroot}%{_docdir}/%{name}-%{version} @@ -353,6 +347,9 @@ %post libsf -p /sbin/ldconfig %postun libsf -p /sbin/ldconfig +%post libvulkan -p /sbin/ldconfig +%postun libvulkan -p /sbin/ldconfig + %post tests-upstream -p /sbin/ldconfig %postun tests-upstream -p /sbin/ldconfig @@ -361,9 +358,10 @@ %files %defattr(-,root,root,-) -%license hybris/COPYING +%license LICENSE.Apache2 LICENSE.BSD-2 LICENSE.BSD-3 LICENSE.BSD-4 LICENSE.ISC LICENSE.LGPLv21 LICENSE.MIT %dir %{_libdir}/libhybris %{_libdir}/libhybris-common.so.* +%{_libdir}/libhybris-platformcommon.so.* %{_libdir}/libandroid-properties.so.* %{_libdir}/libgralloc.so.* %{_libdir}/libhwc2.so.* @@ -371,6 +369,7 @@ %{_bindir}/setprop %{_libdir}/libhybris/linker/.la %{_libdir}/libhybris/linker/.so +%{_libdir}/libui.so.* %{_libdir}/libwifi.so.* %files devel @@ -380,7 +379,9 @@ %{_includedir}/hybris/properties %{_includedir}/hybris/dlfcn %{_includedir}/hybris/common +%{_includedir}/hybris/platformcommon %{_libdir}/libhybris-common.so +%{_libdir}/libhybris-platformcommon.so %{_libdir}/pkgconfig/libgralloc.pc %{_libdir}/libandroid-properties.so %{_libdir}/pkgconfig/libandroid-properties.pc @@ -390,6 +391,7 @@ %{_includedir}/hybris/media %{_libdir}/libgralloc.so %{_libdir}/libhwc2.so +%{_libdir}/libui.so %{_libdir}/libwifi.so %{_libdir}/pkgconfig/libwifi.pc %{_includedir}/hybris/hwc2/hwc2_compatibility_layer.h @@ -448,14 +450,6 @@ %{_libdir}/libOpenCL.so %{_libdir}/pkgconfig/OpenCL.pc -%files libOpenVG -%defattr(-,root,root,-) -# We don't have implementation of OpenVG atm. - -%files libOpenVG-devel -%defattr(-,root,root,-) -%{_includedir}/VG - %files libwayland-egl %defattr(-,root,root,-) %{_libdir}/libhybris/eglplatform_wayland.so @@ -505,6 +499,13 @@ %{_libdir}/libsf.so %{_libdir}/pkgconfig/libsf.pc +%files libvulkan +%defattr(-,root,root,-) +%{_libdir}/libvulkan.so.* +%{_libdir}/libhybris-vulkanplatformcommon.so.* +%{_libdir}/libhybris/vulkanplatform_null.so +%{_libdir}/libhybris/vulkanplatform_wayland.so + %files tests %defattr(-,root,root,-) %{_bindir}/test_audio @@ -520,6 +521,7 @@ %{_bindir}/test_opencl %{_bindir}/test_sensors %{_bindir}/test_vibrator +%{_bindir}/test_vulkan %{_bindir}/test_wifi %files tests-upstream @@ -527,7 +529,6 @@ %{_libdir}/libcamera.so.* %{_libdir}/libis.so.* %{_libdir}/libmedia.so.* -%{_libdir}/libui.so.* %{_bindir}/test_camera %{_bindir}/test_input %{_bindir}/test_media @@ -538,7 +539,6 @@ %{_libdir}/libcamera.so %{_libdir}/libis.so
[-] [+]	Deleted	_service:tar_git:0001-hooks-Reset-reference-count-of-condition-variable-be.patch ^
@@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@jolla.com> -Date: Wed, 20 Oct 2021 15:17:26 +0000 -Subject: [PATCH] hooks: Reset reference count of condition variable before - pthread_cond_destroy. - -Bionic and glibc implementations of pthread_cond_destroy are different. -Bionic implementation is trivial and does not block whereas the glibc -implementation requires that there is no thread waiting for the condition -variable when it is destroyed and bionic code does not always follow this -requirement which can cause a deadlock because two or more threads -are waiting for the same condition variable. ---- - hybris/common/hooks.c \| 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c -index a35fe44066b4c462da6768395e459b00ecb6abf7..7183fc1953bf3f89d9ac98bcdecbde9498cb2ea8 100644 ---- a/hybris/common/hooks.c -+++ b/hybris/common/hooks.c -@@ -905,6 +905,13 @@ static int _hybris_hook_pthread_cond_destroy(pthread_cond_t cond) - } - - if (!hybris_is_pointer_in_shm((void)realcond)) { -+ /* Bionic and glibc implementations of pthread_cond_destroy are different. -+ * Bionic implementation does not block whereas the glibc implementation -+ * requires that there are no threads waiting for the condition variable -+ * when it is destroyed and bionic code does not always follow this -+ * requirement. To prevent deadlocks reset the reference count of the -+ * condition variable. */ -+ realcond->__data.__wrefs = 0; - ret = pthread_cond_destroy(realcond); - free(realcond); - }
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/libhybris.git</param> <param name="branch">master</param> - <param name="revision">0.0.5.42.1</param> + <param name="revision">HEAD</param> </service> </services>
	Changed	_service:tar_git:libhybris-0.0.5.49.tar.bz2 ^