From 7fca0c8703f8efa08ced6115bf2dccb1f1221e7c Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Sat, 1 Nov 2014 20:49:43 +0100
Subject: [PATCH] Alternative environment variables for compositor

droid-hal configuration for hammerhead is broken and inverts Y.
As a workaround we provide our configuration.
---
 packaging/plasma-phone-components.spec   | 20 +++++++++++++++++++-
 packaging/plasma-phone-components.yaml   |  1 +
 services/plasma-phone-compositor.service |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packaging/plasma-phone-components.spec b/packaging/plasma-phone-components.spec
index 29ddda90..d5572308 100644
--- a/packaging/plasma-phone-components.spec
+++ b/packaging/plasma-phone-components.spec
@@ -67,7 +67,24 @@ rm -rf %{buildroot}
 
 # >> install post
 
-# File with environment variables, used by systemd units
+# File with environment variables, used by compositor systemd unit
+mkdir -p %{buildroot}%{_sharedstatedir}/environment/greenisland
+cat > %{buildroot}%{_sharedstatedir}/environment/greenisland/greenisland.conf <<EOF
+# From hammerhead configuration
+QT_QPA_PLATFORM=hwcomposer
+EGL_PLATFORM=hwcomposer
+QT_QPA_EGLFS_DEPTH=32
+QT_QPA_EGLFS_HIDECURSOR=1
+LIPSTICK_OPTIONS=-plugin evdevtouch:/dev/input/event1 -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap
+
+# This one was set to 1 in hammerhead configuration,
+# but it's just wrong
+QT_COMPOSITOR_NEGATE_INVERTED_Y=0
+
+KSCREEN_BACKEND=QScreen
+EOF
+
+# File with environment variables, used by shell systemd unit
 mkdir -p %{buildroot}%{_sharedstatedir}/environment/plasma-phone
 cat > %{buildroot}%{_sharedstatedir}/environment/plasma-phone/plasma-phone.conf <<EOF
 LIBEXEC_PATH="%{_libexecdir}:%{_libdir}/libexec:%{_kf5_libexecdir}"
@@ -115,6 +132,7 @@ done
 %{_kf5_sharedir}/plasma/*
 %{_kf5_sharedir}/wallpapers/*
 %{_kf5_servicesdir}/*.desktop
+%{_sharedstatedir}/environment/greenisland/*
 %{_sharedstatedir}/environment/plasma-phone/*
 %{_libdir}/systemd/user/*
 %{_libdir}/systemd/user/user-session.target.wants/*
diff --git a/packaging/plasma-phone-components.yaml b/packaging/plasma-phone-components.yaml
index 4e68ed4c..42617e1e 100644
--- a/packaging/plasma-phone-components.yaml
+++ b/packaging/plasma-phone-components.yaml
@@ -46,6 +46,7 @@ Files:
     - "%{_kf5_sharedir}/plasma/*"
     - "%{_kf5_sharedir}/wallpapers/*"
     - "%{_kf5_servicesdir}/*.desktop"
+    - "%{_sharedstatedir}/environment/greenisland/*"
     - "%{_sharedstatedir}/environment/plasma-phone/*"
     - "%{_libdir}/systemd/user/*"
     - "%{_libdir}/systemd/user/user-session.target.wants/*"
diff --git a/services/plasma-phone-compositor.service b/services/plasma-phone-compositor.service
index 6037244b..beee00a8 100644
--- a/services/plasma-phone-compositor.service
+++ b/services/plasma-phone-compositor.service
@@ -11,7 +11,7 @@ After=pre-user-session.target
 
 [Service]
 Type=notify
-EnvironmentFile=-/var/lib/environment/compositor/*.conf
+EnvironmentFile=-/var/lib/environment/greenisland/*.conf
 ExecStart=/usr/bin/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone
 Restart=always