[meego-commits] 8636: Changes to MeeGo:1.1:Core/nokia-n900-configs

[Rolla Selbak]

Hi,
I have made the following changes to nokia-n900-configs in project MeeGo:1.1:Core. Please review and accept ASAP.

Thank You,
Rolla Selbak

[This message was auto-generated]

---

Request #8636:

  submit:   MeeGo:1.1:Core:Testing/nokia-n900-configs(r8) -> MeeGo:1.1:Core/nokia-n900-configs


Message:
    Add volume key workaround for N900, fixing BMC#7731 approved release blocker. Thanks to Tom Swindell for implementing this. (forwarded request 8634 from cvm)

State:   new          2010-10-19T08:41:33 rolla
Comment: None



changes files:
--------------
--- nokia-n900-configs.changes
+++ nokia-n900-configs.changes
@@ -0,0 +1,11 @@
+* Tue Oct 19 2010 Carsten Munk <carsten at maemo.org> - 0.6.5.5
+- Add volume control using xbindkeys (hack for 1.1 only), by Tom Swindell/alterego, BMC#7731
+
+* Mon Oct 18 2010 Carsten Munk <carsten at maemo.org> - 0.6.5.4
+- Set btrfs readahead_kb to 128kb on boot, updated after advice by Auke Kok. Updates BMC#8582 fix.
+
+* Sun Oct 17 2010 Carsten Munk <carsten at maemo.org> - 0.6.5.3
+- Set btrfs readahead_kb to 0kb on boot. 4mb is way too tough for N900 MMC + CPU. 
+  This fixes serious performance problems in Fennec-qt for N900, BMC#8582
+  Thanks to stephg for figuring out the problem.
+

new:
----
  n900-volumecontrol.sh
  n900-xbindkeys.rc
  nokia-n900-volumecontrol.desktop

spec files:
-----------
--- nokia-n900-configs.spec
+++ nokia-n900-configs.spec
@@ -1,5 +1,5 @@
 Name:       nokia-n900-configs
-Version:    0.6.5.2
+Version:    0.6.5.5
 Release:    0
 Summary:    Provides configs for Nokia N900
 License:    GPLv2
@@ -27,6 +27,10 @@
 Source19:   nokia-n900-force-backlight.desktop
 Source20:   n900-setbacklight.sh
 
+Source21:   n900-volumecontrol.sh
+Source22:   nokia-n900-volumecontrol.desktop
+Source23:   n900-xbindkeys.rc
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 ExclusiveArch: %{arm}
 
@@ -45,6 +49,9 @@
 # This makes pulseaudio start with x11
 Requires: pulseaudio-module-x11
 
+# Volume control
+Requires: xbindkeys
+
 %description
 Provides configs for Nokia N900 device.
 
@@ -64,8 +71,11 @@
 
 install -d $RPM_BUILD_ROOT/etc/skel/.pulse
 install -m 644 %{SOURCE5}  $RPM_BUILD_ROOT/etc/skel/.pulse/default.pa
+
 install -d $RPM_BUILD_ROOT/etc/
 install -m 644 %{SOURCE6}  $RPM_BUILD_ROOT/etc/asound_n900.state
+install -m 644 %{SOURCE23} $RPM_BUILD_ROOT/etc/n900-xbindkeys.rc
+
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/
 install -m 755 %{SOURCE7}  $RPM_BUILD_ROOT/etc/rc.d/init.d/n900-alsamixer-settings
 install -d $RPM_BUILD_ROOT/usr/bin
@@ -85,6 +95,10 @@
 install -m 644 %{SOURCE19} $RPM_BUILD_ROOT/etc/xdg/autostart/n900-force-backlight.desktop
 install -m 755 %{SOURCE20} $RPM_BUILD_ROOT/usr/bin/n900-setbacklight.sh
 
+install -m 755 %{SOURCE21} $RPM_BUILD_ROOT/usr/bin/n900-volumecontrol.sh
+install -m 644 %{SOURCE22} $RPM_BUILD_ROOT/etc/xdg/autostart/nokia-n900-volumecontrol.desktop
+install -m 644 %{SOURCE23} $RPM_BUILD_ROOT/etc/n900-xbindkeys.rc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,6 +118,7 @@
 %defattr(644,root,root,-)
 %config /etc/X11/xorg.conf.d/90-input-n900.conf
 %config /etc/xdg/autostart/n900-keypad.desktop
+%config /etc/xdg/autostart/nokia-n900-volumecontrol.desktop
 /lib/kbd/keymaps/arm/qwerty/nokia-n900.map
 %attr(755,root,root) /etc/rc.d/init.d/nokia-n900-keys
 %attr(755,root,root) /etc/rc.d/init.d/nokia-n900-cmt-gpio
@@ -111,6 +126,7 @@
 %defattr(644,root,root,-)
 %config /etc/skel/.pulse/default.pa
 %config /etc/asound_n900.state
+%config /etc/n900-xbindkeys.rc
 
 %defattr(755,root,root,-)
 /etc/rc.d/init.d/n900-alsamixer-settings
@@ -125,6 +141,7 @@
 /usr/bin/n900-alsamixer-set-fmrx_bypass.sh
 /usr/bin/n900-alsamixer-set-fmtx.sh
 /usr/bin/n900-setbacklight.sh
+/usr/bin/n900-volumecontrol.sh
 
 %attr(644,root,root)
 %config /etc/xdg/autostart/n900-force-backlight.desktop

other changes:
--------------

++++++ n900-volumecontrol.sh (new)
--- n900-volumecontrol.sh
+++ n900-volumecontrol.sh
+#!/bin/sh
+
+MAX_VOLUME=$((0x10000))
+CUR_VOLUME=$(pacmd dump | grep 'set-sink-volume' | head -n $(($1 + 1)) | tail -n 1 | cut -f 3 -d ' ')
+
+if [ $(($CUR_VOLUME + $2)) -le $MAX_VOLUME ] && [ $(($CUR_VOLUME + $2)) -ge 0 ]; then
+  pactl set-sink-volume $1 $(printf '0x%x' $(($CUR_VOLUME + $2)))
+fi

++++++ n900-xbindkeys.rc (new)
--- n900-xbindkeys.rc
+++ n900-xbindkeys.rc
+"flock -n /var/lock/n900-volumecontrol.lock -c '/usr/bin/n900-volumecontrol.sh 0 -0xf00'"
+F7
+
+"flock -n /var/lock/n900-volumecontrol.lock -c '/usr/bin/n900-volumecontrol.sh 0 +0xf00'"
+F8

++++++ nokia-n900-keys.init
--- nokia-n900-keys.init
+++ nokia-n900-keys.init
@@ -9,6 +9,8 @@
 
 case "$1" in
   start)
+        echo "Setting btrfs readahead to 128kb, better on N900 MMC (BMC#8582)"
+        echo 128 > /sys/class/bdi/btrfs-1/read_ahead_kb
         echo "Loading N900 keymap"
         exec /bin/loadkeys /lib/kbd/keymaps/arm/qwerty/nokia-n900.map
         ;;

++++++ nokia-n900-volumecontrol.desktop (new)
--- nokia-n900-volumecontrol.desktop
+++ nokia-n900-volumecontrol.desktop
+[Desktop Entry]
+Name=N900 volume control hack
+Exec=/usr/bin/xbindkeys -f /etc/n900-xbindkeys.rc
+Terminal=False
+Type=Application