Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:tar_git:libhybris.spec
@@ -1,5 +1,5 @@ Name: libhybris -Version: 0.0.5.18+n64.rpm.htclibc.20171003173936.26.ge551c7a +Version: 0.0.5.18+master.20180610081122.25.gb23f246 Release: 1%{?dist} Summary: Utilize Bionic-based HW adaptations on glibc systems @@ -232,10 +232,22 @@ Requires: %{name}-libsync = %{version}-%{release} Requires: %{name}-libvibrator = %{version}-%{release} - %description tests %{summary}. +%package tests-upstream +Summary: Tests from upstream %{name} but not working on our side +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libEGL = %{version}-%{release} +Requires: %{name}-libGLESv2 = %{version}-%{release} +Requires: %{name}-libhardware = %{version}-%{release} +Requires: %{name}-libsync = %{version}-%{release} + +%description tests-upstream +%{summary}. + %prep %setup -q -n %{name}-%{version}/%{name} @@ -247,15 +259,19 @@ %{!?qa_stage_devel:--enable-debug} \ %{!?qa_stage_devel:--enable-trace} \ --with-android-headers=/usr/lib/droid-devel/droid-headers \ - --enable-adreno-quirks \ + --enable-property-cache \ %ifarch %{arm} --enable-arch=arm \ %endif %ifarch %{ix86} --enable-arch=x86 \ %endif - --enable-property-cache \ - --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib +%ifarch %{aarch64} + --enable-arch=arm64 \ + --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib64:/vendor/lib64:/system/lib64:/odm/lib64 +%else + --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib:/odm/lib +%endif make @@ -279,6 +295,9 @@ %post libGLESv2 -p /sbin/ldconfig %postun libGLESv2 -p /sbin/ldconfig +%post libOpenCL -p /sbin/ldconfig +%postun libOpenCL -p /sbin/ldconfig + %post libwayland-egl -p /sbin/ldconfig %postun libwayland-egl -p /sbin/ldconfig @@ -294,6 +313,9 @@ %post libvibrator -p /sbin/ldconfig %postun libvibrator -p /sbin/ldconfig +%post tests-upstream -p /sbin/ldconfig +%postun tests-upstream -p /sbin/ldconfig + %files %defattr(-,root,root,-) %doc hybris/AUTHORS hybris/COPYING @@ -301,20 +323,8 @@ %{_libdir}/libandroid-properties.so.* %{_bindir}/getprop %{_bindir}/setprop -%{_libdir}/libcamera.so.1 -%{_libdir}/libcamera.so.1.0.0 -%{_libdir}/libhybris/linker/jb.la -%{_libdir}/libhybris/linker/jb.so -%{_libdir}/libhybris/linker/n.la -%{_libdir}/libhybris/linker/n.so -%{_libdir}/libis.so.1 -%{_libdir}/libis.so.1.0.0 -%{_libdir}/libmedia.so.1 -%{_libdir}/libmedia.so.1.0.0 -%{_libdir}/libsf.so.1 -%{_libdir}/libsf.so.1.0.0 -%{_libdir}/libui.so.1 -%{_libdir}/libui.so.1.0.0 +%{_libdir}/libhybris/linker/.la +%{_libdir}/libhybris/linker/.so %{_libdir}/libwifi.so.1 %{_libdir}/libwifi.so.1.0.0 @@ -334,19 +344,9 @@ %{_includedir}/hybris/surface_flinger/surface_flinger_compatibility_layer.h %{_includedir}/hybris/ui/ui_compatibility_layer.h %{_includedir}/hybris/media/.h -%{_libdir}/libcamera.so -%{_libdir}/libis.so -%{_libdir}/libmedia.so -%{_libdir}/libsf.so -%{_libdir}/libui.so %{_libdir}/libwifi.so -%{_libdir}/pkgconfig/libcamera.pc -%{_libdir}/pkgconfig/libis.pc -%{_libdir}/pkgconfig/libmedia.pc -%{_libdir}/pkgconfig/libsf.pc %{_libdir}/pkgconfig/libwifi.pc - %files libEGL %defattr(-,root,root,-) %{_libdir}/libEGL.so. @@ -393,12 +393,14 @@ %files libOpenCL %defattr(-,root,root,-) -# We don't have implementation of OpenCL atm. +%{_libdir}/libOpenCL.so.* %files libOpenCL-devel %defattr(-,root,root,-) %{_includedir}/CL/.h %{_includedir}/CL/.hpp +%{_libdir}/libOpenCL.so +%{_libdir}/pkgconfig/OpenCL.pc %files libOpenVG %defattr(-,root,root,-) @@ -456,4 +458,42 @@ %files tests %defattr(-,root,root,-) -%{_bindir}/test_* +%{_bindir}/test_audio +%{_bindir}/test_egl +%{_bindir}/test_egl_configs +%{_bindir}/test_glesv2 +%{_bindir}/test_gps +%{_bindir}/test_hwcomposer +%{_bindir}/test_lights +%{_bindir}/test_nfc +%{_bindir}/test_opencl +%{_bindir}/test_sensors +%{_bindir}/test_vibrator +%{_bindir}/test_wifi + +%files tests-upstream +%defattr(-,root,root,-) +%{_libdir}/libcamera.so +%{_libdir}/libis.so +%{_libdir}/libmedia.so +%{_libdir}/libsf.so +%{_libdir}/libui.so +%{_libdir}/pkgconfig/libcamera.pc +%{_libdir}/pkgconfig/libis.pc +%{_libdir}/pkgconfig/libmedia.pc +%{_libdir}/pkgconfig/libsf.pc +%{_libdir}/libcamera.so.1 +%{_libdir}/libcamera.so.1.0.0 +%{_libdir}/libis.so.1 +%{_libdir}/libis.so.1.0.0 +%{_libdir}/libmedia.so.1 +%{_libdir}/libmedia.so.1.0.0 +%{_libdir}/libsf.so.1 +%{_libdir}/libsf.so.1.0.0 +%{_libdir}/libui.so.1 +%{_libdir}/libui.so.1.0.0 +%{_bindir}/test_camera +%{_bindir}/test_input +%{_bindir}/test_media +%{_bindir}/test_recorder +%{_bindir}/test_sf
	Changed	_service ^
	Added	_service:tar_git:libhybris-0.0.5.18+master.20180610081122.25.gb23f246.tar.bz2 ^
	Deleted	_service:tar_git:libhybris-0.0.5.18+n64.rpm.htclibc.20171003173936.26.ge551c7a.tar.bz2 ^