matrix: sync with arago

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

1 files changed, 11 insertions, 6 deletions

diff --git a/recipes-ti/matrix/matrix-gui_2.0.bb b/recipes-ti/matrix/matrix-gui_2.0.bb
index 60b1a040..a0965d57 100644
--- a/recipes-ti/matrix/matrix-gui_2.0.bb
+++ b/recipes-ti/matrix/matrix-gui_2.0.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://scripts/jquery-1.6.2.min.js;md5=a1a8cb16a060f6280a767
 
 SECTION = "multimedia"
 
-PR = "r2"
+PR = "r3"
 
 inherit allarch
 
 BRANCH ?= "master"
-SRCREV = "9f5d27fec216f223c43b48fa146edf4a4bb7aa24"
+SRCREV = "8e2bd5ffdded23bb662476fcd2490fa1526801f8"
 
 SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH} \
            file://matrix-gui.service"
@@ -22,10 +22,14 @@ S = "${WORKDIR}/git"
 
 do_install(){
         install -d ${D}${MATRIX_BASE_DIR}
-        cp -rf ${S}/* ${D}${MATRIX_BASE_DIR}
+        install -d ${D}${MATRIX_WEB_DIR}
+        cp -rf ${S}/* ${D}${MATRIX_WEB_DIR}
+
+    # Install our php.ini file
+    install -m 0644 ${WORKDIR}/php.ini ${D}${MATRIX_BASE_DIR}/
 
     # Set the proper path in the init script
-    sed -i -e s=__MATRIX_BASE_DIR__=${MATRIX_BASE_DIR}=g ${WORKDIR}/matrix-gui.service
+    sed -i -e s=__MATRIX_WEB_DIR__=${MATRIX_WEB_DIR}=g ${WORKDIR}/matrix-gui.service
 
         install -d ${D}${base_libdir}/systemd/system/
     install -m 0755 ${WORKDIR}/matrix-gui.service ${D}${base_libdir}/systemd/system/
@@ -35,5 +39,6 @@ do_install(){
         ln -sf ../matrix-gui.service ${D}${base_libdir}/systemd/system/multi-user.target.wants/
 }
 
-RDEPENDS_${PN} += "nodejs"
-FILES_${PN} += "${MATRIX_BASE_DIR}/* ${base_libdir}/systemd/system"
+RDEPENDS_${PN} += "lighttpd lighttpd-module-cgi lighttpd-module-compress lighttpd-module-expire php php-cgi php-cli matrix-gui-browser"
+
+FILES_${PN} += "${MATRIX_BASE_DIR}/*"