|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/Litew/droid-config-armani.git</param>
<param name="branch">master</param>
- <param name="revision">6d994070ad123715b6d95188ccae37596a2d3b27</param>
+ <param name="revision">4c3af88643c03d6e4bb8da2dcda16d74b9f0b4d6</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/configs/droid.kmap
^
|
| @@ -1,12 +1,16 @@
keycode 100 = AltGr
-keycode 102 = Home
+keycode 353 = Select
keycode 114 = VolumeDown
keycode 115 = VolumeUp
+keycode 139 = MenuKB
+keycode 158 = Back
keycode 163 = MediaNext
keycode 164 = MediaTogglePlayPause
keycode 165 = MediaPrevious
keycode 166 = MediaStop
keycode 168 = AudioRewind
+keycode 169 = Call
+keycode 172 = HomePage
keycode 200 = MediaPlay
keycode 201 = MediaPause
keycode 208 = AudioForward
@@ -16,4 +20,5 @@
keycode 226 = ToggleCallHangup
# BTN_MISC
keycode 256 = ToggleCallHangup
-
+keycode 528 = CameraFocus
+keycode 766 = Camera
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -135,9 +135,9 @@
Requires: ohm-plugin-ruleengine
Requires: ohm-plugin-profile
Requires: ohm-plugin-route
-Requires: pulseaudio-modules-nemo-common >= 4.0.11
-Requires: pulseaudio-policy-enforcement >= 4.0.8
-Requires: policy-settings-common >= 0.2.7
+Requires: pulseaudio-modules-nemo-common >= 8.0.24
+Requires: pulseaudio-policy-enforcement >= 8.0.33
+Requires: policy-settings-common >= 0.7.3
Obsoletes: ohm-config <= 1.1.15
# ohm-configs-default should not be installed ever, thus no version
# specification defined here.
@@ -172,12 +172,12 @@
%package pulseaudio-settings
Summary: PulseAudio settings for %{rpm_device} hw
Provides: droid-config-pulseaudio-settings
-Requires: pulseaudio >= 4.0
-Requires: pulseaudio-modules-nemo-parameters >= 4.0.11
-Requires: pulseaudio-modules-nemo-stream-restore >= 4.0.11
-Requires: pulseaudio-modules-nemo-mainvolume >= 4.0.11
-Requires: pulseaudio-modules-droid >= 4.0.6
-Requires: pulseaudio-policy-enforcement >= 6.0.20
+Requires: pulseaudio >= 8.0
+Requires: pulseaudio-modules-nemo-parameters >= 8.0.24
+Requires: pulseaudio-modules-nemo-stream-restore >= 8.0.24
+Requires: pulseaudio-modules-nemo-mainvolume >= 8.0.24
+Requires: pulseaudio-modules-droid >= 8.0.63
+Requires: pulseaudio-policy-enforcement >= 8.0.33
Provides: pulseaudio-settings
%description pulseaudio-settings
@@ -423,13 +423,23 @@
sed --in-place 's|@PIXEL_RATIO@|%{pixel_ratio}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
+%define start_drag_distance %(awk 'BEGIN{print int(%{pixel_ratio}*20)}')
+sed --in-place 's|@START_DRAG_DISTANCE@|%{start_drag_distance}|' %{buildroot}/etc/xdg/QtProject/QPlatformTheme.conf
+
# icon_res can be only one of 1.0, 1.25, 1.5, 1.75 or 2.0 use pixel_ratio and pick closest one
%define icon_res %(awk 'BEGIN {a=int((%{pixel_ratio}-0.125)/0.25)*0.25+0.25;a=(a<=1?"1.0":(a>=2.0?"2.0":a));print a }')
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/usr/share/package-groups/*
+# In localbuilds it will break the system, because droid-hal-version-$DEVICE is
+# not built yet. Also it will pull many unnecessary things into the SDK target.
+%if 0%{?_obs_build_project:1}
sed --in-place 's|@DEVICE@|%{rpm_device}|' %{buildroot}/etc/zypp/systemCheck.d/*.check
+%else
+sed --in-place '/systemCheck.d/d' tmp/droid-config.files
+rm -f %{buildroot}/etc/zypp/systemCheck.d/*.check
+%endif
# SSU board mapping for hardware adaptation
%if 0%{!?provides_own_board_mapping:1}
@@ -441,11 +451,12 @@
-e "s|%VENDOR_PRETTY%|%{vendor_pretty}|g" \
-e "s|%ARCH%|%{_target_cpu}|g" \
droid-configs-device/ssu/board-mappings.d/05-sfe.ini.in >$RPM_BUILD_ROOT/%{board_mapping_file}
+%endif
%if 0%{?community_adaptation:1}
# Community ports have their adaptation repos on http://build.merproject.org
# Until we figure out how ssu works, we'll prevent the default adaptation0 from being created...
-sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_file}
+sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/*.ini
# ...and make a separate adaptation repo for community:
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
sed -e 's|@DEVICE@|%{rpm_device}|g' \
@@ -454,8 +465,6 @@
>$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
%endif
-%endif
-
# Copy kickstart packs (for %%{rpm_device}-kickstart-configuration)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}
DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris
@@ -541,8 +550,8 @@
################################################################
%post
# Force an update of ssu repositories
-touch %{board_mapping_dir}/*
-touch %{_datadir}/ssu/features.d/*
+touch %{board_mapping_dir}/* || :
+touch %{_datadir}/ssu/features.d/* || :
# To add additional post scripts, one can define those as part
# of additional_post_scripts macro.
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/kickstart/pack_package-droid-updater
^
|
| @@ -2,7 +2,7 @@
DEVICE=@DEVICE@
-VERSION_FILE=./sailfish-release
+VERSION_FILE=./os-release
source $VERSION_FILE
# Locate rootfs tar.bz2 archive.
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/kickstart/post_nochroot/hybris
^
|
| @@ -1 +1,8 @@
-cp $INSTALL_ROOT/etc/sailfish-release $IMG_OUT_DIR
+cp $INSTALL_ROOT/etc/os-release $IMG_OUT_DIR
+ls -l $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini &> /dev/null
+if [ "$?" == "0" ]; then
+ for CFILE in $(ls -1 $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini); do
+ CUSTOMER_TMP+=${CUSTOMER_TMP:+ }$(grep -i "^name[ ]*=" $CFILE | sed 's/^.*=[ \t]*//')
+ done
+ echo "SAILFISH_CUSTOMER=\""$(echo ${CUSTOMER_TMP} | sed 's![/ ()]\+!_!g')"\"" >> $IMG_OUT_DIR/os-release
+fi
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
| @@ -11,6 +11,7 @@
- openssh-server
- vim-enhanced
- zypper
+- strace
# jolla-rnd-device will enable usb-moded even when UI is not yet
# brought up (useful during development, available since update10)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
| @@ -2,10 +2,11 @@
Name: jolla-configuration-@DEVICE@
Requires:
- pattern:jolla-hw-adaptation-@DEVICE@
-- pattern:jolla-sailfish-applications
-- pattern:jolla-ui-wayland
+
+- patterns-sailfish-applications
+- patterns-sailfish-ui
# For devices with cellular modem. Those without one, please comment out:
-- pattern:jolla-sailfish-cellular-apps
+- patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
@@ -18,6 +19,10 @@
# 3rd party accounts like Twitter, VK, cloud services, etc
- jolla-settings-accounts-extensions-3rd-party-all
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+- patterns-sailfish-consumer-generic
+
# For Mozilla location services (online)
- geoclue-provider-mlsdb
@@ -25,5 +30,9 @@
# needs some configuration to get all features working
- csd
+# Devices with 2G or more memory should also include this booster
+# to improve camera startup times and the like
+#- mapplauncherd-booster-silica-qt5-media
+
Summary: Jolla Configuration @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -9,7 +9,7 @@
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
- droid-config-@DEVICE@-flashing
-- droid-config-@DEVICE@-bluez4
+- droid-config-@DEVICE@-bluez5
- droid-hal-version-@DEVICE@
# Hybris packages
@@ -21,8 +21,8 @@
- hybris-libsensorfw-qt5
# Vibra
-- ngfd-plugin-droid-vibrator
-- qt5-feedback-haptics-droid-vibrator
+- ngfd-plugin-native-vibrator
+- qt5-feedback-haptics-native-vibrator
# Needed for /dev/touchscreen symlink
- qt5-plugin-generic-evdev
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/lowi.conf
^
|
| +(symlink to /system/etc/lowi.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -30,12 +30,10 @@
### Automatically restore the volume of streams
# load configuration based on bluez version
-.ifexists /etc/pulse/bluez4_stream_restore.pa
-.include /etc/pulse/bluez4_stream_restore.pa
-.endif
-
.ifexists /etc/pulse/bluez5_stream_restore.pa
-.include /etc/pulse/bluez5_stream_restore.pa
+ .include /etc/pulse/bluez5_stream_restore.pa
+.else
+ .include /etc/pulse/bluez4_stream_restore.pa
.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -46,22 +44,28 @@
load-module module-null-sink sink_name=sink.null rate=48000
-load-module module-droid-card rate=48000 mute_routing_before=24576 mute_routing_after=4096
+### If droid-card needs other arguments than the default, have the new
+### load-module line in /etc/pulse/arm_droid_card_custom.pa
+.ifexists /etc/pulse/arm_droid_card_custom.pa
+ .include /etc/pulse/arm_droid_card_custom.pa
+.else
+ load-module module-droid-card rate=48000
+.endif
### Needed on many new devices. HADK guide explains how to implement this fully
.ifexists module-droid-glue.so
-load-module module-droid-glue
+ .nofail
+ load-module module-droid-glue
+ .fail
.endif
load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
-load-module module-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco
-
-load-module module-combine-sink sink_name=sink.primaryandbluez resample_method=trivial rate=48000 channels=2 ignore=sink.low_latency
+load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement
-load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
+load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB
### Load several protocols
.ifexists module-esound-protocol-unix.so
@@ -113,8 +117,7 @@
load-module module-dbus-protocol
.endif
+### Move orphan streams to placeholder sinks or sources so that playback doesn't get
+### interrupted. Policy enforcement module then moves the streams to new appropriate
+### sinks or sources.
load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
-
-### Make some devices default
-set-default-sink sink.primary
-set-default-source source.primary
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -1,3 +1,45 @@
+# -------- xpolicy.conf --------------------------------------------------------
+#
+# Files are read in following order,
+# 1) xpolicy.conf
+# 2) xpolicy.conf.d/*.conf, in descending order
+#
+# Variables can be defined anywhere, and they affect all the conf files. Variables
+# are updated if same variable is defined later on (for example variables in
+# xpolicy.conf.d/xvars.conf are applied most likely latest and are the active
+# ones). Variables can be used to replace any string configuration value
+# (NOT match types, etc.). For example following stream definition is valid:
+#
+# [stream]
+# property = $property_name@equals:$property_value
+# group = $group_name
+#
+# or for context definition following property action is valid:
+# set-property = sink-name@equals:$sink, property:$string, value@constant:$value
+#
+# Other sections than [variable] can also be defined in any conf file, and already
+# defined ones will be overridden by later definition.
+#
+
+
+# -------- Variable section ----------------------------------------------------
+
+# Defaults. To override define variables with new values
+# in xpolicy.conf.d directory (for example xpolicy.conf.d/xvars.conf).
+[variable]
+# sinks, sources and ports
+droid_source_input_microphone = input-builtin_mic
+droid_source_input_backmicrophone = input-back_mic
+droid_source_input_fmradio = input-fm_tuner
+droid_sink_port_change_delay = delayed_port_change
+delay_time = 150
+# cards and profiles
+droid_card = droid_card.primary
+droid_card_profile = default
+# bluetooth sco
+droid_sco_output = output-bluetooth_sco
+droid_sco_input = input-bluetooth_sco_headset
+
# -------- Group section -------------------------------------------------------
[group]
@@ -9,122 +51,102 @@
[group]
name = background
flags = limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
+sink = droid.output.media_latency@equals:"true"
+source = droid.input.builtin@equals:"true"
[group]
name = systemsound
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.media_latency@equals:"true"
[group]
name = btnotify
-flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = sink.primaryandbluez
-source = sink.null.monitor
+flags = set_sink, limit_volume, cork_stream, mute_by_route, dynamic_sink
+sink = startswith:"bluez_sink"
[group]
name = feedbacksound
-flags = route_audio, limit_volume, cork_stream, mute_by_route
-sink = sink.primary
-source = sink.null.monitor
+flags = set_sink, limit_volume, cork_stream, mute_by_route
+sink = droid.output.low_latency@equals:"true"
[group]
name = inputsound
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.low_latency@equals:"true"
[group]
name = event
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.media_latency@equals:"true"
[group]
name = alarm
-flags = set_sink, limit_volume, cork_stream
-sink = sink.primary
-source = sink.null.monitor
+flags = set_sink, limit_volume, mute_by_route, cork_stream, media_notify
+sink = droid.output.media_latency@equals:"true"
[group]
name = flash
flags = limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
[group]
name = player
flags = route_audio, limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
[group]
name = game
flags = route_audio, limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
[group]
name = voiceui
flags = set_sink, limit_volume, cork_stream
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.low_latency@equals:"true"
[group]
name = ringtone
-flags = limit_volume, mute_by_route, cork_stream, media_notify
-sink = sink.primary
-source = source.null.monitor
+flags = set_sink, limit_volume, mute_by_route, cork_stream, media_notify
+sink = droid.output.media_latency@equals:"true"
[group]
name = camera
flags = set_sink, set_source, limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
+sink = droid.output.media_latency@equals:"true"
+source = droid.input.builtin@equals:"true"
[group]
name = videoeditor
flags = route_audio, limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
[group]
name = ipcall
flags = set_sink, set_source, limit_volume, cork_stream
-sink = sink.primary
-source = source.primary
+sink = droid.output.low_latency@equals:"true"
+source = droid.input.builtin@equals:"true"
[group]
name = call
flags = set_sink, set_source
-sink = sink.primary
-source = source.primary
+sink = droid.output.low_latency@equals:"true"
+source = droid.input.builtin@equals:"true"
[group]
name = navigator
flags = set_sink, set_source
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.media_latency@equals:"true"
+source = droid.input.builtin@equals:"true"
[group]
name = cstone
flags = route_audio, set_source, limit_volume
-sink = sink.primary
-source = sink.null.monitor
[group]
name = alwayson
flags = set_sink, limit_volume, cork_stream
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.media_latency@equals:"true"
[group]
name = nonsilent
flags = set_sink, limit_volume, cork_stream
-sink = sink.primary
-source = sink.null.monitor
+sink = droid.output.media_latency@equals:"true"
[group]
name = internal
@@ -135,355 +157,259 @@
[group]
name = outgoing
flags = route_audio
-sink = sink.primary
-source = sink.null.monitor
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -0,0 +1,180 @@
+# -------- Card section ------------------------------------------------------
+
+[card]
+type = ihfandheadset
+name = equals:$droid_card
+profile = ringtone
+
+[card]
+type = ihfandheadphone
+name = equals:$droid_card
+profile = ringtone
+
+[card]
+type = headset
+name = equals:$droid_card
+profile = $droid_card_profile
+
+[card]
+type = headsetforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = headsetforalien
+name = equals:$droid_card
+profile = communication
+
+[card]
+type = headphone
+name = equals:$droid_card
+profile = $droid_card_profile
+
+[card]
+type = headphoneforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = headphoneforalien
+name = equals:$droid_card
+profile = communication
+
+[card]
+type = ihfandtvout
+name = equals:$droid_card
+profile = $droid_card_profile
+
+[card]
+type = earpiece
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = earpieceforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = earpieceforalien
+name = equals:$droid_card
+profile = communication
+
+[card]
+type = ihfforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = ihf
+name = equals:$droid_card
+profile = $droid_card_profile
+
+[card]
+type = ihfforalien
+name = equals:$droid_card
+profile = communication
+
+[card]
+type = bthsp
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:$droid_card
+profile1 = voicecall
+
+[card]
+type = bthspforcall
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:$droid_card
+profile1 = voicecall
+
+[card]
+type = bthspforalien
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:$droid_card
+profile1 = communication
+
+[card]
+type = bthfp
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:$droid_card
+profile1 = voicecall
+
+[card]
+type = bthfpforcall
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:$droid_card
+profile1 = voicecall
+
+[card]
+type = bthfpforalien
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:$droid_card
+profile1 = communication
+
+[card]
+type = tvoutandbta2dp
+name = startswith:"bluez_card"
+profile = a2dp
+flags = disable_notify
+
+[card]
+type = bta2dp
+name0 = startswith:"bluez_card"
+profile0 = a2dp
+name1 = equals:$droid_card
+profile1 = $droid_card_profile
+
+[card]
+type = bta2dpforalien
+name0 = startswith:"bluez_card"
+profile0 = a2dp
+name1 = equals:$droid_card
+profile1 = communication
+
+# -------- Context rule section ------------------------------------------------
+
+[context-rule]
+variable = bluetooth_override
+value = equals:active
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
+
+[context-rule]
+variable = bluetooth_override
+value = equals:inactive
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:inactive
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"false"
+
+[context-rule]
+variable = call
+value = equals:incoming
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:outgoing
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:inactive
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
+
+[context-rule]
+variable = call
+value = equals:incoming
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:outgoing
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -0,0 +1,191 @@
+# -------- Card section --------------------------------------------------------
+
+[card]
+type = tvoutandbta2dp
+name = startswith:"bluez_card"
+profile = a2dp
+flags = disable_notify
+
+[card]
+type = bta2dp
+name0 = startswith:"bluez_card"
+profile0 = a2dp_sink
+name1 = equals:$droid_card
+profile1 = $droid_card_profile
+flags1 = disable_notify
+
+[card]
+type = bta2dpforalien
+name0 = startswith:"bluez_card"
+profile0 = a2dp_sink
+name1 = equals:$droid_card
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = bthsp
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:$droid_card
+profile1 = $droid_card_profile
+flags1 = disable_notify
+
+[card]
+type = bthspforcall
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:$droid_card
+profile1 = voicecall
+flags1 = disable_notify
+
+[card]
+type = bthspforalien
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:$droid_card
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = bthfp
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:$droid_card
+profile1 = $droid_card_profile
+flags1 = disable_notify
+
+[card]
+type = bthfpforcall
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:$droid_card
+profile1 = voicecall
+flags1 = disable_notify
+
+[card]
+type = bthfpforalien
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:$droid_card
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = ihfandheadset
+name0 = equals:$droid_card
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfandheadphone
+name0 = equals:$droid_card
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headset
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headsetforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headsetforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphone
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphoneforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphoneforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfandtvout
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpiece
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihf
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -0,0 +1,35 @@
+# To enable PulseAudio fmradio device configuration make a symlink from
+# this file to fmradio.conf in sparse/etc/pulse/xpolicy.conf.d
+# If input fm port is different from default add
+# sparse/etc/pulse/xpolicy.conf.d/xvars.conf with input port name
+# used in your device.
+
+[device]
+type = headphoneasfmradio
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+flags = refresh_always
+
+[device]
+type = headphoneasfmradiolp
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20latency_msec=250%20reset_on_attach=true
+flags = refresh_always, module_unload_immediately
+
+[device]
+type = headsetasfmradio
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+flags = refresh_always
+
+[device]
+type = headsetasfmradiolp
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20latency_msec=250%20reset_on_attach=true
+flags = refresh_always, module_unload_immediately
+
+[stream]
+property = media.name@equals:"fmradio-loopback"
+group = player
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/usbaudio.conf.disabled
^
|
| @@ -0,0 +1,19 @@
+# To enable USB-OTG audio add a file
+# sparse/etc/udev/rules.d/99-pulseaudio-ignore-builtin-card.rules with contents
+#
+# KERNEL=="<CARD-HERE>", SUBSYSTEM=="sound", ATTR{id}=="<DEVICE-ID-HERE>", ENV{PULSE_IGNORE}="1"
+#
+# where you can determine <CARD-HERE> (usually card0) and <DEVICE-ID-HERE> with
+# $ udevadm info -a /dev/snd/by-path/*
+#
+# and in sparse/etc/pulse/xpolicy.conf.d make a symlink from this file to usbaudio.conf
+
+[device]
+type = usbaudio
+sink = startswith:"alsa_output."
+flags = refresh_always
+
+[device]
+type = usbmic
+source= startswith:"alsa_input."
+flags = refresh_always
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/etc/xdg/QtProject/QPlatformTheme.conf
^
|
| @@ -0,0 +1,2 @@
+[GenericUnixTheme]
+StartDragDistance=@START_DRAG_DISTANCE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
| @@ -13,7 +13,7 @@
Type=notify
NotifyAccess=all
ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
-ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh %c
Restart=always
# Lets make sure we don't block minutes in case of errors.
TimeoutSec=15
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
| @@ -60,7 +60,9 @@
WAIT=1
get_pids
MAX_WAIT=5
-while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do
+# -gt 1 because droid-hal-init is also in this cgroup
+while [ $NUM_PIDS -gt 1 -a $WAIT -lt $MAX_WAIT ]; do
+ let WAIT=$WAIT+1
if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then
# Number of running processes is getting smaller
# Wait a little bit more
@@ -69,13 +71,23 @@
# Number of pids is not gettting smaller
break
fi
- let WAIT=$WAIT+1
PREV_NUM_PIDS=$NUM_PIDS
get_pids
done
-echo All done. Killing droid-hal-init
+echo Killing droid-hal-init
killall droid-hal-init
+echo Killing processes hybris.shutdown missed
+get_pids
+if [ $NUM_PIDS -gt 0 ]; then
+ killall $PIDS
+ sleep 1
+ get_pids
+ if [ $NUM_PIDS -gt 0 ]; then
+ killall -s 9 $PIDS
+ fi
+fi
+
exit 0
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
| @@ -1,7 +1,14 @@
#!/bin/sh
cd /
touch /dev/.coldboot_done
-export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
+
+if [ "$(uname -m | grep -o 64)" == "64" ]; then
+ # for 64 bit use the default LD_LIBRARY_PATH, otherwise we get conflicts.
+ export LD_LIBRARY_PATH=
+else
+ # for 32 bit, this is safe
+ export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
+fi
# Save systemd notify socket name to let droid-init-done.sh pick it up later
echo $NOTIFY_SOCKET > /run/droid-hal/notify-socket-name
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/modes/usbaudio/mainvolume
^
|
| +(symlink to ../../algs/mainvolume/lineout)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/patterns/jolla-configuration-armani.yaml
^
|
| @@ -5,10 +5,11 @@
Name: jolla-configuration-armani
Requires:
- pattern:jolla-hw-adaptation-armani
-- pattern:jolla-sailfish-applications
-- pattern:jolla-ui-wayland
+
+- patterns-sailfish-applications
+- patterns-sailfish-ui
# For devices with cellular modem. Those without one, please comment out:
-- pattern:jolla-sailfish-cellular-apps
+- patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
@@ -21,6 +22,10 @@
# 3rd party accounts like Twitter, VK, cloud services, etc
- jolla-settings-accounts-extensions-3rd-party-all
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+- patterns-sailfish-consumer-generic
+
# For Mozilla location services (online)
- geoclue-provider-mlsdb
@@ -28,8 +33,9 @@
# needs some configuration to get all features working
- csd
-# Flashlight
-- jolla-settings-system-flashlight
+# Devices with 2G or more memory should also include this booster
+# to improve camera startup times and the like
+#- mapplauncherd-booster-silica-qt5-media
Summary: Jolla Configuration armani
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/patterns/jolla-hw-adaptation-armani.yaml
^
|
| @@ -13,7 +13,7 @@
- droid-config-armani-policy-settings
- droid-config-armani-preinit-plugin
- droid-config-armani-flashing
-- droid-config-armani-bluez4
+- droid-config-armani-bluez5
- droid-hal-version-armani
# Hybris packages
@@ -25,16 +25,14 @@
- hybris-libsensorfw-qt5
# Vibra
-#- ngfd-plugin-droid-vibrator
-#- qt5-feedback-haptics-droid-vibrator
-
-# Haptics/Vibra with ffmemless
-- qt5-feedback-haptics-ffmemless
+- ngfd-plugin-native-vibrator
+- qt5-feedback-haptics-native-vibrator
# Needed for /dev/touchscreen symlink
- qt5-plugin-generic-evdev
- pulseaudio-modules-droid
+- pulseaudio-modules-droid-glue
# for audio recording to work:
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
@@ -69,9 +67,6 @@
# android diag mode only usable for certain android tools
#- usb-moded-diag-mode-android
-# SD card mounting
-- sd-utils
-
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
@@ -81,12 +76,15 @@
# For GPS
- geoclue-provider-hybris
-# For audio in calls
-- pulseaudio-modules-droid-glue
-
# For FM radio on some QCOM devices
- qt5-qtmultimedia-plugin-mediaservice-irisradio
- jolla-mediaplayer-radio
+# SD card
+- sd-utils
+
+# Flashlight
+- jolla-settings-system-flashlight
+
Summary: Jolla HW Adaptation armani
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/sparse/etc/pulse/arm_msm8226_xiaomi-armani.pa
^
|
| @@ -30,12 +30,10 @@
### Automatically restore the volume of streams
# load configuration based on bluez version
-.ifexists /etc/pulse/bluez4_stream_restore.pa
-.include /etc/pulse/bluez4_stream_restore.pa
-.endif
-
.ifexists /etc/pulse/bluez5_stream_restore.pa
-.include /etc/pulse/bluez5_stream_restore.pa
+ .include /etc/pulse/bluez5_stream_restore.pa
+.else
+ .include /etc/pulse/bluez4_stream_restore.pa
.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -46,22 +44,28 @@
load-module module-null-sink sink_name=sink.null rate=48000
-load-module module-droid-card rate=48000 mute_routing_before=24576 mute_routing_after=4096
+### If droid-card needs other arguments than the default, have the new
+### load-module line in /etc/pulse/arm_droid_card_custom.pa
+.ifexists /etc/pulse/arm_droid_card_custom.pa
+ .include /etc/pulse/arm_droid_card_custom.pa
+.else
+ load-module module-droid-card rate=48000
+.endif
### Needed on many new devices. HADK guide explains how to implement this fully
.ifexists module-droid-glue.so
-load-module module-droid-glue
+ .nofail
+ load-module module-droid-glue
+ .fail
.endif
load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
-load-module module-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco
-
-load-module module-combine-sink sink_name=sink.primaryandbluez resample_method=trivial rate=48000 channels=2 ignore=sink.low_latency
+load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement
-load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
+load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB
### Load several protocols
.ifexists module-esound-protocol-unix.so
@@ -113,8 +117,8 @@
load-module module-dbus-protocol
.endif
+### Move orphan streams to placeholder sinks or sources so that playback doesn't get
+### interrupted. Policy enforcement module then moves the streams to new appropriate
+### sinks or sources.
load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
-### Make some devices default
-set-default-sink sink.primary
-set-default-source source.primary
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-armani-0.0.6.tar.bz2/sparse/var/lib/environment/compositor/droid-hal-device.conf
^
|
| @@ -1,5 +1,6 @@
# Config for xiaomi/armani
EGL_PLATFORM=hwcomposer
QT_QPA_PLATFORM=hwcomposer
+QPA_HWC_IDLE_TIME=5
# Determine which node is your touchscreen by checking /dev/input/event*
LIPSTICK_OPTIONS=-plugin evdevtouch:/dev/input/event0 -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap
|
