Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:nemo-configs-x86.changes
@@ -1,5 +1,12 @@ +* Mon Jul 29 2013 Robin Burchell <viroteck@viroteck.net> - 0.2.2 +- [configs] Added config files for x86-vm for Wayland (lipstick-qt5) +- [configs] added configs for VBoxTouch plugin +- [configs] add inverted-y env var for Wayland clients +- [packaging] added -common, -xorg, -wayland subpackages +- [packaging] -wayland package now requires qt5 vboxtouch plugin +- [prjconf] Add prefer mesa-x86-generic-libglapi + * Wed Jul 24 2013 Marko Saukko <marko.saukko@jollamobile.com> - 0.2.1 -- [prjconf] Add obs project configs. - [prjconf] Add prefer mesa-x86-generic-libglapi * Wed Jul 24 2013 Marko Saukko <marko.saukko@jollamobile.com> - 0.2
[-] [+]	Changed	_service:tar_git:nemo-configs-x86.spec ^
@@ -9,7 +9,7 @@ # << macros Summary: Some configs for x86-generic adaptation in Nemo Mobile -Version: 0.2.1 +Version: 0.2.2 Release: 1 Group: Configs License: GPLv2 @@ -22,13 +22,36 @@ %{summary}. -%package vm -Summary: Configs for x86 vm adaptation +%package vm-common +Summary: Common files shared by both Xorg and Wayland for x86 vm adaptation Group: Configs + +%description vm-common +%{summary}. + + +%package vm-xorg +Summary: Xorg Configs for x86 vm adaptation +Group: Configs +Requires: nemo-configs-x86-vm-common +Provides: nemo-configs-x86-vm > 0.2.1 Provides: nemo-mobile-configs-x86-vm > 2 +Conflicts: nemo-configs-x86-vm-wayland +Obsoletes: nemo-configs-x86-vm <= 0.2.1 Obsoletes: nemo-mobile-configs-x86-vm <= 2 -%description vm +%description vm-xorg +%{summary}. + + +%package vm-wayland +Summary: Wayland Configs for x86 vm adaptation +Group: Configs +Requires: nemo-configs-x86-vm-common +Requires: qt5-plugin-generic-vboxtouch +Conflicts: nemo-configs-x86-vm-xorg + +%description vm-wayland %{summary}. @@ -76,11 +99,22 @@ # << install post -%files vm +%files vm-common %defattr(-,root,root,-) %{_sharedstatedir}/environment/nemo/61-x86-vm.conf -# >> files vm -# << files vm +# >> files vm-common +# << files vm-common + +%files vm-xorg +%defattr(-,root,root,-) +# >> files vm-xorg +# << files vm-xorg + +%files vm-wayland +%defattr(-,root,root,-) +%{_sharedstatedir}/environment/compositor/61-x86-vm-ui.conf +# >> files vm-wayland +# << files vm-wayland %files generic %defattr(-,root,root,-)
[-] [+]	Changed	_service ^
@@ -3,6 +3,6 @@ <service name="tar_git"> <param name="url">https://github.com/nemomobile/nemo-configs-x86.git</param> <param name="branch">master</param> - <param name="revision">7d0ff5fe731c7304e5f19df1e01c2aa9e127f44b</param> + <param name="revision">89ae5d95899f5c1020dd697283c5efa1bc98038e</param> </service> </services>
[-] [+]	Deleted	_service:tar_git:nemo-configs-x86-0.2.1.tar.bz2/61-x86-vm.conf ^
@@ -1,6 +0,0 @@ -# Removing -nocursor to get cursor for vm's -OPTIONS=-background none - -# Clear the runtime system as the default "meego" set by -# nemo-mobile-session doesn't work on x86 properly -QT_DEFAULT_RUNTIME_SYSTEM=
[-] [+]	Changed	_service:tar_git:nemo-configs-x86-0.2.2.tar.bz2/Makefile ^
@@ -2,6 +2,7 @@ install: mkdir -p $(DESTDIR)/var/lib/environment/nemo/ - install -D -m 644 .conf $(DESTDIR)/var/lib/environment/nemo/ + mkdir -p $(DESTDIR)/var/lib/environment/compositor/ + install -D -m 644 conf/.conf $(DESTDIR)/var/lib/environment/nemo/ + install -D -m 644 conf/compositor/*.conf $(DESTDIR)/var/lib/environment/compositor/ install -D -m 644 prjconf/x86-prjconf.xml $(DESTDIR)/usr/share/prjconf/x86-prjconf.xml -
[-] [+]	Changed	_service:tar_git:nemo-configs-x86-0.2.2.tar.bz2/conf/61-x86-generic.conf ^
(renamed from 61-x86-generic.conf)
[-] [+]	Added	_service:tar_git:nemo-configs-x86-0.2.2.tar.bz2/conf/61-x86-vm.conf ^
@@ -0,0 +1,9 @@ +# Removing -nocursor to get cursor for vm's +OPTIONS=-background none + +# Clear the runtime system as the default "meego" set by +# nemo-mobile-session doesn't work on x86 properly +QT_DEFAULT_RUNTIME_SYSTEM= + +# We need inverted-Y for Qt5 apps runing on Wayland platform +QT_COMPOSITOR_NEGATE_INVERTED_Y=1
[-] [+]	Added	_service:tar_git:nemo-configs-x86-0.2.2.tar.bz2/conf/compositor/61-x86-vm-ui.conf ^
@@ -0,0 +1,5 @@ +EGL_DRIVER=egl_gallium +EGL_PLATFORM=fbdev +QT_QPA_EGLFS_DEPTH=32 +QT_QPA_EGLFS_HIDECURSOR=1 +LIPSTICK_OPTIONS=-platform eglfs -plugin VBoxTouch
[-] [+]	Changed	_service:tar_git:nemo-configs-x86.yaml ^
@@ -16,17 +16,46 @@ URL: https://github.com/nemomobile/nemo-configs-x86 SubPackages: - - Name: vm + - Name: vm-common Group: Configs - Summary: Configs for x86 vm adaptation + Summary: Common files shared by both Xorg and Wayland for x86 vm adaptation Description: \| %{summary}. - Obsoletes: - - nemo-mobile-configs-x86-vm <= 2 + Files: + - "%{_sharedstatedir}/environment/nemo/61-x86-vm.conf" + + - Name: vm-xorg + Group: Configs + Summary: Xorg Configs for x86 vm adaptation + Description: \| + %{summary}. + Requires: + - nemo-configs-x86-vm-common Provides: + # make images using old packages names (i.e. x11 images) upgrade to -xorg package + - nemo-configs-x86-vm > 0.2.1 - nemo-mobile-configs-x86-vm > 2 + Obsoletes: + - nemo-configs-x86-vm <= 0.2.1 + - nemo-mobile-configs-x86-vm <= 2 + Conflicts: + - nemo-configs-x86-vm-wayland Files: - - "%{_sharedstatedir}/environment/nemo/61-x86-vm.conf" + # Currently empty package, it's more consistent to have -xorg package as well, even if currently empty + - "" + + - Name: vm-wayland + Group: Configs + Summary: Wayland Configs for x86 vm adaptation + Description: \| + %{summary}. + Requires: + - nemo-configs-x86-vm-common + - qt5-plugin-generic-vboxtouch + Conflicts: + - nemo-configs-x86-vm-xorg + Files: + - "%{_sharedstatedir}/environment/compositor/61-x86-vm-ui.conf" - Name: generic Group: Configs