Changes - SailfishOS Open Build Service

Changes of Revision 31

[-] [+]	Changed	_service:tar_git:libhybris.spec
@@ -1,9 +1,7 @@ Name: libhybris -Version: 0.0.5.32+buffer_integration.20210310144149.10.gaf70c6b +Version: 0.0.5.32+test_common.20210309164734.25.g3b02453 Release: 1%{?dist} Summary: Utilize Bionic-based HW adaptations on glibc systems - -Group: System/Libraries License: ASL 2.0 URL: https://github.com/libhybris/libhybris Source: %{name}-%{version}.tar.bz2 @@ -31,6 +29,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Provides: libEGL +Conflicts: mesa-llvmpipe-libEGL %description libEGL %{summary}. @@ -42,6 +41,7 @@ Requires: %{name}-devel = %{version}-%{release} Requires: pkgconfig(android-headers) Provides: libEGL-devel +Conflicts: mesa-llvmpipe-libEGL-devel %description libEGL-devel %{summary}. @@ -52,6 +52,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Provides: libGLESv1 +Conflicts: mesa-llvmpipe-libGLESv1 %description libGLESv1 %{summary}. @@ -62,6 +63,7 @@ Requires: %{name}-libGLESv1 = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Provides: libGLESv1-devel +Conflicts: mesa-llvmpipe-libGLESv1-devel %description libGLESv1-devel %{summary}. @@ -72,6 +74,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Provides: libGLESv2 +Conflicts: mesa-llvmpipe-libGLESv2 %description libGLESv2 %{summary}. @@ -82,6 +85,7 @@ Requires: %{name}-libGLESv2 = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Provides: libGLESv2-devel +Conflicts: mesa-llvmpipe-libGLESv2-devel %description libGLESv2-devel %{summary}. @@ -269,30 +273,23 @@ %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} %description doc %{summary}. %prep -%setup -q -n %{name}-%{version}/%{name} +%autosetup -n %{name}-%{version}/%{name} %build cd hybris -autoreconf -v -f -i -%configure \ +%reconfigure \ --enable-wayland \ %{?qa_stage_devel:--enable-debug} \ %{?qa_stage_devel:--enable-trace} \ -%ifarch %{arm} +%ifnarch %{ix86} %{?qa_stage_devel:--enable-arm-tracing} \ %endif -%if 0%{?android_headers:1} - --with-android-headers=%{android_headers} \ -%else - --with-android-headers=%{_libdir}/droid-devel/droid-headers \ -%endif --enable-property-cache \ %ifarch %{arm} --enable-arch=arm \ @@ -308,15 +305,14 @@ %endif --enable-silent-rules -make +%make_build %install -rm -rf $RPM_BUILD_ROOT cd hybris make install DESTDIR=$RPM_BUILD_ROOT # Remove the static libraries. -rm %{buildroot}/%{_libdir}/.la %{buildroot}/%{_libdir}/libhybris/.la +rm -f %{buildroot}/%{_libdir}/.la %{buildroot}/%{_libdir}/libhybris/.la mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} install -m0644 AUTHORS %{buildroot}%{_docdir}/%{name}-%{version} @@ -498,7 +494,7 @@ %{_libdir}/pkgconfig/libvibrator.pc %files libsf -%defattr(-,root,root-) +%defattr(-,root,root,-) %{_libdir}/libsf.so.* %files libsf-devel @@ -509,6 +505,7 @@ %files tests %defattr(-,root,root,-) %{_bindir}/test_audio +%{_bindir}/test_dlopen %{_bindir}/test_egl %{_bindir}/test_egl_configs %{_bindir}/test_glesv2
[-] [+]	Changed	_service ^
@@ -1,7 +1,7 @@ <services> <service name="tar_git"> <param name="url">https://github.com/elros34/libhybris.git</param> - <param name="branch">buffer_integration</param> + <param name="branch">test_common</param> <param name="revision">HEAD</param> <param name="token"></param> <param name="debian"></param>
	Deleted	_service:tar_git:libhybris-0.0.5.32+buffer_integration.20210310144149.10.gaf70c6b.tar.bz2 ^
	Added	_service:tar_git:libhybris-0.0.5.32+test_common.20210309164734.25.g3b02453.tar.bz2 ^