I have made the following changes intended for : CE:MW:Shared / policy-settings-basic-n900
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6054 Thank You, crevetor [This message was auto-generated] --- Request # 6054: Messages from BOSS: State: review at 2012-08-24T01:19:24 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:crevetor:branches:CE:MW:Shared / policy-settings-basic-n900 -> CE:MW:Shared / policy-settings-basic-n900 changes files: -------------- --- policy-settings-basic-n900.changes +++ policy-settings-basic-n900.changes @@ -0,0 +1,3 @@ +* Thu Aug 23 2012 Antoine Reversat <[email protected]> - 0.1.1 +- Port same patches as for N950 fixes NEMO#286 + new: ---- add-missing-accessory-incompatible.patch add-missing-resource_class_request-4.patch add-missing-snap_button-resource-class-mapping.patch spec files: ----------- --- policy-settings-basic-n900.spec +++ policy-settings-basic-n900.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.24 # + +Name: policy-settings-basic-n900 + # >> macros # << macros -Name: policy-settings-basic-n900 Summary: Precompiled basic MeeGo policy settings for the N900 Version: 0.1.1 Release: 0 @@ -14,6 +16,9 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.gz Source100: policy-settings-basic-n900.yaml +Patch0: add-missing-resource_class_request-4.patch +Patch1: add-missing-accessory-incompatible.patch +Patch2: add-missing-snap_button-resource-class-mapping.patch Requires: ohm Requires: ohm-plugins-misc Requires: ohm-plugin-resolver @@ -26,11 +31,9 @@ BuildRequires: prolog-resourcepolicy-extensions Provides: policy-settings - %description Precompiled basic MeeGo policy settings for the N900. - %package text Summary: Basic MeeGo policy settings sources for the N900 Group: System/Resource Policy @@ -49,6 +52,12 @@ %prep %setup -q -n maemo-multimedia-policy-settings-basic +# add-missing-resource_class_request-4.patch +%patch0 -p1 +# add-missing-accessory-incompatible.patch +%patch1 -p1 +# add-missing-snap_button-resource-class-mapping.patch +%patch2 -p1 # >> setup # << setup @@ -62,6 +71,7 @@ # >> build post make %{?jobs:-j%jobs} # << build post + %install rm -rf %{buildroot} # >> install pre @@ -72,13 +82,6 @@ # << install post - - - - - - - %files %defattr(-,root,root,-) # >> files @@ -94,7 +97,6 @@ %{_datadir}/policy/etc/basic/pulse # << files - %files text %defattr(-,root,root,-) # >> files text @@ -109,4 +111,3 @@ %{_datadir}/policy/etc/basic/ohm %{_datadir}/policy/etc/basic/pulse # << files text - other changes: -------------- ++++++ add-missing-accessory-incompatible.patch (new) --- add-missing-accessory-incompatible.patch +++ add-missing-accessory-incompatible.patch @@ -0,0 +1,88 @@ +From b8dce65d2b41cacb102bd2b9025dfceedf4af7cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <[email protected]> +Date: Thu, 16 Aug 2012 16:43:02 +0300 +Subject: [PATCH 2/2] Add missing accessory 'incompatible'. Fixes NEMO#332 + +--- + basic/policy/audio_route_rules.pl | 2 ++ + basic/policy/hwconfig.pl | 5 +++++ + basic/policy/policy.dres | 2 ++ + 3 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/basic/policy/audio_route_rules.pl b/basic/policy/audio_route_rules.pl +index 0c33638..b9744b8 100644 +--- a/basic/policy/audio_route_rules.pl ++++ b/basic/policy/audio_route_rules.pl +@@ -115,3 +115,5 @@ invalid_audio_device_choice(_, source, tvoutandbthsp) :- + + invalid_audio_device_choice(_, source, headset) :- + not(audio_route:get_route(sink, headset)). ++ ++invalid_audio_device_choice(_, _, incompatible). +diff --git a/basic/policy/hwconfig.pl b/basic/policy/hwconfig.pl +index 66fabca..1720ad2 100644 +--- a/basic/policy/hwconfig.pl ++++ b/basic/policy/hwconfig.pl +@@ -5,6 +5,7 @@ video_device(tvout). + audio_device_type(sink). + audio_device_type(source). + ++audio_device(incompatible). + audio_device(tvoutandbta2dp). + audio_device(tvoutandbthsp). + audio_device(ihfandbthsp). +@@ -26,6 +27,7 @@ audio_device(ihf). + audio_device(null). + + ++audio_device_type(sink , incompatible). + audio_device_type(sink , tvoutandbta2dp). + audio_device_type(sink , tvoutandbthsp). + audio_device_type(sink , ihfandbthsp). +@@ -49,6 +51,7 @@ audio_device_type(source, headset). + audio_device_type(source, headmike). + audio_device_type(source, microphone). + ++audio_device_privavy(private, incompatible). + audio_device_privacy(private, tvoutandbta2dp). + audio_device_privacy(private, tvoutandbthsp). + audio_device_privacy(private, ihfandbthsp). +@@ -69,6 +72,7 @@ audio_device_privacy(private, microphone). + audio_device_privacy(public , microphone). + audio_device_privacy(private, headmike). + ++accessory(incompatible). + accessory(bta2dp). + accessory(bthsp). + accessory(headset). +@@ -79,6 +83,7 @@ accessory(hac). + + video_accessory(tvout). + ++audio_accessory(incompatible). + audio_accessory(bta2dp). + audio_accessory(bthsp). + audio_accessory(headset). +diff --git a/basic/policy/policy.dres b/basic/policy/policy.dres +index e7e507d..02adeab 100644 +--- a/basic/policy/policy.dres ++++ b/basic/policy/policy.dres +@@ -57,6 +57,7 @@ $audio_device_accessible += { name: headphone , driver: 1, connected: 0 } + $audio_device_accessible += { name: headset , driver: 1, connected: 0 } + $audio_device_accessible += { name: bthsp , driver: 0, connected: 0 } + $audio_device_accessible += { name: bta2dp , driver: 0, connected: 0 } ++$audio_device_accessible += { name: incompatible , driver: 0, connected: 0 } + + $audio_device_selectable = { name: null , selectable: 1 } + $audio_device_selectable += { name: ihf , selectable: 1 } +@@ -77,6 +78,7 @@ $audio_device_selectable += { name: ihfandheadphone , selectable: 0 } + $audio_device_selectable += { name: ihfandbthsp , selectable: 0 } + $audio_device_selectable += { name: tvoutandbthsp , selectable: 0 } + $audio_device_selectable += { name: tvoutandbta2dp , selectable: 0 } ++$audio_device_selectable += { name: incompatible , selectable: 0 } + + + # audio modes for ECI detection +-- +1.7.0.4 + ++++++ add-missing-resource_class_request-4.patch (new) --- add-missing-resource_class_request-4.patch +++ add-missing-resource_class_request-4.patch @@ -0,0 +1,51 @@ +From 8a1b708321b1700ff2cae4ca61f9c4451b0e893e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <[email protected]> +Date: Thu, 16 Aug 2012 16:42:41 +0300 +Subject: [PATCH 1/2] Add missing resource_class_request/4. Fixes NEMO#257 + +--- + basic/policy/resource.pl | 22 ++++++++++++++++++++-- + 1 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/basic/policy/resource.pl b/basic/policy/resource.pl +index 53db90d..e2b57fd 100644 +--- a/basic/policy/resource.pl ++++ b/basic/policy/resource.pl +@@ -2,10 +2,10 @@ + [update_resource_entries/1, update_resource_owner_entries/1, + resource_owner/2, resource_owner/3, resource_group/2, + granted_resource/2, granted_resource/3, active_resource/3, +- force_resource_release/3]). ++ force_resource_release/3, resource_class_request/4]). + + rules([update_resource_entries/1, update_resource_owner_entries/1, +- force_resource_release/3]). ++ force_resource_release/3, resource_class_request/4]). + + + /* +@@ -447,3 +447,21 @@ active_resource(Class, Group, Resource) :- + GrantedBit is Granted /\ ResourceBit, + GrantedBit = ResourceBit, + !. ++ ++resource_bits([], A, A). ++resource_bits([A|C], B, E) :- ++ D is A\/B, ++ resource_bits(C, D, E). ++ ++resource_bits_list(C, D) :- ++ findall(A, ++ (resource_classes:resource_bit(B, A), ++ resource_classes:valid_resource_class(B, C)), ++ D). ++ ++resource_class_request(Class, M, O, Result) :- ++ resource_bits_list(Class, BitList), ++ resource_bits(BitList, 0, BitMask), ++ Mandatory is M/\BitMask, ++ Optional is O/\BitMask, ++ Result=[[resource, [mandatory, Mandatory], [optional, Optional]]]. +-- +1.7.0.4 + ++++++ add-missing-snap_button-resource-class-mapping.patch (new) --- add-missing-snap_button-resource-class-mapping.patch +++ add-missing-snap_button-resource-class-mapping.patch @@ -0,0 +1,32 @@ +From db27ba146e89a53818c78812a7fcc2f52e5ab5fe Mon Sep 17 00:00:00 2001 +From: Antoine Reversat <[email protected]> +Date: Tue, 21 Aug 2012 20:37:09 -0400 +Subject: [PATCH] Add missing snap_button resource/class mapping + +--- + basic/policy/resource_classes.pl | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/basic/policy/resource_classes.pl b/basic/policy/resource_classes.pl +index 9ec26fe..e0ed5ed 100644 +--- a/basic/policy/resource_classes.pl ++++ b/basic/policy/resource_classes.pl +@@ -235,3 +235,15 @@ valid_resource_class( headset_buttons , implicit ). + valid_resource_class( headset_buttons , event ). + valid_resource_class( headset_buttons , background ). + valid_resource_class( headset_buttons , nobody ). ++ ++valid_resource_class( snap_button , navigator ). ++valid_resource_class( snap_button , call ). ++valid_resource_class( snap_button , camera ). ++valid_resource_class( snap_button , ringtone ). ++valid_resource_class( snap_button , alarm ). ++valid_resource_class( snap_button , game ). ++valid_resource_class( snap_button , player ). ++valid_resource_class( snap_button , implicit ). ++valid_resource_class( snap_button , event ). ++valid_resource_class( snap_button , background ). ++valid_resource_class( snap_button , nobody ). +-- +1.7.9.5 + ++++++ policy-settings-basic-n900.yaml --- policy-settings-basic-n900.yaml +++ policy-settings-basic-n900.yaml @@ -8,6 +8,10 @@ - "%{name}-%{version}.tar.gz" Description: Precompiled basic MeeGo policy settings for the N900. +Patches: + - add-missing-resource_class_request-4.patch + - add-missing-accessory-incompatible.patch + - add-missing-snap_button-resource-class-mapping.patch Requires: - ohm - ohm-plugins-misc
