Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:libhybris.changes
@@ -1,15 +1,3 @@ -* Thu Feb 23 2017 Simonas Leleiva <simonas.leleiva@meramo.co.uk> - 0.0.5.18.2 -- [hybris] Build with a fix for browser crashing on 64bit hw. MER#1759 - -* Thu Feb 16 2017 Simonas Leleiva <simonas.leleiva@meramo.co.uk> - 0.0.5.18.2.1 -- [packaging] update back to upstream version -- [packaging] Update .spec as per upstream (WIP) - -* Tue Jan 17 2017 Simonas Leleiva <simonas.leleiva@meramo.co.uk> - 0.0.5.18.1 -- [submodule] switch to downstream until upstream gets android 6 support. JB#36409 -- [update] update libhybris. Contributes to MER#1737 -- [update] update libhybris. Fixes JB#36409 - * Thu Aug 11 2016 Simonas Leleiva <simonas.leleiva@meramo.co.uk> - 0.0.5.18 - [update] update from upstream - [update] update libhybris. Fixes JB#35958
[-] [+]	Changed	_service:tar_git:libhybris.spec ^
@@ -1,5 +1,5 @@ Name: libhybris -Version: 0.0.5.18.5+minimalhooks.mido.20170718200454.1.g3da2dbd +Version: 0.0.5.18+n64.rpm.htclibc.20171003173936.26.ge551c7a Release: 1%{?dist} Summary: Utilize Bionic-based HW adaptations on glibc systems @@ -236,26 +236,6 @@ %description tests %{summary}. -%package detritus -Summary: Straggler files for %{name} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: %{name} = %{version}-%{release} - -%description detritus -%{summary}. - -%package detritus-devel -Summary: Straggler development library for %{name} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: %{name} = %{version}-%{release} -Requires: %{name}-detritus = %{version}-%{release} - -%description detritus-devel -%{summary}. - - %prep %setup -q -n %{name}-%{version}/%{name} @@ -267,24 +247,15 @@ %{!?qa_stage_devel:--enable-debug} \ %{!?qa_stage_devel:--enable-trace} \ --with-android-headers=/usr/lib/droid-devel/droid-headers \ - --enable-experimental \ - --enable-mali-quirks \ --enable-adreno-quirks \ - --enable-initialize-bionic \ -%ifarch %{ix86} - --enable-arch=x86 \ - --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib \ -%endif %ifarch %{arm} - --with-mode=arm \ --enable-arch=arm \ - --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib \ %endif -%ifarch aarch64 - --enable-arch=arm64 \ - --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib64:/vendor/lib64:/system/lib64 \ +%ifarch %{ix86} + --enable-arch=x86 \ %endif - --enable-property-cache + --enable-property-cache \ + --with-default-hybris-ld-library-path=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib make @@ -323,9 +294,6 @@ %post libvibrator -p /sbin/ldconfig %postun libvibrator -p /sbin/ldconfig -%post detritus -p /sbin/ldconfig -%postun detritus -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc hybris/AUTHORS hybris/COPYING @@ -333,12 +301,22 @@ %{_libdir}/libandroid-properties.so.* %{_bindir}/getprop %{_bindir}/setprop -%{_libdir}/libhybris/linker/mm.la -%{_libdir}/libhybris/linker/mm.so -%ifnarch aarch64 - %{_libdir}/libhybris/linker/jb.la - %{_libdir}/libhybris/linker/jb.so -%endif +%{_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}/libwifi.so.1 +%{_libdir}/libwifi.so.1.0.0 %files devel %defattr(-,root,root,-) @@ -348,12 +326,25 @@ %{_includedir}/hybris/common/binding.h %{_includedir}/hybris/common/dlfcn.h %{_includedir}/hybris/common/floating_point_abi.h +%{_includedir}/hybris/common/hooks.h %{_libdir}/libhybris-common.so %{_libdir}/libandroid-properties.so %{_libdir}/pkgconfig/libandroid-properties.pc %{_includedir}/hybris/camera/.h %{_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 @@ -466,40 +457,3 @@ %files tests %defattr(-,root,root,-) %{_bindir}/test_* - -# this is still needed by tests, needs rework -%files detritus -%defattr(-,root,root,-) -%{_libdir}/libcamera.so.* -%{_libdir}/libis.so.* -%{_libdir}/libmedia.so.* -%{_libdir}/libsf.so.* -%{_libdir}/libui.so.* -%{_libdir}/libwifi.so.* - -%files detritus-devel -%defattr(-,root,root,-) -%{_includedir}/hybris/common/hooks.h -%{_includedir}/hybris/media/media_buffer_layer.h -%{_includedir}/hybris/media/media_codec_layer.h -%{_includedir}/hybris/media/media_codec_list.h -%{_includedir}/hybris/media/media_codec_source_layer.h -%{_includedir}/hybris/media/media_compatibility_layer.h -%{_includedir}/hybris/media/media_format_layer.h -%{_includedir}/hybris/media/media_message_layer.h -%{_includedir}/hybris/media/media_meta_data_layer.h -%{_includedir}/hybris/media/media_recorder_layer.h -%{_includedir}/hybris/media/recorder_compatibility_layer.h -%{_includedir}/hybris/media/surface_texture_client_hybris.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 -
	Changed	_service ^
	Added	_service:tar_git:libhybris-0.0.5.18+n64.rpm.htclibc.20171003173936.26.ge551c7a.tar.bz2 ^
	Deleted	_service:tar_git:libhybris-0.0.5.18.5+minimalhooks.mido.20170718200454.1.g3da2dbd.tar.bz2 ^