|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon.spec
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -78,6 +78,7 @@
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
+Requires: droid-hal
%if 0%{?community_adaptation:1}
# because it provides one ssu feature, do:
Requires: community-adaptation
@@ -495,15 +496,18 @@
cp -rf %{dcd_path}/kickstart/* $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/
fi
-# if we are building on Mer OBS or locally, make a domain=sales .ks
-# so it works for HADK users:
-%define disturl_subst %(echo %{disturl} | grep jollamobile.com)
-%if "%{disturl_subst}" == ""
- echo "Setting domain to sales"
- %define ssu_override domain=sales
-%else
- echo "Setting domain to jolla"
- %define ssu_override domain=jolla
+# Do not set ssu_override if it is already defined
+%if 0%{!?ssu_override:1}
+ # if we are building on Mer OBS or locally, make a domain=sales .ks
+ # so it works for HADK users:
+ %define disturl_subst %(echo %{disturl} | grep jollamobile.com)
+ %if "%{disturl_subst}" == ""
+ echo "Setting domain to sales"
+ %define ssu_override domain=sales
+ %else
+ echo "Setting domain to jolla"
+ %define ssu_override domain=jolla
+ %endif
%endif
# build rnd kickstarts on devel level, release kickstarts on all other levels
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -75,5 +75,9 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
+# NFC for devices using Android 8 or newer as base
+#- nfcd-binder-plugin
+#- jolla-settings-system-nfc
+
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -23,7 +23,12 @@
.fail
-load-module module-droid-keepalive
+# Transitional check as keepalive module is moved away from droid modules.
+.ifexists module-keepalive.so
+ load-module module-keepalive
+.else
+ load-module module-droid-keepalive
+.endif
### If droid-card needs other arguments than the default, have the new
### load-module line in /etc/pulse/arm_droid_card_custom.pa
@@ -55,6 +60,9 @@
.include /etc/pulse/bluez5_stream_restore.pa
.else
.include /etc/pulse/bluez4_stream_restore.pa
+ # fake sco sink and source are needed only by bluez4 device
+ 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
.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -64,9 +72,8 @@
load-module module-augment-properties
load-module module-null-sink sink_name=sink.null rate=48000
+load-module module-null-source source_name=source.null rate=48000
-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-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement
@@ -126,4 +133,4 @@
### 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
+load-module module-rescue-streams sink_name=sink.null source_name=source.null
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/etc/pulse/x-maemo-route.table
^
|
| @@ -1,2 +1,3 @@
sink-input-by-media-role:x-maemo -25
sink-input-by-media-role:phone -15
+sink-input-by-media-role:voip -16
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/etc/pulse/x-maemo-stream-restore.table
^
|
| @@ -1,5 +1,6 @@
sink-input-by-media-role:x-maemo -20
sink-input-by-media-role:phone -15
+sink-input-by-media-role:voip -16
sink-input-by-media-role:animation -20
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -168,11 +168,11 @@
[group]
name = alien
-flags = route_audio, limit_volume, cork_stream
+flags = route_audio, limit_volume, mute_by_route
[group]
name = aliencall
-flags = route_audio, limit_volume, cork_stream
+flags = route_audio, limit_volume, mute_by_route
[group]
name = probesink
@@ -570,6 +570,11 @@
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"inactive"
[context-rule]
+variable = call
+value = equals:voip
+set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"voip"
+
+[context-rule]
variable = media_state
value = matches:"^[^t].*"
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.media.state", value@copy-from-context
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/etc/selinux/config
^
|
| @@ -0,0 +1 @@
+SELINUX=disabled
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/bta2dp
^
|
| @@ -1,3 +1,4 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
x-nemo.mainvolume.high-volume-step = "15"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/btmono
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-3625,4:-3025,5:-2425,6:-2025,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-250,14:-125,15:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/hp
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-6175,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/ihf
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-3800,2:-3187,3:-2648,4:-2158,5:-1716,6:-1324,7:-932,8:-612,9:-368,10:-122,11:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bacon-0.0.2+master.20191116081709.45.g2d3a013.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/lineout
^
|
| @@ -1,3 +1,4 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-5500,2:-5000,3:-4500,4:-4000,5:-3600,6:-3200,7:-2800,8:-2500,9:-2200,10:-1900,11:-1600,12:-1300,13:-1100,14:-950,15:-800,16:-600,17:-400,18:-200,19:0"
x-nemo.mainvolume.high-volume-step = "12"
|
