@@ -21,18 +21,6 @@ LAYERDEPENDS_meta-arago-demos = " \
qt5-layer \
"
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
- matrix-gui-multimedia-demos->amsdk-av-files \
- matrix-gui-oprofile-demos->oprofile \
- matrix-gui-oprofile-demos->oprofile-example \
- matrix-gui-usb-demos->bonnie++ \
- matrix-gui-armbenchmarks-demos->arm-benchmarks \
- matrix-gui-armbenchmarks-demos->lmbench \
- matrix-gui-armbenchmarks-demos->nbench-byte \
- matrix-gui-machinevision-demos->point-cloud-viewer \
- matrix-lighttpd-config->lighttpd \
-"
-
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
gstreamer1.0-plugins-bad \
"
deleted file mode 100644
@@ -1,31 +0,0 @@
-DESCRIPTION = "Image Gallery"
-HOMEPAGE = "https://gitorious.org/image-gallery"
-SECTION = "multimedia"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9c57cc1cdee589f97cbba69e95a89a15"
-
-require recipes-core/matrix/matrix-gui-paths.inc
-
-inherit qt5
-
-PR = "r5"
-
-BRANCH = "master"
-SRCREV = "d9a2f2e27f59f3bbcde91efc6afba8cd04f3b4be"
-
-SRC_URI = "git://git.ti.com/git/matrix-gui-v2/image-gallery.git;protocol=https;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 0755 ${B}/image-gallery ${D}/${bindir}/image-gallery
- install -d ${D}${MATRIX_APP_DIR}/qt-image-gallery
- cp -rf ${S}/matrix-files/* ${D}${MATRIX_APP_DIR}/qt-image-gallery
-}
-
-PACKAGES += "matrix-gui-apps-image-gallery"
-
-RDEPENDS:matrix-gui-apps-image-gallery = "matrix-gui-apps-images matrix-gui-submenus-camera ${PN}"
-
-FILES:matrix-gui-apps-image-gallery += "${MATRIX_APP_DIR}/*"
deleted file mode 100644
@@ -1,232 +0,0 @@
-From 90f70d188b5893fd86aab4f90ac96c9a69ae4e88 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Mon, 14 Oct 2013 18:35:30 -0400
-Subject: [PATCH] Replace QtGui with QtWidgets per Qt5 migration guide
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- awayscreen.h | 2 +-
- keyboard/keyboard.cpp | 2 +-
- keyboard/keyboard.h | 2 +-
- main.cpp | 2 +-
- mainwindow.cpp | 2 +-
- mainwindow.h | 2 +-
- optionswidget.h | 2 +-
- schedulepoint.cpp | 2 +-
- schedulepoint.h | 2 +-
- schedulescreen.h | 2 +-
- settingscreen.cpp | 2 +-
- settingscreen.h | 2 +-
- thermostatdemo.h | 2 +-
- thermostatwidget.h | 2 +-
- weatherdatawidget.cpp | 2 +-
- weatherwidget.h | 2 +-
- 16 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/awayscreen.h b/awayscreen.h
-index 2a2b040..b8827b9 100644
---- a/awayscreen.h
-+++ b/awayscreen.h
-@@ -1,7 +1,7 @@
- #ifndef AWAYSCREEN_H
- #define AWAYSCREEN_H
-
--#include <QtGui>
-+#include <QtWidgets>
-
- class GlobalSettings;
-
-diff --git a/keyboard/keyboard.cpp b/keyboard/keyboard.cpp
-index 9261031..0d14530 100644
---- a/keyboard/keyboard.cpp
-+++ b/keyboard/keyboard.cpp
-@@ -37,7 +37,7 @@
-
- #include "keyboard.h"
- #include "ui_keyboard.h"
--#include <QtGui>
-+#include <QtWidgets>
-
- Keyboard::Keyboard(QWidget *parent) :
- QWidget(parent),
-diff --git a/keyboard/keyboard.h b/keyboard/keyboard.h
-index 2d5c584..960915c 100644
---- a/keyboard/keyboard.h
-+++ b/keyboard/keyboard.h
-@@ -2,7 +2,7 @@
- #define KEYBOARD_H
-
- #include <QWidget>
--#include <QtGui>
-+#include <QtWidgets>
- namespace Ui {
- class Keyboard;
- }
-diff --git a/main.cpp b/main.cpp
-index 18234c9..8e0df39 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -1,4 +1,4 @@
--#include <QtGui>
-+#include <QtWidgets>
-
- #include "mainwindow.h"
- #include "weatherwidget.h"
-diff --git a/mainwindow.cpp b/mainwindow.cpp
-index b3f8994..d8a0a57 100644
---- a/mainwindow.cpp
-+++ b/mainwindow.cpp
-@@ -9,7 +9,7 @@
- #include "weatherdata.h"
- #include "utilities.h"
-
--#include <QtGui>
-+#include <QtWidgets>
-
- #include <QtDebug>
-
-diff --git a/mainwindow.h b/mainwindow.h
-index f59d992..1d46fba 100644
---- a/mainwindow.h
-+++ b/mainwindow.h
-@@ -1,7 +1,7 @@
- #ifndef MAINWINDOW_H
- #define MAINWINDOW_H
-
--#include <QtGui>
-+#include <QtWidgets>
- #include "webdata.h"
-
-
-diff --git a/optionswidget.h b/optionswidget.h
-index b321280..c797ac2 100644
---- a/optionswidget.h
-+++ b/optionswidget.h
-@@ -1,7 +1,7 @@
- #ifndef OPTIONSWIDGET_H
- #define OPTIONSWIDGET_H
-
--#include <QtGui>
-+#include <QtWidgets>
- #include "awayscreen.h"
- #include "schedulescreen.h"
- #include "settingscreen.h"
-diff --git a/schedulepoint.cpp b/schedulepoint.cpp
-index cdaba40..99c7b18 100644
---- a/schedulepoint.cpp
-+++ b/schedulepoint.cpp
-@@ -4,7 +4,7 @@
- #include "globalsettings.h"
- #include "utilities.h"
-
--#include <QtGui>
-+#include <QtWidgets>
-
-
- #define MAXTEMP 100
-diff --git a/schedulepoint.h b/schedulepoint.h
-index 1f6d662..38d6acd 100644
---- a/schedulepoint.h
-+++ b/schedulepoint.h
-@@ -1,7 +1,7 @@
- #ifndef SCHEDULEPOINT_H
- #define SCHEDULEPOINT_H
-
--#include <QtGui>
-+#include <QtWidgets>
- #include <QApplication>
- #include <QColor>
- #include <QGraphicsItem>
-diff --git a/schedulescreen.h b/schedulescreen.h
-index 9bc0897..c424a3f 100644
---- a/schedulescreen.h
-+++ b/schedulescreen.h
-@@ -1,7 +1,7 @@
- #ifndef SCHEDULESCREEN_H
- #define SCHEDULESCREEN_H
-
--#include <QtGui>
-+#include <QtWidgets>
- #include "schedulepoint.h"
-
- class GlobalSettings;
-diff --git a/settingscreen.cpp b/settingscreen.cpp
-index 2f19ae4..62b73b1 100644
---- a/settingscreen.cpp
-+++ b/settingscreen.cpp
-@@ -4,7 +4,7 @@
- #include "qkeyboardlineedit.h"
- #include "webdataengine/openweathermapdataengine.h"
-
--#include <QtGui>
-+#include <QtWidgets>
-
- #define MAXIMUM_CONTENT_HEIGHT 450
- #define MAXIMUM_CONTENT_WIDTH 800
-diff --git a/settingscreen.h b/settingscreen.h
-index 4edf175..172dbe2 100644
---- a/settingscreen.h
-+++ b/settingscreen.h
-@@ -1,7 +1,7 @@
- #ifndef SETTINGSCREEN_H
- #define SETTINGSCREEN_H
-
--#include <QtGui>
-+#include <QtWidgets>
-
- class GlobalSettings;
- class QKeyboardLineEdit;
-diff --git a/thermostatdemo.h b/thermostatdemo.h
-index 7223f0a..ca7b27e 100644
---- a/thermostatdemo.h
-+++ b/thermostatdemo.h
-@@ -1,7 +1,7 @@
- #ifndef THERMOSTATDEMO_H
- #define THERMOSTATDEMO_H
-
--#include <QtGui/QMainWindow>
-+#include <QtWidgets/QMainWindow>
-
- class ThermostatDemo : public QMainWindow
- {
-diff --git a/thermostatwidget.h b/thermostatwidget.h
-index ba8199b..bbe97ef 100644
---- a/thermostatwidget.h
-+++ b/thermostatwidget.h
-@@ -1,7 +1,7 @@
- #ifndef THERMOSTATWIDGET_H
- #define THERMOSTATWIDGET_H
-
--#include <QtGui>
-+#include <QtWidgets>
-
- class GlobalSettings;
-
-diff --git a/weatherdatawidget.cpp b/weatherdatawidget.cpp
-index 33e8185..20e8fe8 100644
---- a/weatherdatawidget.cpp
-+++ b/weatherdatawidget.cpp
-@@ -1,6 +1,6 @@
- #include "weatherdatawidget.h"
-
--#include <QtGui>
-+#include <QtWidgets>
- #include "globalsettings.h"
- #include "weatherdata.h"
- #include "utilities.h"
-diff --git a/weatherwidget.h b/weatherwidget.h
-index bffb368..40a7916 100644
---- a/weatherwidget.h
-+++ b/weatherwidget.h
-@@ -1,7 +1,7 @@
- #ifndef WEATHERWIDGET_H
- #define WEATHERWIDGET_H
-
--#include <QtGui>
-+#include <QtWidgets>
-
- #include <QtSvg/QSvgWidget>
-
-1.8.3.2
-
deleted file mode 100644
@@ -1,71 +0,0 @@
-From 3be273cead085ac9cf45bc59236f6d6ef18dc349 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Mon, 14 Oct 2013 18:39:27 -0400
-Subject: [PATCH] Replace fromAscii()/toAscii() with fromLatin1()/toLatin1()
- per Qt5 migration guide
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- remoteaccessmanager.cpp | 10 +++++-----
- webdataengine/openweathermapdataengine.cpp | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/remoteaccessmanager.cpp b/remoteaccessmanager.cpp
-index 5eebdef..5a6c547 100644
---- a/remoteaccessmanager.cpp
-+++ b/remoteaccessmanager.cpp
-@@ -103,7 +103,7 @@ void RemoteAccessManager::processIncomingConnection()
- }
- else if(requestParser[1].contains(".jpg") || requestParser[1].contains(".png"))
- {
-- QFile imageFile(":"+QString::fromAscii(requestParser[1]));
-+ QFile imageFile(":"+QString::fromLatin1(requestParser[1]));
-
- if(!imageFile.open(QFile::ReadOnly))
- ba = "HTTP/1.1 404 NOT FOUND";
-@@ -119,7 +119,7 @@ void RemoteAccessManager::processIncomingConnection()
- }
- else if(requestParser[1].contains(".js"))
- {
-- QFile jsFile(":"+QString::fromAscii(requestParser[1]));
-+ QFile jsFile(":"+QString::fromLatin1(requestParser[1]));
-
- if(!jsFile.open(QFile::ReadOnly))
- ba = "HTTP/1.1 404 NOT FOUND";
-@@ -135,7 +135,7 @@ void RemoteAccessManager::processIncomingConnection()
- }
- else if(requestParser[1].contains(".css"))
- {
-- QFile cssFile(":"+QString::fromAscii(requestParser[1]));
-+ QFile cssFile(":"+QString::fromLatin1(requestParser[1]));
-
- if(!cssFile.open(QFile::ReadOnly))
- ba = "HTTP/1.1 404 NOT FOUND";
-@@ -213,9 +213,9 @@ QByteArray RemoteAccessManager::hashToJSONByteArray(QHash<QString, QVariant> has
- {
- it.next();
- if(it.value().type() == QVariant::Hash)
-- jsonByteArray+="\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
-+ jsonByteArray+="\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+""+hashToJSONByteArray(it.value().toHash())+",";
- else
-- jsonByteArray += "\""+it.key().toAscii()+"\""+QByteArray::fromRawData(":",1)+"\""+it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
-+ jsonByteArray += "\""+it.key().toLatin1()+"\""+QByteArray::fromRawData(":",1)+"\""+it.value().toByteArray()+"\""+QByteArray::fromRawData(",",1);
- }
-
- jsonByteArray = jsonByteArray.left(jsonByteArray.size()-1);
-diff --git a/webdataengine/openweathermapdataengine.cpp b/webdataengine/openweathermapdataengine.cpp
-index 0286dd5..de39f48 100644
---- a/webdataengine/openweathermapdataengine.cpp
-+++ b/webdataengine/openweathermapdataengine.cpp
-@@ -67,7 +67,7 @@ void OpenWeatherMapDataEngine::responseReceived()
- QByteArray data = m_reply->readAll();
- //qDebug() << data;
-
-- m_cityId = parseCityInformation(QString::fromAscii(data));
-+ m_cityId = parseCityInformation(QString::fromLatin1(data));
- //docs say do not delete in the slot so well pass it off to the event loop
- m_reply->deleteLater();
- if(m_cityId == -1)
-1.8.3.2
-
deleted file mode 100644
@@ -1,38 +0,0 @@
-DESCRIPTION = "Qt Thermostat Demo"
-HOMEPAGE = "https://gitorious.org/thermostat-demo"
-
-LICENSE = "BSD-3-Clause & CC-BY-SA-2.0 & CC-BY-SA-3.0 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
- file://IMAGE-LICENSE;md5=fce98146123de13a189c234a5e4cfa0d \
- file://API-LICENSE;md5=5e32280d79a1eab76729c50d79ecfe72 \
- file://remote/MIT-LICENSE.txt;md5=6a24093faaae5d5c198578c88e220071 \
-"
-
-require recipes-core/matrix/matrix-gui-paths.inc
-
-inherit qt5
-
-PR = "r10"
-
-DEPENDS += "qtsvg qtscript"
-
-BRANCH ?= "master"
-SRCREV = "665bff9a7bc0dbf82f9d6a58ff2778c03fe04fd1"
-
-SRC_URI = "git://git.ti.com/git/apps/thermostat-demo.git;protocol=https;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_install() {
- install -d ${D}/usr/bin
- install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
- install -d ${D}${MATRIX_APP_DIR}/qt_tstat
- install ${S}/matrix-files/desc_thermostat_demo.html ${D}${MATRIX_APP_DIR}/qt_tstat
- install ${S}/matrix-files/thermostat_demo_qt5.desktop ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
-}
-
-PACKAGES += "matrix-gui-thermostat-demo"
-
-RDEPENDS:matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt5"
-
-FILES:matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
deleted file mode 100644
@@ -1,47 +0,0 @@
-DESCRIPTION = "3D demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.9"
-
-S = "${WORKDIR}/git/3d_apps"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# Make sure 3D submenu has been installed and app images has been installed
-
-# TODO: in the future we may want to consider putting this into the libgles
-# recipe directly. Requires broad acceptance of matrix v2 though due
-# to the matrix-gui-submenus-3d dependency. So if matrix v2 moves
-# into the same layer as libgles this may be acceptable, or perhaps
-# we can use an RRECOMMENDS instead.
-
-PACKAGES = " \
- matrix-3d-demo-kmscube \
-"
-
-PACKAGES:append:omap-a15 = " \
- matrix-3d-demo-kmscubevideo \
-"
-
-MATRIX_3D_DEMO_SGX_QAF_PARAM = "1000"
-
-do_install:prepend() {
- find ${S} -name '*.desktop' -exec sed -i {} \
- -e "s|-qaf=[0-9]*|-qaf=${MATRIX_3D_DEMO_SGX_QAF_PARAM}|g" \;
-}
-
-3D_DEMOS_RDEPENDS_MATRIX = "matrix-gui-apps-images matrix-gui-submenus-3d"
-3D_DEMOS_RDEPENDS = "${3D_DEMOS_RDEPENDS_MATRIX}"
-3D_DEMOS_RDEPENDS:omap-a15 = "${3D_DEMOS_RDEPENDS_MATRIX}"
-3D_DEMOS_RDEPENDS:ti43x = "${3D_DEMOS_RDEPENDS_MATRIX}"
-3D_DEMOS_RDEPENDS:ti33x = "${3D_DEMOS_RDEPENDS_MATRIX}"
-3D_DEMOS_RDEPENDS:k3 = "${3D_DEMOS_RDEPENDS_MATRIX}"
-
-RDEPENDS:matrix-3d-demo-kmscube = "${3D_DEMOS_RDEPENDS_MATRIX} kmscube"
-#RDEPENDS:matrix-3d-demo-kmscubevideo = "${3D_DEMOS_RDEPENDS_MATRIX} omapdrmtest"
-RDEPENDS:matrix-3d-demo-kmscubevideo = "${3D_DEMOS_RDEPENDS_MATRIX}"
-
-# Split the matrix files by 3d demos
-FILES:matrix-3d-demo-kmscube = "${MATRIX_APP_DIR}/3d_kmscube/*"
-FILES:matrix-3d-demo-kmscubevideo = "${MATRIX_APP_DIR}/3d_kmscubevideo/*"
deleted file mode 100644
@@ -1,26 +0,0 @@
-DESCRIPTION = "Analytics demo descriptions for Matrix v2"
-
-require recipes-core/matrix/matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/analytics_apps"
-
-# Make sure analytics submenu and app images has been installed
-ANALYTICSDEMO_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-analytics"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-PACKAGES = "matrix-analytics-pdm-anomaly-detection \
-"
-
-RDEPENDS:matrix-analytics-pdm-anomaly-detection = " \
- bash \
- ${ANALYTICSDEMO_RDEPENDS} \
- pdm-anomaly-detection \
-"
-
-FILES:matrix-analytics-pdm-anomaly-detection = "${MATRIX_APP_DIR}/analytics_pdm_anomaly_detection/*"
-FILES:matrix-analytics-pdm-anomaly-detection += "${bindir}/runPdmAnomalyDetection.sh"
deleted file mode 100644
@@ -1,14 +0,0 @@
-LICENSE = "CC-BY-SA-3.0"
-#By default all Matrix v2 applications use the same license.
-LICENSE_CHECKSUM = "LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9"
-LIC_FILES_CHKSUM := "file://../${LICENSE_CHECKSUM}"
-
-SRC_URI = "git://git.ti.com/git/matrix-gui-v2/matrix-gui-v2-apps.git;protocol=https;branch=${BRANCH}"
-SRCREV = "73853d99f1210591daacc668a72468c03440e25a"
-BRANCH = "master"
-INC_PR = "r78"
-
-# Pull in the base package for installing matrix applications
-require matrix-gui-apps.inc
-
-INSANE_SKIP:${PN} += "installed-vs-shipped"
deleted file mode 100644
@@ -1,16 +0,0 @@
-DESCRIPTION = "Image package for Matrix GUI v2 Applications"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/images"
-
-do_install(){
- install -d ${D}${MATRIX_APP_DIR}
- cp -rf ${S}/ ${D}${MATRIX_APP_DIR}
-}
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,43 +0,0 @@
-require matrix-gui-paths.inc
-
-MATRIX_FILES_DIR ?= "${S}"
-
-# Append a generic function to the do_install step that will look in the
-# MATRIX_FILES_DIR for .desktop files and then:
-# 1. Install all non-script files into the MATRIX_APP_DIR
-# 2. Install all script files into ${bindir}
-do_install:append(){
- cd ${MATRIX_FILES_DIR}
- applist=`find . -name "*.desktop"`
-
- for app in $applist
- do
- appdir=`dirname $app`
- install -d ${D}${MATRIX_APP_DIR}/$appdir
-
- # Get the non-script files which are the matrix metadata
- matrix_apps=`find $appdir -type f ! -name "*\.sh"`
- for m in $matrix_apps
- do
- install -m 0644 ${MATRIX_FILES_DIR}/$m ${D}${MATRIX_APP_DIR}/$appdir/
- done
-
- # Put the script files as executables in ${bindir}
- scripts=`find $appdir -type f -name "*\.sh"`
- for s in $scripts
- do
- if [ ! -d ${D}/${bindir} ]
- then
- install -d ${D}${bindir}
- fi
- install -m 0755 ${MATRIX_FILES_DIR}/$s ${D}${bindir}/
- done
- done
-
- # Go back to the directory we started from in case there are
- # other appends.
- cd -
-}
-
-RDEPENDS:${PN}-dev = ""
-RRECOMMENDS:${PN}-dev = ""
deleted file mode 100644
@@ -1,17 +0,0 @@
-DESCRIPTION = "Arm Benchmarks Applications for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.8"
-
-inherit allarch
-
-S = "${WORKDIR}/git/arm_apps"
-
-# Make sure arm submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-arm"
-
-# Make sure the benchmarks have been installed
-RDEPENDS:${PN} += "arm-benchmarks lmbench nbench-byte matrix-gui-helper-scripts"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,15 +0,0 @@
-SUMMARY = "Various Demo Browsers for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/browser_apps"
-
-# Make sure browser submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-browser"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-FILES:${PN} += "${bindir}/runGoogleChrome.sh"
deleted file mode 100644
@@ -1,23 +0,0 @@
-DESCRIPTION = "Simple Qt web display using webengine"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18"
-SECTION = "multimedia"
-
-inherit qt5
-
-DEPENDS += "qtwebkit"
-
-PR = "r17"
-
-SRCREV = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
-
-BRANCH ?= "master"
-
-SRC_URI = "git://git.ti.com/git/matrix-gui-v2/matrix_browser.git;protocol=https;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 0755 ${B}/matrix_browser ${D}/${bindir}
-}
deleted file mode 100644
@@ -1,12 +0,0 @@
-DESCRIPTION = "Camera loopback application for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-S = "${WORKDIR}/git/cameraloopback_apps"
-
-# Make sure loopback application is compiled and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images av-examples"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,26 +0,0 @@
-DESCRIPTION = "Clock setting descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.4"
-
-inherit allarch
-
-S = "${WORKDIR}/git/clocks_apps"
-
-do_install:prepend(){
- install -d ${D}${MATRIX_BASE_DIR}/html-apps/
-
- cp -rf ${S}/set_frequency/power-set-frequency ${D}${MATRIX_BASE_DIR}/html-apps/
-
-}
-
-do_install:append(){
- rm ${D}${MATRIX_APP_DIR}/set_frequency/set-frequency.php
-}
-# Make sure power submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-power matrix-gui-generic-pm"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/html-apps/ \
- ${MATRIX_BASE_DIR}/apps/ \
-"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "Cryptography demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.12"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git/cryptos_apps_scripts"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-# Make sure crypto submenu and app images has been installed. Also make sure openssl is available
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-cryptos openssl matrix-gui-helper-scripts"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "Display control descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/displaycontrol_apps"
-
-# Make sure display submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-display"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,128 +0,0 @@
-# udhcp_eth1.conf
-#
-# configuration for eth1 interface
-#
-# Copyright (C) {2012} Texas Instruments Incorporated - http://www.ti.com/
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation version 2.
-#
-# This program is distributed "as is" WITHOUT ANY WARRANTY of any
-# kind, whether express or implied; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# Sample udhcpd configuration file (/etc/udhcpd.conf)
-# Values shown are defaults
-
-# The start and end of the IP lease block
-start 192.168.30.20
-end 192.168.30.254
-
-# The interface that udhcpd will use
-interface eth1
-
-# The maximum number of leases (includes addresses reserved
-# by OFFER's, DECLINE's, and ARP conflicts). Will be corrected
-# if it's bigger than IP lease block, but it ok to make it
-# smaller than lease block.
-#max_leases 254
-
-# The amount of time that an IP will be reserved (leased to nobody)
-# if a DHCP decline message is received (seconds)
-#decline_time 3600
-
-# The amount of time that an IP will be reserved
-# if an ARP conflict occurs (seconds)
-#conflict_time 3600
-
-# How long an offered address is reserved (seconds)
-#offer_time 60
-
-# If client asks for lease below this value, it will be rounded up
-# to this value (seconds)
-#min_lease 60
-
-# The location of the pid file
-#pidfile /var/run/udhcpd.pid
-
-# The location of the leases file
-#lease_file /var/lib/misc/udhcpd.leases
-
-# The time period at which udhcpd will write out leases file.
-# If this is 0, udhcpd will never automatically write leases file.
-# Specified in seconds.
-#auto_time 7200
-
-# Every time udhcpd writes a leases file, the below script will be called
-#notify_file # default: no script
-#notify_file dumpleases # useful for debugging
-
-# The following are bootp specific options
-# next server to use in bootstrap
-#siaddr 192.168.0.22 # default: 0.0.0.0 (none)
-# tftp server name
-#sname zorak # default: none
-# tftp file to download (e.g. kernel image)
-#boot_file /var/nfs_root # default: none
-
-# Static leases map
-#static_lease 00:60:08:11:CE:4E 192.168.0.54
-#static_lease 00:60:08:11:CE:3E 192.168.0.44
-
-# The remainder of options are DHCP options and can be specified with the
-# keyword 'opt' or 'option'. If an option can take multiple items, such
-# as the dns option, they can be listed on the same line, or multiple
-# lines.
-# Examples:
-opt dns 8.8.8.8 8.8.4.4 #public google dns servers
-option subnet 255.255.255.0
-opt router 192.168.30.1
-#opt wins 192.168.10.10
-#option dns 129.219.13.81 # appended to above DNS servers for a total of 3
-#option domain local
-option lease 864000 # default: 10 days
-# Arbitrary option in hex form:
-option 0x08 01020304 # option 8: "cookie server IP addr: 1.2.3.4"
-
-# Currently supported options (for more info, see options.c):
-#opt lease NUM
-#opt subnet IP
-#opt broadcast IP
-#opt router IP_LIST
-#opt ipttl NUM
-#opt mtu NUM
-#opt hostname STRING # client's hostname
-#opt domain STRING # client's domain suffix
-#opt search STRING_LIST # search domains
-#opt nisdomain STRING
-#opt timezone NUM # (localtime - UTC_time) in seconds. signed
-#opt tftp STRING # tftp server name
-#opt bootfile STRING # tftp file to download (e.g. kernel image)
-#opt bootsize NUM # size of that file
-#opt rootpath STRING # (NFS) path to mount as root fs
-#opt wpad STRING
-#opt serverid IP # default: server's IP
-#opt message STRING # error message (udhcpd sends it on success too)
-#opt vlanid NUM # 802.1P VLAN ID
-#opt vlanpriority NUM # 802.1Q VLAN priority
-# Options specifying server(s)
-#opt dns IP_LIST
-#opt wins IP_LIST
-#opt nissrv IP_LIST
-#opt ntpsrv IP_LIST
-#opt lprsrv IP_LIST
-#opt swapsrv IP
-# Options specifying routes
-#opt routes IP_PAIR_LIST
-# Obsolete options, no longer supported
-#opt logsrv IP_LIST # 704/UDP log server (not syslog!)
-#opt namesrv IP_LIST # IEN 116 name server, obsolete (August 1979!!!)
-#opt cookiesrv IP_LIST # RFC 865 "quote of the day" server, rarely (never?) used
-#opt timesrv IP_LIST # RFC 868 time server, rarely (never?) used
-# TODO: in development
-#opt userclass STRING # RFC 3004. set of LASCII strings. "I am a printer" etc
-#opt sipserv STRING LIST # RFC 3361. flag byte, then: 0: domain names, 1: IP addrs
-#opt staticroutes STATIC_ROUTES
-#opt msstaticroutes STATIC_ROUTES
deleted file mode 100644
@@ -1,30 +0,0 @@
-DESCRIPTION = "Ethernet example applications"
-
-require matrix-gui-apps-git.inc
-
-LICENSE = "CC-BY-SA-3.0 & GPL-2.0-or-later"
-
-LIC_FILES_CHKSUM := "file://../${LICENSE_CHECKSUM} \
- file://../../udhcpd_eth1.conf;beginline=1;endline=14;md5=70668b1ed5416406a61ef9abdd90d601 \
-"
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-
-# Add a default configuration file for the eth1 connection
-SRC_URI += "file://udhcpd_eth1.conf"
-
-S = "${WORKDIR}/git/ethernet_apps"
-
-do_install:append() {
- install -d ${D}${sysconfdir}
- install -m 0755 ${WORKDIR}/udhcpd_eth1.conf ${D}${sysconfdir}
-}
-
-# Make sure ethernet submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-ethernet"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/* \
- ${sysconfdir}/udhcpd_eth1.conf"
-CONFFILES:${PN} += "${sysconfdir}/udhcpd_eth1.conf"
deleted file mode 100644
@@ -1,16 +0,0 @@
-DESCRIPTION = "Power management helper scripts"
-
-require matrix-gui-apps-git.inc
-
-LIC_FILES_CHKSUM := "file://../../${LICENSE_CHECKSUM}"
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/power_apps/pm_generic_power"
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${S}/setclockspeed.sh ${D}${bindir}
- install -m 0755 ${S}/warnonpm.sh ${D}${bindir}
-}
deleted file mode 100644
@@ -1,16 +0,0 @@
-DESCRIPTION = "Demo helper scripts for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/scripts"
-
-do_install:append(){
- install -d ${D}${bindir}
- install -m 0755 ${S}/optimize-benchmark.sh ${D}${bindir}/
-}
-
-FILES:${PN} += "{bindir}/*"
deleted file mode 100644
@@ -1,46 +0,0 @@
-SUMMARY = "HMI demo descriptions for Matrix v2"
-
-require recipes-core/matrix/matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/hmi_apps"
-
-# Make sure machinevision submenu and app images has been installed
-HMI_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-hmi"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-PACKAGES = "matrix-hmi-demo-evse \
- matrix-hmi-demo-protection-relays \
- matrix-hmi-demo-mmwavegesture \
-"
-
-RDEPENDS:matrix-hmi-demo-evse = " \
- bash \
- ${HMI_RDEPENDS} \
- evse-hmi \
-"
-
-RDEPENDS:matrix-hmi-demo-protection-relays = " \
- bash \
- ${HMI_RDEPENDS} \
- protection-relays-hmi \
-"
-
-RDEPENDS:matrix-hmi-demo-mmwavegesture = " \
- bash \
- ${HMI_RDEPENDS} \
- mmwavegesture-hmi \
-"
-
-FILES:matrix-hmi-demo-evse = "${MATRIX_APP_DIR}/hmi_evse/*"
-FILES:matrix-hmi-demo-evse += "${bindir}/runHmiEvse.sh"
-
-FILES:matrix-hmi-demo-protection-relays = "${MATRIX_APP_DIR}/hmi_protection_relays/*"
-FILES:matrix-hmi-demo-protection-relays += "${bindir}/runHmiProtectionRelays.sh"
-
-FILES:matrix-hmi-demo-mmwavegesture = "${MATRIX_APP_DIR}/hmi_mmwave/*"
-FILES:matrix-hmi-demo-mmwavegesture += "${bindir}/runHmiMmWave.sh"
deleted file mode 100644
@@ -1,58 +0,0 @@
-DESCRIPTION = "Machine vision demo descriptions for Matrix v2"
-
-require recipes-core/matrix/matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.4"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git/machinevision_apps"
-
-# Make sure machinevision submenu and app images has been installed
-MACHINEVISION_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-machinevision"
-
-BARCODE_RDEPENDS = ""
-#BARCODE_RDEPENDS = " \
-# ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
-#"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-PACKAGES = "matrix-machinevision-demo-dlp3dscanner \
- matrix-machinevision-demo-barcoderoi \
- matrix-machinevision-demo-barcoderoi-f2f \
- matrix-machinevision-demo-simplepeopletracking \
-"
-
-RDEPENDS:matrix-machinevision-demo-dlp3dscanner = " \
- ${MACHINEVISION_RDEPENDS} \
-"
-
-RDEPENDS:matrix-machinevision-demo-dlp3dscanner:append:dra7xx = " \
- ${@['','point-cloud-viewer'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('DISTRO_FEATURES', 'opengl', True, False, d)]} \
-"
-
-RDEPENDS:matrix-machinevision-demo-barcoderoi = " \
- ${MACHINEVISION_RDEPENDS} \
- ${BARCODE_RDEPENDS} \
-"
-
-RDEPENDS:matrix-machinevision-demo-barcoderoi-f2f = " \
- ${MACHINEVISION_RDEPENDS} \
- ${BARCODE_RDEPENDS} \
-"
-
-RDEPENDS:matrix-machinevision-demo-simplepeopletracking = " \
- ${MACHINEVISION_RDEPENDS} \
-"
-
-FILES:matrix-machinevision-demo-dlp3dscanner = "${MATRIX_APP_DIR}/machinevision_dlp_3d_scanner/*"
-FILES:matrix-machinevision-demo-dlp3dscanner += "${bindir}/runDlp3DScanner.sh"
-
-FILES:matrix-machinevision-demo-barcoderoi = "${MATRIX_APP_DIR}/machinevision_barcode_roi/*"
-FILES:matrix-machinevision-demo-barcoderoi += "${bindir}/runBarcodeRoi.sh"
-FILES:matrix-machinevision-demo-barcoderoi-f2f = "${MATRIX_APP_DIR}/machinevision_barcode_roi_f2f/*"
-FILES:matrix-machinevision-demo-barcoderoi-f2f += "${bindir}/runBarcodeRoiSave2File.sh"
-
-FILES:matrix-machinevision-demo-simplepeopletracking = "${MATRIX_APP_DIR}/machinevision_simple_people_tracking/*"
-FILES:matrix-machinevision-demo-simplepeopletracking += "${bindir}/runSimplePeopleTracking.sh"
deleted file mode 100644
@@ -1,27 +0,0 @@
-DESCRIPTION = "Keystone multi-core demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/mc_demo_apps"
-
-# Make sure demo submenu and app images has been installed.
-MC_DEMOS_RDEPENDS = "matrix-gui-apps-images matrix-gui-submenus-mc-demo"
-
-PACKAGES = "matrix-mc-demo-ipc \
- matrix-mc-demo-imageproc \
-"
-
-RDEPENDS:matrix-mc-demo-ipc = "${MC_DEMOS_RDEPENDS}"
-RDEPENDS:matrix-mc-demo-imageproc = "${MC_DEMOS_RDEPENDS}"
-
-FILES:matrix-mc-demo-ipc = "${MATRIX_APP_DIR}/mc_demo_ipc/*"
-FILES:matrix-mc-demo-imageproc = "${MATRIX_APP_DIR}/mc_demo_imageproc/*"
-
-FILES:matrix-mc-demo-ipc += "${bindir}/mc_demo_ipc.sh"
-FILES:matrix-mc-demo-imageproc += "${bindir}/mc_demo_imageproc.sh \
- ${bindir}/mc_run_dsp.sh \
-"
deleted file mode 100644
@@ -1,70 +0,0 @@
-DESCRIPTION = "Multimedia demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.7"
-
-inherit allarch
-
-S = "${WORKDIR}/git/multimedia_apps"
-
-# Make sure multimedia submenu and app images has been installed
-MULTIMEDIA_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-multimedia amsdk-av-files"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-PACKAGES = "matrix-multimedia-demo-aac \
- matrix-multimedia-demo-audiocapture \
- matrix-multimedia-demo-h264dec \
- matrix-multimedia-demo-mpeg4aacdec \
- matrix-multimedia-demo-mpeg4dec \
- matrix-multimedia-demo-ivahdh264dec \
- matrix-multimedia-demo-ivahdh264enc \
- matrix-multimedia-demo-ivahdmjpegenc \
- matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec \
- matrix-multimedia-demo-h265dec \
- matrix-multimedia-demo-dsp66imgproc \
- matrix-multimedia-demo-dsp66imgproc-f2f \
-"
-
-RDEPENDS:matrix-multimedia-demo-aac = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-audiocapture = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-h264dec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-mpeg4aacdec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-mpeg4dec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-ivahdh264dec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-ivahdh264enc = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-ivahdmjpegenc = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-h265dec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-dsp66imgproc = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS:matrix-multimedia-demo-dsp66imgproc-f2f = "${MULTIMEDIA_RDEPENDS}"
-
-
-# Split the matrix files by multimedia demos
-FILES:matrix-multimedia-demo-aac = "${MATRIX_APP_DIR}/arm_multimedia_aacdec/*"
-FILES:matrix-multimedia-demo-audiocapture = "${MATRIX_APP_DIR}/arm_multimedia_audiocapture/*"
-FILES:matrix-multimedia-demo-h264dec = "${MATRIX_APP_DIR}/arm_multimedia_h264dec/*"
-FILES:matrix-multimedia-demo-mpeg4aacdec = "${MATRIX_APP_DIR}/arm_multimedia_mpeg4aacdec/*"
-FILES:matrix-multimedia-demo-mpeg4dec = "${MATRIX_APP_DIR}/arm_multimedia_mpeg4dec/*"
-FILES:matrix-multimedia-demo-ivahdh264dec = "${MATRIX_APP_DIR}/ivahd_multimedia_h264dec/*"
-FILES:matrix-multimedia-demo-ivahdh264enc = "${MATRIX_APP_DIR}/ivahd_multimedia_h264enc/*"
-FILES:matrix-multimedia-demo-ivahdmjpegenc = "${MATRIX_APP_DIR}/ivahd_multimedia_mjpegenc/*"
-FILES:matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec = "${MATRIX_APP_DIR}/ivahd_multimedia_vip_vpe_mpeg4encdec/*"
-FILES:matrix-multimedia-demo-h265dec = "${MATRIX_APP_DIR}/arm_multimedia_h265dec/*"
-FILES:matrix-multimedia-demo-dsp66imgproc = "${MATRIX_APP_DIR}/dsp66_multimedia_imgproc/*"
-FILES:matrix-multimedia-demo-dsp66imgproc-f2f = "${MATRIX_APP_DIR}/dsp66_multimedia_imgproc_f2f/*"
-
-# Split the ${bindir} files by multimedia demos
-FILES:matrix-multimedia-demo-aac += "${bindir}/runAACDec.sh"
-FILES:matrix-multimedia-demo-audiocapture += "${bindir}/runAudioCapture.sh"
-FILES:matrix-multimedia-demo-h264dec += "${bindir}/runH264Dec.sh"
-FILES:matrix-multimedia-demo-mpeg4aacdec += "${bindir}/runMpeg4AacDec.sh"
-FILES:matrix-multimedia-demo-mpeg4dec += "${bindir}/runMpeg4Dec.sh"
-FILES:matrix-multimedia-demo-ivahdh264dec += "${bindir}/runIvahdH264Dec.sh"
-FILES:matrix-multimedia-demo-ivahdh264enc += "${bindir}/runIvahdH264Enc.sh"
-FILES:matrix-multimedia-demo-ivahdmjpegenc += "${bindir}/runIvahdMjpegEnc.sh"
-FILES:matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec += "${bindir}/runIvahdVipVpeMpeg4EncDec.sh"
-FILES:matrix-multimedia-demo-h265dec += "${bindir}/runH265Dec.sh"
-FILES:matrix-multimedia-demo-dsp66imgproc += "${bindir}/runDsp66ImgProc.sh"
-FILES:matrix-multimedia-demo-dsp66imgproc-f2f += "${bindir}/runDsp66ImgProcSave2File.sh"
deleted file mode 100644
@@ -1,36 +0,0 @@
-DESCRIPTION = "OpenCL demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.2"
-
-inherit allarch features_check
-
-REQUIRED_DISTRO_FEATURES = "opencl"
-
-S = "${WORKDIR}/git/opencl_apps"
-
-# Make sure opencl submenu and app images has been installed
-OPENCL_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-opencl"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-PACKAGES = "matrix-opencl-demo-dsplibfft \
- matrix-opencl-demo-vecadd \
- matrix-opencl-demo-floatcompute \
-"
-
-RDEPENDS:matrix-opencl-demo-dsplibfft = "${OPENCL_RDEPENDS}"
-RDEPENDS:matrix-opencl-demo-vecadd = "${OPENCL_RDEPENDS}"
-RDEPENDS:matrix-opencl-demo-floatcompute = "${OPENCL_RDEPENDS}"
-
-# Split the matrix files by opencl demos
-FILES:matrix-opencl-demo-dsplibfft = "${MATRIX_APP_DIR}/opencl_dsplib_fft/*"
-FILES:matrix-opencl-demo-vecadd = "${MATRIX_APP_DIR}/opencl_vecadd/*"
-FILES:matrix-opencl-demo-floatcompute = "${MATRIX_APP_DIR}/opencl_float_compute/*"
-
-
-# Split the ${bindir} files by opencl demos
-FILES:matrix-opencl-demo-dsplibfft += "${bindir}/runOclDsplibFFT.sh"
-FILES:matrix-opencl-demo-vecadd += "${bindir}/runOclVecadd.sh"
-FILES:matrix-opencl-demo-floatcompute += "${bindir}/runOclFloatCompute.sh"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "Oprofile demo applications for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.3"
-
-inherit allarch
-
-S = "${WORKDIR}/git/oprofile_apps"
-
-# Make sure profiling submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-oprofile oprofile oprofile-example"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,3 +0,0 @@
-export MATRIX_BASE_DIR = "${datadir}/matrix-gui-2.0"
-export MATRIX_WEB_DIR = "${MATRIX_BASE_DIR}"
-export MATRIX_APP_DIR = "${MATRIX_WEB_DIR}/apps"
deleted file mode 100644
@@ -1,35 +0,0 @@
-DESCRIPTION = "Power management demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.4"
-
-inherit allarch
-
-S = "${WORKDIR}/git/power_apps"
-
-# Make sure power submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-power matrix-gui-generic-pm"
-ALLOW_EMPTY:${PN} = "1"
-
-# Break out the individual files into separate packages. That way only the
-# PM features supported for each device can be installed. Prepend the list
-# so that we can get the files in ${bindir} first.
-PACKAGES =+ "${PN}-count ${PN}-dump-reg ${PN}-snapshot1 ${PN}-snapshot2 ${PN}-suspend ${PN}-governor"
-
-# Split the matrix files by PM app
-FILES:${PN}-count += "${MATRIX_APP_DIR}/pm_count/*"
-FILES:${PN}-dump-reg += "${MATRIX_APP_DIR}/pm_dump_reg/*"
-FILES:${PN}-snapshot1 += "${MATRIX_APP_DIR}/pm_snapshot_1/*"
-FILES:${PN}-snapshot2 += "${MATRIX_APP_DIR}/pm_snapshot_2/*"
-FILES:${PN}-suspend += "${MATRIX_APP_DIR}/pm_suspend/*"
-FILES:${PN}-governor += "${MATRIX_APP_DIR}/pm_userspace_governor/* \
- ${MATRIX_APP_DIR}/pm_ondemand_governor/*"
-
-# Split the ${bindir} files by PM app
-FILES:${PN}-count += "${bindir}/pm_count.sh"
-FILES:${PN}-dump-reg += "${bindir}/pm_dump_reg.sh"
-FILES:${PN}-snapshot1 += "${bindir}/pm_snapshot_1.sh"
-FILES:${PN}-snapshot2 += "${bindir}/pm_snapshot_2.sh"
-FILES:${PN}-suspend += "${bindir}/pm_suspend.sh"
-FILES:${PN}-governor += "${bindir}/setgovernor.sh"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "PRU demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/pru_apps"
-
-# Make sure pru submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-pru"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "Qt4 demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/qt4_apps"
-
-# Make sure qt4 submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-qt4"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,33 +0,0 @@
-DESCRIPTION = "Qt5 demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/qt5_apps"
-
-# Make sure qt5 submenu and app images has been installed
-QT5_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-qt5"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-PACKAGES = "matrix-qt5-demo-animated \
- matrix-qt5-demo-browser \
- matrix-qt5-demo-calculator \
- matrix-qt5-demo-deform \
- matrix-qt5-demo-webkit-browser \
-"
-
-RDEPENDS:matrix-qt5-demo-animated = "${QT5_RDEPENDS}"
-RDEPENDS:matrix-qt5-demo-browser = "${QT5_RDEPENDS}"
-RDEPENDS:matrix-qt5-demo-calculator = "${QT5_RDEPENDS}"
-RDEPENDS:matrix-qt5-demo-deform = "${QT5_RDEPENDS}"
-RDEPENDS:matrix-qt5-demo-webkit-browser = "${QT5_RDEPENDS}"
-
-# Split the matrix files by qt5 demos
-FILES:matrix-qt5-demo-animated = "${MATRIX_APP_DIR}/qt5_animated_tiles/*"
-FILES:matrix-qt5-demo-browser = "${MATRIX_APP_DIR}/qt5_browser/*"
-FILES:matrix-qt5-demo-calculator = "${MATRIX_APP_DIR}/qt5_calculator/*"
-FILES:matrix-qt5-demo-deform = "${MATRIX_APP_DIR}/qt5_deform/*"
-FILES:matrix-qt5-demo-webkit-browser = "${MATRIX_APP_DIR}/qt5_webkit_browser/*"
deleted file mode 100644
@@ -1,23 +0,0 @@
-DESCRIPTION = "Settings demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.3"
-
-inherit allarch
-
-S = "${WORKDIR}/git/settings_apps"
-
-PACKAGES =+ "matrix-gui-weston-terminal-demo"
-
-# Make sure setting submenu and app images has been installed
-SETTINGS_DEMOS_RDEPENDS = " \
- matrix-gui-apps-images \
- matrix-gui-submenus-settings \
-"
-
-RDEPENDS:${PN} += "${SETTINGS_DEMOS_RDEPENDS}"
-RDEPENDS:matrix-gui-weston-terminal-demo += "${SETTINGS_DEMOS_RDEPENDS}"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-FILES:matrix-gui-weston-terminal-demo = "${MATRIX_APP_DIR}/terminal"
deleted file mode 100644
@@ -1,106 +0,0 @@
-DESCRIPTION = "Submenu packages for Matrix GUI v2"
-
-require matrix-gui-apps-git.inc
-
-# This package does not use a subdirectory as ${S} so we need to
-# reset the LIC_FILES_CHKSUM setting from the matrix-gui-apps-git.inc file
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9"
-
-PR = "${INC_PR}.20"
-
-# These packages make submenus in matrix and are not architecture specific
-inherit allarch
-
-S = "${WORKDIR}/git"
-
-# List of submenus to build packages for
-SUBMENUS = " arm_submenu \
- 3d_submenu \
- cryptos_submenu \
- display_submenu \
- ethernet_submenu \
- multimedia_submenu \
- power_submenu \
- pru_submenu \
- qt4_submenu \
- settings_submenu \
- usb_submenu \
- wifi_submenu \
- oprofile_submenu \
- utilities_submenu \
- mc_demo_submenu \
- opencl_submenu \
- videoanalytics_submenu \
- machinevision_submenu \
- touch_submenu \
- browser_submenu \
- hmi_submenu \
- tidl_submenu \
- analytics_submenu \
-"
-
-do_install(){
- install -d ${D}${MATRIX_APP_DIR}
-
- for x in ${SUBMENUS}
- do
- cp -rf ${S}/$x ${D}${MATRIX_APP_DIR}/
- done
-}
-
-PACKAGES += " ${PN}-arm \
- ${PN}-3d \
- ${PN}-cryptos \
- ${PN}-display \
- ${PN}-ethernet \
- ${PN}-multimedia \
- ${PN}-power \
- ${PN}-pru \
- ${PN}-qt4 \
- ${PN}-qt5 \
- ${PN}-settings \
- ${PN}-usb \
- ${PN}-wifi \
- ${PN}-oprofile \
- ${PN}-camera \
- ${PN}-utility \
- ${PN}-mc-demo \
- ${PN}-opencl \
- ${PN}-videoanalytics \
- ${PN}-machinevision \
- ${PN}-touch \
- ${PN}-browser \
- ${PN}-hmi \
- ${PN}-tidl \
- ${PN}-analytics \
-"
-
-# Make sure app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images bash"
-
-# Add the files for each submenu package
-FILES:${PN}-arm = "${MATRIX_APP_DIR}/arm_submenu/*"
-FILES:${PN}-3d = "${MATRIX_APP_DIR}/3d_submenu/*"
-FILES:${PN}-cryptos = "${MATRIX_APP_DIR}/cryptos_submenu/*"
-FILES:${PN}-display = "${MATRIX_APP_DIR}/display_submenu/*"
-FILES:${PN}-ethernet = "${MATRIX_APP_DIR}/ethernet_submenu/*"
-FILES:${PN}-multimedia = "${MATRIX_APP_DIR}/multimedia_submenu/*"
-FILES:${PN}-power = "${MATRIX_APP_DIR}/power_submenu/*"
-FILES:${PN}-pru = "${MATRIX_APP_DIR}/pru_submenu/*"
-FILES:${PN}-qt4 = "${MATRIX_APP_DIR}/qt4_submenu/*"
-FILES:${PN}-qt5 = "${MATRIX_APP_DIR}/qt5_submenu/*"
-FILES:${PN}-settings = "${MATRIX_APP_DIR}/settings_submenu/*"
-FILES:${PN}-usb = "${MATRIX_APP_DIR}/usb_submenu/*"
-FILES:${PN}-wifi = "${MATRIX_APP_DIR}/wifi_submenu/*"
-FILES:${PN}-oprofile = "${MATRIX_APP_DIR}/oprofile_submenu/*"
-FILES:${PN}-camera = "${MATRIX_APP_DIR}/camera_submenu/*"
-FILES:${PN}-utility = "${MATRIX_APP_DIR}/utilities_submenu/*"
-FILES:${PN}-mc-demo = "${MATRIX_APP_DIR}/mc_demo_submenu/*"
-FILES:${PN}-opencl = "${MATRIX_APP_DIR}/opencl_submenu/*"
-FILES:${PN}-videoanalytics = "${MATRIX_APP_DIR}/videoanalytics_submenu/*"
-FILES:${PN}-machinevision = "${MATRIX_APP_DIR}/machinevision_submenu/*"
-FILES:${PN}-touch = "${MATRIX_APP_DIR}/touch_submenu/*"
-FILES:${PN}-browser = "${MATRIX_APP_DIR}/browser_submenu/*"
-FILES:${PN}-hmi = "${MATRIX_APP_DIR}/hmi_submenu/*"
-FILES:${PN}-tidl = "${MATRIX_APP_DIR}/tidl_submenu/*"
-FILES:${PN}-analytics = "${MATRIX_APP_DIR}/analytics_submenu/*"
deleted file mode 100644
@@ -1,96 +0,0 @@
-DESCRIPTION = "Deep learning vision demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/tidl_apps"
-
-# Make sure tidl submenu and app images has been installed
-TIDLDEMO_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-tidl"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
-
-PACKAGES = "matrix-tidl-demo-staticimg \
- matrix-tidl-demo-staticimg-lg2 \
- matrix-tidl-demo-staticimg-dsponly \
- matrix-tidl-demo-pnexamples \
- matrix-tidl-demo-livecam \
- matrix-tidl-demo-livecam-lg2 \
- matrix-tidl-demo-dogbreeds \
- matrix-tidl-demo-objdet \
- matrix-tidl-demo-objdet-livecam \
- matrix-tidl-demo-segment \
-"
-
-RDEPENDS:matrix-tidl-demo-staticimg = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-staticimg-lg2 = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-staticimg-dsponly = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-pnexamples = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-livecam = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-livecam-lg2 = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-dogbreeds = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-objdet = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-objdet-livecam = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-RDEPENDS:matrix-tidl-demo-segment = " \
- ${TIDLDEMO_RDEPENDS} \
-"
-
-FILES:matrix-tidl-demo-staticimg = "${MATRIX_APP_DIR}/tidl_demo_staticimg/*"
-FILES:matrix-tidl-demo-staticimg += "${bindir}/runTidlStaticImg.sh"
-
-FILES:matrix-tidl-demo-staticimg-lg2 = "${MATRIX_APP_DIR}/tidl_demo_staticimg_lg2/*"
-FILES:matrix-tidl-demo-staticimg-lg2 += "${bindir}/runTidlStaticImg_lg2.sh"
-
-FILES:matrix-tidl-demo-staticimg-dsponly = "${MATRIX_APP_DIR}/tidl_demo_staticimg_dsponly/*"
-FILES:matrix-tidl-demo-staticimg-dsponly += "${bindir}/runTidlStaticImg_dsponly.sh"
-
-FILES:matrix-tidl-demo-pnexamples = "${MATRIX_APP_DIR}/tidl_demo_pnexamples/*"
-FILES:matrix-tidl-demo-pnexamples += "${bindir}/runTidlPnExamples.sh"
-
-FILES:matrix-tidl-demo-livecam = "${MATRIX_APP_DIR}/tidl_demo_livecam/*"
-FILES:matrix-tidl-demo-livecam += "${bindir}/runTidlLiveCam.sh"
-
-FILES:matrix-tidl-demo-livecam-lg2 = "${MATRIX_APP_DIR}/tidl_demo_livecam_lg2/*"
-FILES:matrix-tidl-demo-livecam-lg2 += "${bindir}/runTidlLiveCam_lg2.sh"
-
-FILES:matrix-tidl-demo-dogbreeds = "${MATRIX_APP_DIR}/tidl_demo_dogbreeds/*"
-FILES:matrix-tidl-demo-dogbreeds += "${bindir}/runTidlDogBreeds.sh"
-
-FILES:matrix-tidl-demo-objdet = "${MATRIX_APP_DIR}/tidl_demo_objdet/*"
-FILES:matrix-tidl-demo-objdet += "${bindir}/runTidlObjdet.sh"
-
-FILES:matrix-tidl-demo-objdet-livecam = "${MATRIX_APP_DIR}/tidl_demo_objdet_livecam/*"
-FILES:matrix-tidl-demo-objdet-livecam += "${bindir}/runTidlObjdet_livecam.sh"
-
-FILES:matrix-tidl-demo-segment = "${MATRIX_APP_DIR}/tidl_demo_segment/*"
-FILES:matrix-tidl-demo-segment += "${bindir}/runTidlSegment.sh"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "Touch demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/touch_apps"
-
-# Make sure touch submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-touch"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "USB demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.3"
-
-inherit allarch
-
-S = "${WORKDIR}/git/usb_apps"
-
-# Make sure usb submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-usb bonnie++ matrix-gui-helper-scripts"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,31 +0,0 @@
-DESCRIPTION = "Keystone utility app demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/utilities_apps"
-
-do_install:prepend(){
- install -d ${D}${MATRIX_BASE_DIR}/html-apps/
- cp -rf ${S}/utility_eeprom/eeprom ${D}${MATRIX_BASE_DIR}/html-apps/
- cp -rf ${S}/utility_filesystem/filesystem ${D}${MATRIX_BASE_DIR}/html-apps/
- cp -rf ${S}/utility_info/info ${D}${MATRIX_BASE_DIR}/html-apps/
- cp -rf ${S}/utility_stats/stats ${D}${MATRIX_BASE_DIR}/html-apps/
-}
-
-do_install:append(){
- rm ${D}${MATRIX_APP_DIR}/utility_eeprom/eeprom-utility.php
- rm ${D}${MATRIX_APP_DIR}/utility_filesystem/filesystem-utility.php
- rm ${D}${MATRIX_APP_DIR}/utility_info/info-utility.php
- rm ${D}${MATRIX_APP_DIR}/utility_stats/stats-utility.php
-}
-
-# Make sure utility submenu and app images has been installed.
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-utility"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/html-apps/ \
- ${MATRIX_BASE_DIR}/apps/ \
-"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "V4l2 demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.2"
-
-inherit allarch
-
-S = "${WORKDIR}/git/v4l2_apps"
-
-# Make sure display submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-display av-examples"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,28 +0,0 @@
-DESCRIPTION = "Video Analytics demo descriptions for Matrix v2"
-
-require recipes-core/matrix/matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.0"
-
-inherit allarch
-
-S = "${WORKDIR}/git/videoanalytics_apps"
-
-# Make sure video analytics submenu and app images has been installed
-VIDEO_ANALYTICS_DEMO_RDEPENDS += " \
- matrix-gui-apps-images \
- matrix-gui-submenus-videoanalytics \
-"
-
-PACKAGES = "matrix-video-analytics-opencv-opencl-opengl-demo \
-"
-
-# ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]}
-RDEPENDS:matrix-video-analytics-opencv-opencl-opengl-demo = " \
- ${VIDEO_ANALYTICS_DEMO_RDEPENDS} \
-"
-
-# Split the matrix files by demos
-FILES:matrix-video-analytics-opencv-opencl-opengl-demo = " \
- ${MATRIX_APP_DIR}/videoanalytics_opencv_opencl_opengl_demo/* \
-"
deleted file mode 100644
@@ -1,14 +0,0 @@
-DESCRIPTION = "Wifi demo descriptions for Matrix v2"
-
-require matrix-gui-apps-git.inc
-
-PR = "${INC_PR}.1"
-
-inherit allarch
-
-S = "${WORKDIR}/git/wifi_apps"
-
-# Make sure wifi submenu and app images has been installed
-RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-wifi"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,84 +0,0 @@
-From 7cbf63222897de4e9b021d8d007cca74be4ca56f Mon Sep 17 00:00:00 2001
-From: Jacob Stiffler <j-stiffler@ti.com>
-Date: Wed, 8 Apr 2015 07:34:22 -0400
-Subject: [PATCH] execute_command: Stop matrix when running a GUI demo.
-
-* With QT over EGLFS, all running QT apps will write to the
- framebuffer whenever they have updates.
-* This can cause the following undesired behavior:
- - flickering when both applications try to write updates at the
- same time. For example, if a mouse is used for control, both QT
- apps will update the mouse cursor, causing flickering between both
- apps.
- - Failure for a temporary background app (e.g. matrix) to come to
- the foreground when demo exits. For example, when launching a qt
- app via remote Matrix, the demo app will persist on the target's
- display.
-* To work around this, stop matrix before launching a GUI demo, and
- restart once the demo has completed.
-
-Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
----
- execute_command.sh | 21 +++++++++++++++++++++
- run_script.php | 2 +-
- 2 files changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/execute_command.sh b/execute_command.sh
-index 018c632..c636b92 100755
---- a/execute_command.sh
-+++ b/execute_command.sh
-@@ -59,6 +59,11 @@ do
- outputfilename=$item
- fi
-
-+ if [ $i -eq 2 ]
-+ then
-+ program_type=$item
-+ fi
-+
- if [ $i -gt 1 ]
- then
- touch "lock/"$item
-@@ -68,10 +73,26 @@ do
-
- done
-
-+if [ $program_type == gui ]
-+then
-+ /etc/init.d/matrix-gui-2.0 stop
-+
-+ chvt 4
-+ echo 0 > /sys/class/graphics/fbcon/cursor_blink
-+ echo -ne "\033[9;0]\033[14;0]" > /dev/tty4
-+
-+ refresh_screen background-black
-+fi
-+
- echo "Filename:"$filename
- echo "Output:"$outputfilename
- eval $filename > "tmp/"$outputfilename 2>&1
-
-+if [ $program_type == gui ]
-+then
-+ /etc/init.d/matrix-gui-2.0 start
-+fi
-+
- #Using a more unique string to detect if the script is completed
- echo "_?!!MATRIX_SCRIPT_COMPLETED!!?_" >> "tmp/"$outputfilename
-
-diff --git a/run_script.php b/run_script.php
-index 9dd7a10..5b8351b 100644
---- a/run_script.php
-+++ b/run_script.php
-@@ -91,7 +91,7 @@ if($currently_locked==false)
- $random_string = strval(rand());
- $random_string .= strval(rand());
-
-- $script_command = "./execute_command.sh \"".addslashes($script_link). "\" ".$random_string.".txt ".$lock_list;
-+ $script_command = "./execute_command.sh \"".addslashes($script_link). "\" ".$random_string.".txt \"".$found_app["ProgramType"]."\" ".$lock_list;
-
- $last_line = system($script_command." > /dev/null 2>/dev/null & ", $retval);
- }
-1.7.9.5
-
deleted file mode 100644
@@ -1,126 +0,0 @@
-From 9647ddc10dc9424b1433db2f8184268523d829da Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1@ti.com>
-Date: Wed, 28 Feb 2018 12:20:32 -0500
-Subject: [PATCH] execute_command: workaround for GUI apps with weston
-
-* For all GUI apps, shutdown matrix before launching
- - This is needed since matrix is launched fullscreen, and another
- GUI app may get hidden behind matrix with no way to recover.
-* For MM and 3D and null window apps, shutdown weston before launching
- - These apps use KMS sink or DRM, which collides with weston
-
-Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
----
- execute_command.sh | 39 ++++++++++++++++++++++++++++++++++++++-
- generate.php | 4 ++++
- run_script.php | 10 +++++++++-
- 3 files changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/execute_command.sh b/execute_command.sh
-index 325dcb9..180e71f 100755
---- a/execute_command.sh
-+++ b/execute_command.sh
-@@ -63,7 +63,22 @@ do
- outputfilename=$item
- fi
-
-- if [ $i -gt 1 ]
-+ if [ $i -eq 2 ]
-+ then
-+ program_type=$item
-+ fi
-+
-+ if [ $i -eq 3 ]
-+ then
-+ category=$item
-+ fi
-+
-+ if [ $i -eq 4 ]
-+ then
-+ win_type=$item
-+ fi
-+
-+ if [ $i -gt 4 ]
- then
- touch "lock/"$item
-
-@@ -72,10 +87,32 @@ do
-
- done
-
-+if [ $program_type == gui ]
-+then
-+ /etc/init.d/matrix-gui-2.0 stop
-+
-+ if [ $category == 3d -o $category == multimedia -o $category == touch -o $win_type == null ]
-+ then
-+ /etc/init.d/weston stop
-+ sleep 1
-+ fi
-+fi
-+
- echo "Filename:"$filename
- echo "Output:"$outputfilename
- eval $filename > "tmp/"$outputfilename 2>&1
-
-+if [ $program_type == gui ]
-+then
-+ if [ $category == 3d -o $category == multimedia -o $category == touch -o $win_type == null ]
-+ then
-+ /etc/init.d/weston start
-+ sleep 1
-+ fi
-+
-+ /etc/init.d/matrix-gui-2.0 start
-+fi
-+
- #Using a more unique string to detect if the script is completed
- echo "_?!!MATRIX_SCRIPT_COMPLETED!!?_" >> "tmp/"$outputfilename
-
-diff --git a/generate.php b/generate.php
-index 10cfed4..cd88dd3 100644
---- a/generate.php
-+++ b/generate.php
-@@ -105,6 +105,10 @@ for($x = 0;$x<count($contents)&&strlen($contents[$x])>0;$x++)
- $top["Description_Link"] = get_contents("X-MATRIX-Description",$dotdesktop);
-
- $top["Lock"] = get_contents("X-MATRIX-LOCK",$dotdesktop);
-+
-+ $top["Category"] = get_contents("Categories",$dotdesktop);
-+
-+ $top["WinType"] = get_contents("WinType",$dotdesktop);
- }
-
- if($category == -1)
-diff --git a/run_script.php b/run_script.php
-index 9dd7a10..d34a286 100644
---- a/run_script.php
-+++ b/run_script.php
-@@ -55,6 +55,7 @@ $submenu = isset($_GET["submenu"]) == true ? $_GET["submenu"] : "main_menu" ;
- $found_app = get_application($var,$submenu,$_GET["app"]);
-
- $lock_list = $found_app["Lock"];
-+$win_type = $found_app["WinType"];
-
- //Verify that there is a lock specified for this application
- if($lock_list != -1 )
-@@ -91,7 +92,14 @@ if($currently_locked==false)
- $random_string = strval(rand());
- $random_string .= strval(rand());
-
-- $script_command = "./execute_command.sh \"".addslashes($script_link). "\" ".$random_string.".txt ".$lock_list;
-+ if($win_type != -1 )
-+ {
-+ $script_command = "./execute_command.sh \"".addslashes($script_link). "\" ".$random_string.".txt \"".$found_app["ProgramType"]."\" \"".$found_app["Category"]."\" \"".$found_app["WinType"]."\" ".$lock_list;
-+ }
-+ else
-+ {
-+ $script_command = "./execute_command.sh \"".addslashes($script_link). "\" ".$random_string.".txt \"".$found_app["ProgramType"]."\" \"".$found_app["Category"]."\" \"wayland\" ".$lock_list;
-+ }
-
- $last_line = system($script_command." > /dev/null 2>/dev/null & ", $retval);
- }
-1.9.1
-
deleted file mode 100644
@@ -1,49 +0,0 @@
-#! /bin/sh
-
-matrixgui="/usr/bin/matrix_browser"
-GUI_OPTS="http://localhost:80/ __MATRIX_FLAGS__"
-PIDFILE="/var/run/matrix-gui-2.0.pid"
-
-# Important System Environment Variables
-for sh in /etc/profile.d/*.sh ; do
- [ -r "$sh" ] && . "$sh"
-done
-
-test -x "$matrixgui" || exit 0
-
-case "$1" in
- start)
- __SWITCH_FOREGROUND_VT__
-
- #Clear out the the tmp and lock directory
- cd __MATRIX_WEB_DIR__
- rm -rf tmp/*
- rm -rf lock/*
- cd -
-
- if [ -e $PIDFILE ]; then
- PIDDIR=/proc/$(cat $PIDFILE)
- if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${matrixgui}" ]; then
- echo "$DESC already started; not starting."
- else
- echo "Removing stale PID file $PIDFILE."
- rm -f $PIDFILE
- fi
- fi
-
- echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE --exec $matrixgui -- $GUI_OPTS
- echo "."
- ;;
-
- stop)
- echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile $PIDFILE
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/matrix-gui-2.0 {start|stop}"
- exit 1
-esac
-
-exit 0
deleted file mode 100644
@@ -1,60 +0,0 @@
-#! /bin/sh
-
-matrixgui="/usr/bin/matrix_browser"
-GUI_OPTS="http://localhost:80/ __MATRIX_FLAGS__"
-PIDFILE="/var/run/matrix-gui-2.0.pid"
-
-# Important System Environment Variables
-for sh in /etc/profile.d/*.sh ; do
- [ -r "$sh" ] && . "$sh"
-done
-
-test -x "$matrixgui" || exit 0
-
-case "$1" in
- start)
- chvt 4
-
- #Clear out the the tmp and lock directory
- cd __MATRIX_WEB_DIR__
- rm -rf tmp/*
- rm -rf lock/*
- cd -
-
- if [ -e $PIDFILE ]; then
- PIDDIR=/proc/$(cat $PIDFILE)
- if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${matrixgui}" ]; then
- echo "$DESC already started; not starting."
- else
- echo "Removing stale PID file $PIDFILE."
- rm -f $PIDFILE
- fi
- fi
-
- echo 0 > /sys/class/graphics/fbcon/cursor_blink
- echo -ne "\033[9;0]\033[14;0]" > /dev/tty4
-
- echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE --exec $matrixgui -- $GUI_OPTS
- echo "."
- ;;
-
- stop)
- echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile $PIDFILE
-
- refresh_screen "background-black"
-
- echo -ne "\033[9;10]\033[14;10]" > /dev/tty4
- echo 1 > /sys/class/graphics/fbcon/cursor_blink
-
- chvt 1
-
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/matrix-gui-2.0 {start|stop}"
- exit 1
-esac
-
-exit 0
deleted file mode 100644
@@ -1,18 +0,0 @@
-[Unit]
-Description=Matrix GUI
-After=weston.service lighttpd.service
-Requires=weston.service
-Before=graphical.target
-
-[Service]
-Type=forking
-Restart=no
-TimeoutSec=5min
-IgnoreSIGPIPE=no
-KillMode=process
-GuessMainPID=no
-RemainAfterExit=yes
-ExecStart=/usr/share/matrix-gui-2.0/matrix-gui-2.0 start
-
-[Install]
-WantedBy=multi-user.target
deleted file mode 100644
@@ -1,1342 +0,0 @@
-[PHP]
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini ;
-;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior. In order for PHP to
-; read it, it must be named 'php.ini'. PHP looks for it in the current
-; working directory, in the path designated by the environment variable
-; PHPRC, and in the path that was defined in compile time (in that order).
-; Under Windows, the compile-time path is the Windows directory. The
-; path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
-;
-; The syntax of the file is extremely simple. Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-;
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-;
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-;
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; | bitwise OR
-; & bitwise AND
-; ~ bitwise NOT
-; ! boolean NOT
-;
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-;
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-;
-; foo = ; sets foo to an empty string
-; foo = none ; sets foo to an empty string
-; foo = "none" ; sets foo to the string 'none'
-;
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-;
-;
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-; This is the recommended, PHP 5-style version of the php.ini-dist file. It
-; sets some non standard settings, that make PHP more efficient, more secure,
-; and encourage cleaner coding.
-;
-; The price is that with these settings, PHP may be incompatible with some
-; applications, and sometimes, more difficult to develop with. Using this
-; file is warmly recommended for production sites. As all of the changes from
-; the standard settings are thoroughly documented, you can go over each one,
-; and decide whether you want to use it or not.
-;
-; For general information about the php.ini file, please consult the php.ini-dist
-; file, included in your PHP distribution.
-;
-; This file is different from the php.ini-dist file in the fact that it features
-; different values for several directives, in order to improve performance, while
-; possibly breaking compatibility with the standard out-of-the-box behavior of
-; PHP. Please make sure you read what's different, and modify your scripts
-; accordingly, if you decide to use this file instead.
-;
-; - register_long_arrays = Off [Performance]
-; Disables registration of the older (and deprecated) long predefined array
-; variables ($HTTP_*_VARS). Instead, use the superglobals that were
-; introduced in PHP 4.1.0
-; - display_errors = Off [Security]
-; With this directive set to off, errors that occur during the execution of
-; scripts will no longer be displayed as a part of the script output, and thus,
-; will no longer be exposed to remote users. With some errors, the error message
-; content may expose information about your script, web server, or database
-; server that may be exploitable for hacking. Production sites should have this
-; directive set to off.
-; - log_errors = On [Security]
-; This directive complements the above one. Any errors that occur during the
-; execution of your script will be logged (typically, to your server's error log,
-; but can be configured in several ways). Along with setting display_errors to off,
-; this setup gives you the ability to fully understand what may have gone wrong,
-; without exposing any sensitive information to remote users.
-; - output_buffering = 4096 [Performance]
-; Set a 4KB output buffer. Enabling output buffering typically results in less
-; writes, and sometimes less packets sent on the wire, which can often lead to
-; better performance. The gain this directive actually yields greatly depends
-; on which Web server you're working with, and what kind of scripts you're using.
-; - register_argc_argv = Off [Performance]
-; Disables registration of the somewhat redundant $argv and $argc global
-; variables.
-; - magic_quotes_gpc = Off [Performance]
-; Input data is no longer escaped with slashes so that it can be sent into
-; SQL databases without further manipulation. Instead, you should use the
-; database vendor specific escape string function on each input element you
-; wish to send to a database.
-; - variables_order = "GPCS" [Performance]
-; The environment variables are not hashed into the $_ENV. To access
-; environment variables, you can use getenv() instead.
-; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
-; By default, PHP suppresses errors of type E_NOTICE. These error messages
-; are emitted for non-critical errors, but that could be a symptom of a bigger
-; problem. Most notably, this will cause error messages about the use
-; of uninitialized variables to be displayed.
-; - allow_call_time_pass_reference = Off [Code cleanliness]
-; It's not possible to decide to force a variable to be passed by reference
-; when calling a function. The PHP 4 style to do this is by making the
-; function require the relevant argument by reference.
-; - short_open_tag = Off [Portability]
-; Using short tags is discouraged when developing code meant for redistribution
-; since short tags may not be supported on the target server.
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-engine = On
-
-; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-zend.ze1_compatibility_mode = Off
-
-; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
-; NOTE: Using short tags should be avoided when developing applications or
-; libraries that are meant for redistribution, or deployment on PHP
-; servers which are not under your control, because short tags may not
-; be supported on the target server. For portable, redistributable code,
-; be sure not to use short tags.
-short_open_tag = Off
-
-; Allow ASP-style <% %> tags.
-asp_tags = Off
-
-; The number of significant digits displayed in floating point numbers.
-precision = 14
-
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = On
-
-; Output buffering allows you to send header lines (including cookies) even
-; after you send body content, at the price of slowing PHP's output layer a
-; bit. You can enable output buffering during runtime by calling the output
-; buffering functions. You can also enable output buffering for all files by
-; setting this directive to On. If you wish to limit the size of the buffer
-; to a certain size - you can use a maximum number of bytes instead of 'On', as
-; a value for this directive (e.g., output_buffering=4096).
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function. For
-; example, if you set output_handler to "mb_output_handler", character
-; encoding will be transparently converted to the specified encoding.
-; Setting any output handler automatically turns on output buffering.
-; Note: People who wrote portable scripts should not depend on this ini
-; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script
-; is doing.
-; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-; Instead you must use zlib.output_handler.
-;output_handler =
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-; outputs chunks that are few hundreds bytes each as a result of
-; compression. If you prefer a larger chunk size for better
-; performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-; output_handler, or otherwise the output will be corrupted.
-zlib.output_compression = Off
-;zlib.output_compression_level = -1
-
-; You cannot specify additional output handlers if zlib.output_compression
-; is activated here. This setting does the same as output_handler but in
-; a different order.
-;zlib.output_handler =
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block. This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block. Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-implicit_flush = Off
-
-; The unserialize callback function will be called (with the undefined class'
-; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
-; A warning appears if the specified function is not defined, or if the
-; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
-; callback-function.
-unserialize_callback_func=
-
-; When floats & doubles are serialized store serialize_precision significant
-; digits after the floating point. The default value ensures that when floats
-; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
-
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time. This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend. The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration. You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = Off
-
-;
-; Safe Mode
-;
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-safe_mode_exec_dir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes. In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here. By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-;
-; Note: If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv(). These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below. This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-;open_basedir =
-
-; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_functions =
-
-; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_classes =
-
-; Colors for Syntax Highlighting mode. Anything that's acceptable in
-; <span style="color: ???????"> would work.
-;highlight.string = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html = #000000
-
-; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long request, which may end up
-; being interrupted by the user or a browser timing out.
-; ignore_user_abort = On
-
-; Determines the size of the realpath cache to be used by PHP. This value should
-; be increased on systems where PHP opens many files to reflect the quantity of
-; the file operations performed.
-; realpath_cache_size=16k
-
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-; realpath_cache_ttl=120
-
-;
-; Misc
-;
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header). It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-expose_php = On
-
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-max_execution_time = 30 ; Maximum execution time of each script, in seconds
-max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
-;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 128M ; Maximum amount of memory a script may consume (128MB)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; error_reporting is a bit-field. Or each number up to get desired error
-; reporting level
-; E_ALL - All errors and warnings (doesn't include E_STRICT)
-; E_ERROR - fatal run-time errors
-; E_RECOVERABLE_ERROR - almost fatal run-time errors
-; E_WARNING - run-time warnings (non-fatal errors)
-; E_PARSE - compile-time parse errors
-; E_NOTICE - run-time notices (these are warnings which often result
-; from a bug in your code, but it's possible that it was
-; intentional (e.g., using an uninitialized variable and
-; relying on the fact it's automatically initialized to an
-; empty string)
-; E_STRICT - run-time notices, enable to have PHP suggest changes
-; to your code which will ensure the best interoperability
-; and forward compatibility of your code
-; E_CORE_ERROR - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's
-; initial startup
-; E_COMPILE_ERROR - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR - user-generated error message
-; E_USER_WARNING - user-generated warning message
-; E_USER_NOTICE - user-generated notice message
-;
-; Examples:
-;
-; - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE
-;
-; - Show all errors, except for notices
-;
-;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
-;
-; - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
-;
-; - Show all errors, except coding standards warnings
-;
-error_reporting = E_ALL
-
-; Print out errors (as a part of the output). For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below). Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
-;
-; possible values for display_errors:
-;
-; Off - Do not display any errors
-; stderr - Display errors to STDERR (affects only CGI/CLI binaries!)
-; On or stdout - Display errors to STDOUT (default)
-;
-; To output errors to STDERR with CGI/CLI:
-;display_errors = "stderr"
-;
-; Default
-;
-display_errors = Off
-
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed. It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
-display_startup_errors = Off
-
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
-log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-log_errors_max_len = 1024
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line unless ignore_repeated_source is set true.
-ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; source lines.
-ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
-report_memleaks = On
-
-;report_zend_debug = 0
-
-; Store the last error/warning message in $php_errormsg (boolean).
-track_errors = Off
-
-; Turn off normal error reporting and emit XML-RPC error XML
-;xmlrpc_errors = 0
-; An XML-RPC faultCode
-;xmlrpc_error_number = 0
-
-; Disable the inclusion of HTML tags in error messages.
-; Note: Never use this feature for production boxes.
-;html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot.
-; Note: Never use this feature for production boxes.
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-
-; String to output before an error message.
-;error_prepend_string = "<font color=#ff0000>"
-
-; String to output after an error message.
-;error_append_string = "</font>"
-
-; Log errors to specified file.
-;error_log = filename
-
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-;error_log = syslog
-
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
-; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
-;arg_separator.output = "&"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
-; NOTE: Every character in this directive is considered as separator!
-;arg_separator.input = ";&"
-
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC). Registration is done from left to right, newer
-; values override older values.
-variables_order = "GPCS"
-
-; Whether or not to register the EGPCS variables as global variables. You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data. This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on; Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends. If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information). If you don't use these variables, you
-; should turn it off for increased performance.
-register_argc_argv = Off
-
-; When enabled, the SERVER and ENV variables are created when they're first
-; used (Just In Time) instead of when the script starts. If these variables
-; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
-auto_globals_jit = On
-
-; Maximum size of POST data that PHP will accept.
-post_max_size = 8M
-
-; Magic quotes
-;
-
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
-auto:prepend_file =
-auto_append_file =
-
-; As of 4.0b4, PHP always outputs a character encoding by default in
-; the Content-type: header. To disable sending of the charset, simply
-; set it to be empty.
-;
-; PHP's built-in default is text/html
-default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues. The alternate is to use the
-; cgi.force_redirect configuration below
-doc_root =
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-extension_dir = "./"
-
-; Whether or not to enable the dl() function. The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-enable_dl = On
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers. Left undefined, PHP turns this on by default. You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request.
-; cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution. Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
-
-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
-; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting
-; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting
-; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
-; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
- cgi.fix_pathinfo=1
-
-; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
-; security tokens of the calling client. This allows IIS to define the
-; security context that the request runs under. mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS. Default is zero.
-; fastcgi.impersonate = 1;
-
-; Disable logging through FastCGI connection
-; fastcgi.logging = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-; is supported by Apache. When this option is set to 1 PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-;cgi.rfc2616_headers = 0
-
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-upload_max_filesize = 2M
-
-
-; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 20
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
-
-; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-allow_url_include = Off
-
-; Define the anonymous ftp password (your email address)
-;from="john@doe.com"
-
-; Define the User-Agent string
-; user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
-default_socket_timeout = 60
-
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; auto_detect_line_endings = Off
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-; extension=modulename.extension
-;
-; For example, on Windows:
-;
-; extension=msql.dll
-;
-; ... or under UNIX:
-;
-; extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here. Specify the location of the extension with the
-; extension_dir directive above.
-
-
-; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
-
-;extension=php_bz2.dll
-;extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_gmp.dll
-;extension=php_ifx.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_msql.dll
-;extension=php_mssql.dll
-;extension=php_mysql.dll
-;extension=php_mysqli.dll
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_pdo.dll
-;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
-;extension=php_pdo_mysql.dll
-;extension=php_pdo_oci.dll
-;extension=php_pdo_oci8.dll
-;extension=php_pdo_odbc.dll
-;extension=php_pdo_pgsql.dll
-;extension=php_pdo_sqlite.dll
-;extension=php_pgsql.dll
-;extension=php_pspell.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_soap.dll
-;extension=php_sockets.dll
-;extension=php_sqlite.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-;extension=php_zip.dll
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[Date]
-; Defines the default timezone used by the date functions
-;date.timezone =
-
-;date.default_latitude = 31.7667
-;date.default_longitude = 35.2333
-
-;date.sunrise_zenith = 90.583333
-;date.sunset_zenith = 90.583333
-
-[filter]
-;filter.default = unsafe_raw
-;filter.default_flags =
-
-[iconv]
-;iconv.input_encoding = ISO-8859-1
-;iconv.internal_encoding = ISO-8859-1
-;iconv.output_encoding = ISO-8859-1
-
-[sqlite]
-;sqlite.assoc_case = 0
-
-[Pcre]
-;PCRE library backtracking limit.
-;pcre.backtrack_limit=100000
-
-;PCRE library recursion limit.
-;Please note that if you set this value to a high number you may consume all
-;the available process stack and eventually crash PHP (due to reaching the
-;stack size limit imposed by the Operating System).
-;pcre.recursion_limit=100000
-
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
-[mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me@example.com
-
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
-;sendmail_path =
-
-; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_parameters =
-
-[SQL]
-sql.safe_mode = Off
-
-[ODBC]
-;odbc.default_db = Not yet implemented
-;odbc.default_user = Not yet implemented
-;odbc.default_pw = Not yet implemented
-
-; Allow or prevent persistent links.
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-odbc.check_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
-
-; Handling of LONG fields. Returns number of bytes to variables. 0 means
-; passthru.
-odbc.defaultlrl = 4096
-
-; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQL]
-; Allow or prevent persistent links.
-mysql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mysql.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-mysql.max_links = -1
-
-; Default port number for mysql_connect(). If unset, mysql_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
-mysql.default_port =
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysql.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysql.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysql.default_user =
-
-; Default password for mysql_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysql.default_password =
-
-; Maximum time (in seconds) for connect timeout. -1 means no limit
-mysql.connect_timeout = 60
-
-; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Errors will be displayed.
-mysql.trace_mode = Off
-
-[MySQLi]
-
-; Maximum number of links. -1 means no limit.
-mysqli.max_links = -1
-
-; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
-mysqli.default_port = 3306
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysqli.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_user =
-
-; Default password for mysqli_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysqli.default_pw =
-
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-msql.max_links = -1
-
-[OCI8]
-; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA)
-;oci8.privileged_connect = Off
-
-; Connection: The maximum number of persistent OCI8 connections per
-; process. Using -1 means no limit.
-;oci8.max_persistent = -1
-
-; Connection: The maximum number of seconds a process is allowed to
-; maintain an idle persistent connection. Using -1 means idle
-; persistent connections will be maintained forever.
-;oci8.persistent_timeout = -1
-
-; Connection: The number of seconds that must pass before issuing a
-; ping during oci_pconnect() to check the connection validity. When
-; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
-; pings completely.
-;oci8.ping_interval = 60
-
-; Tuning: This option enables statement caching, and specifies how
-; many statements to cache. Using 0 disables statement caching.
-;oci8.statement_cache_size = 20
-
-; Tuning: Enables statement prefetching and sets the default number of
-; rows that will be fetched automatically after statement execution.
-;oci8.default_prefetch = 10
-
-; Compatibility. Using On means oci_close() will not close
-; oci_connect() and oci_new_connect() connections.
-;oci8.old_oci_close_semantics = Off
-
-[PostgresSQL]
-; Allow or prevent persistent links.
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links. -1 means no limit.
-pgsql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-pgsql.max_links = -1
-
-; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
-pgsql.ignore_notice = 0
-
-; Log PostgreSQL backends Notice message or not.
-; Unless pgsql.ignore_notice=0, module cannot log notice message.
-pgsql.log_notice = 0
-
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = "/usr/sybase/interfaces"
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings. This
-; compatibility mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
-[Sybase-CT]
-; Allow or prevent persistent links.
-sybct.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybct.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybct.max_links = -1
-
-; Minimum server message severity to display.
-sybct.min_server_severity = 10
-
-; Minimum client message severity to display.
-sybct.min_client_severity = 10
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-bcmath.scale = 0
-
-[browscap]
-;browscap = extra/browscap.ini
-
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
-
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
-
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ifx.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-ifx.max_links = -1
-
-; If on, select statements return the contents of a text blob instead of its id.
-ifx.textasvarchar = 0
-
-; If on, select statements return the contents of a byte blob instead of its id.
-ifx.byteasvarchar = 0
-
-; Trailing blanks are stripped from fixed-length char columns. May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
-
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
-
-; NULL's are returned as empty strings, unless this is set to 1. In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
-
-[Session]
-; Handler used to store/retrieve data.
-session.save_handler = files
-
-; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
-;
-; As of PHP 4.0.1, you can define the path as:
-;
-; session.save_path = "N;/path"
-;
-; where N is an integer. Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories. This is useful if you
-; or your OS have problems with lots of files in one directory, and is
-; a more efficient layout for servers that handle lots of sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-; You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-; use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-; session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
-;session.save_path = "/tmp"
-
-; Whether to use cookies.
-session.use_cookies = 1
-
-;session.cookie_secure =
-
-; This option enables administrators to make their users invulnerable to
-; attacks which involve passing session ids in URLs; defaults to 0.
-; session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-session.cookie_domain =
-
-; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
-session.cookie_httponly =
-
-; Handler used to serialize data. php is the standard serializer of PHP.
-session.serialize_handler = php
-
-; Define the probability that the 'garbage collection' process is started
-; on every session initialization.
-; The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts
-; on each request.
-
-session.gc_probability = 1
-session.gc_divisor = 1000
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-; (see session.save_path above), then garbage collection does *not*
-; happen automatically. You will need to do your own garbage
-; collection through a shell script, cron entry, or some other method.
-; For example, the following script would is the equivalent of
-; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-; cd /path/to/sessions; find -cmin +24 | xargs rm
-
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled. PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 0
-session.bug_compat_warn = 1
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-session.referer_check =
-
-; How many bytes to read from the file.
-session.entropy_length = 0
-
-; Specified here to create the session id.
-session.entropy_file =
-
-;session.entropy_length = 16
-
-;session.entropy_file = /dev/urandom
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-; to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-; in publically accessible computer.
-; - User may access your site with the same session ID
-; always using URL stored in browser's history or bookmarks.
-session.use_trans_sid = 0
-
-; Select a hash function
-; 0: MD5 (128 bits)
-; 1: SHA-1 (160 bits)
-session.hash_function = 0
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-;
-; 4 bits: 0-9, a-f
-; 5 bits: 0-9, a-v
-; 6 bits: 0-9, a-z, A-Z, "-", ","
-session.hash_bits_per_character = 5
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; form/fieldset are special; if you include them here, the rewriter will
-; add a hidden <input> field with the info which is otherwise appended
-; to URLs. If you want XHTML conformity, remove the form entry.
-; Note that all valid entries require a "=", even if no value follows.
-url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
-
-[MSSQL]
-; Allow or prevent persistent links.
-mssql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mssql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-mssql.max_links = -1
-
-; Minimum error severity to display.
-mssql.min_error_severity = 10
-
-; Minimum message severity to display.
-mssql.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-mssql.compatability_mode = Off
-
-; Connect timeout
-;mssql.connect_timeout = 5
-
-; Query timeout
-;mssql.timeout = 60
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textlimit = 4096
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textsize = 4096
-
-; Limits the number of records in each batch. 0 = all records in one batch.
-;mssql.batchsize = 0
-
-; Specify how datetime and datetim4 columns are returned
-; On => Returns data converted to SQL server settings
-; Off => Returns values as YYYY-MM-DD hh:mm:ss
-;mssql.datetimeconvert = On
-
-; Use NT authentication when connecting to the server
-mssql.secure_connection = Off
-
-; Specify max number of processes. -1 = library default
-; msdlib defaults to 25
-; FreeTDS defaults to 4096
-;mssql.max_procs = -1
-
-; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
-; This is only used when compiled with FreeTDS
-;mssql.charset = "ISO-8859-1"
-
-[Assertion]
-; Assert(expr); active by default.
-;assert.active = On
-
-; Issue a PHP warning for each failed assertion.
-;assert.warning = On
-
-; Don't bail out by default.
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-;assert.callback = 0
-
-; Eval the expression with current error_reporting(). Set to true if you want
-; error_reporting(0) around the eval().
-;assert.quiet_eval = 0
-
-[COM]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
-; allow Distributed-COM calls
-;com.allow_dcom = true
-; autoregister constants of a components typlib on com_load()
-;com.autoregister_typelib = true
-; register constants casesensitive
-;com.autoregister_casesensitive = false
-; show warnings on duplicate constant registrations
-;com.autoregister_verbose = true
-
-[mbstring]
-; language for internal character representation.
-;mbstring.language = Japanese
-
-; internal/script encoding.
-; Some encoding cannot work as internal encoding.
-; (e.g. SJIS, BIG5, ISO-2022-*)
-;mbstring.internal_encoding = EUC-JP
-
-; http input encoding.
-;mbstring.http_input = auto
-
-; http output encoding. mb_output_handler must be
-; registered as output buffer to function
-;mbstring.http_output = SJIS
-
-; enable automatic encoding translation according to
-; mbstring.internal_encoding setting. Input chars are
-; converted to internal encoding by setting this to On.
-; Note: Do _not_ use automatic encoding translation for
-; portable libs/applications.
-;mbstring.encoding_translation = Off
-
-; automatic encoding detection order.
-; auto means
-;mbstring.detect_order = auto
-
-; substitute_character used when character cannot be converted
-; one from another
-;mbstring.substitute_character = none;
-
-; overload(replace) single byte functions by mbstring functions.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-;mbstring.strict_detection = Off
-
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = "_SYSTEM"
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-
-[gd]
-; Tell the jpeg decode to libjpeg warnings and try to create
-; a gd image. The warning will then be displayed as notices
-; disabled by default
-;gd.jpeg_ignore_warning = 0
-
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-;exif.encode_unicode = ISO-8859-15
-;exif.decode_unicode_motorola = UCS-2BE
-;exif.decode_unicode_intel = UCS-2LE
-;exif.encode_jis =
-;exif.decode_jis_motorola = JIS
-;exif.decode_jis_intel = JIS
-
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
-zlib.output_compression = On
-
-[soap]
-; Enables or disables WSDL caching feature.
-soap.wsdl_cache_enabled=1
-; Sets the directory name where SOAP extension will put cache files.
-soap.wsdl_cache_dir="/tmp"
-; (time to live) Sets the number of second while cached file will be used
-; instead of original one.
-soap.wsdl_cache_ttl=86400
-
-; Local Variables:
-; tab-width: 4
-; End:
deleted file mode 100644
@@ -1,69 +0,0 @@
-DESCRIPTION = "Matrix GUI Application launcher"
-
-LICENSE = "BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d"
-
-SECTION = "multimedia"
-
-PR = "r38"
-
-SYSTEMD_SERVICE:${PN} = "matrix-gui-2.0.service"
-
-SYSTEMD_AUTO_ENABLE:am62xx = "disable"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit systemd
-
-BRANCH ?= "master"
-SRCREV = "9a2d12590102fefc5c29fc9e8d346ce6b0198468"
-
-MATRIX_INITSCRIPT = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'init', 'init.eglfs', d)}"
-
-SRC_URI = "git://git.ti.com/git/matrix-gui-v2/matrix-gui-v2.git;protocol=https;branch=${BRANCH} \
- file://${MATRIX_INITSCRIPT} \
- file://php.ini \
- file://matrix-gui-2.0.service \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
- 'file://0001-execute_command-workaround-for-GUI-apps-with-weston.patch', \
- 'file://0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch', d)} \
-"
-
-require matrix-gui-paths.inc
-
-S = "${WORKDIR}/git"
-
-MATRIX_FLAGS = ""
-SWITCH_FOREGROUND_VT = ""
-
-do_install(){
- install -d ${D}${MATRIX_BASE_DIR}
- install -d ${D}${MATRIX_WEB_DIR}
- cp -rfL ${S}/* ${D}${MATRIX_WEB_DIR}
-
- # Install our php.ini file
- install -m 0644 ${UNPACKDIR}/php.ini ${D}${MATRIX_BASE_DIR}/
-
- # Set the proper path in the init script
- sed -i -e s=__MATRIX_WEB_DIR__=${MATRIX_WEB_DIR}= ${UNPACKDIR}/${MATRIX_INITSCRIPT}
- sed -i -e "s/__MATRIX_FLAGS__/\"${MATRIX_FLAGS}\"/" ${UNPACKDIR}/${MATRIX_INITSCRIPT}
- sed -i -e "s/__SWITCH_FOREGROUND_VT__/${SWITCH_FOREGROUND_VT}/" ${UNPACKDIR}/${MATRIX_INITSCRIPT}
-
- # Install the script
- if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${UNPACKDIR}/${MATRIX_INITSCRIPT} ${D}${sysconfdir}/init.d/matrix-gui-2.0
- fi
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${UNPACKDIR}/matrix-gui-2.0.service ${D}${systemd_system_unitdir}
- install -m 0755 ${UNPACKDIR}/${MATRIX_INITSCRIPT} ${D}${MATRIX_BASE_DIR}/matrix-gui-2.0
- fi
-}
-
-GUIDEPS = "${@bb.utils.contains('DISTRO_FEATURES','opengl',"matrix-gui-browser refresh-screen",'',d)}"
-GUIDEPS:omapl138 = ""
-
-RDEPENDS:${PN} += "matrix-lighttpd-config lighttpd lighttpd-module-cgi lighttpd-module-deflate php php-cgi php-cli ${GUIDEPS}"
-
-FILES:${PN} += "${MATRIX_BASE_DIR}/*"
deleted file mode 100644
@@ -1,33 +0,0 @@
-DESCRIPTION = "Lighttpd config for Matrix"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
-
-inherit allarch
-
-PR = "r2"
-
-SRC_URI = "file://lighttpd.conf.matrix"
-
-# Grabbed COPYING file from lighttpd_1.4.30
-SRC_URI += "file://COPYING"
-
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
-do_install() {
- install -d ${D}${sysconfdir}/lighttpd
- install -m 0644 ${S}/lighttpd.conf.matrix ${D}${sysconfdir}/lighttpd/lighttpd.conf.matrix
-}
-
-FILES:${PN} = "${sysconfdir}/lighttpd/lighttpd.conf.matrix"
-RDEPENDS:${PN} = "lighttpd"
-
-pkg_postinst_ontarget:${PN} () {
-if [ -f ${sysconfdir}/lighttpd/lighttpd.conf ] ; then
- cp ${sysconfdir}/lighttpd/lighttpd.conf.matrix ${sysconfdir}/lighttpd/lighttpd.conf
-else
- echo "No lighttpd.conf found, aborting"
- exit 1
-fi
-}
deleted file mode 100644
@@ -1,31 +0,0 @@
-
-
-Copyright (c) 2004, Jan Kneschke, incremental
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-- Neither the name of the 'incremental' nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
deleted file mode 100755
@@ -1,344 +0,0 @@
-# lighttpd configuration file
-#
-# use it as a base for lighttpd 1.0.0 and above
-#
-# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $
-
-############ Options you really have to take care of ####################
-
-## modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-server.modules = (
-# "mod_rewrite",
-# "mod_redirect",
-# "mod_alias",
- "mod_access",
-# "mod_cml",
-# "mod_trigger_b4_dl",
-# "mod_auth",
-# "mod_status",
- "mod_setenv",
- "mod_expire",
-# "mod_fastcgi",
-# "mod_proxy",
-# "mod_simple_vhost",
-# "mod_evhost",
-# "mod_userdir",
- "mod_cgi",
- "mod_compress"
-# "mod_ssi",
-# "mod_usertrack",
-
-# "mod_secdownload",
-# "mod_rrdtool",
-# "mod_webdav",
-# "mod_accesslog"
- )
-
-## a static document-root, for virtual-hosting take look at the
-## server.virtual-* options
-server.document-root = "/usr/share/matrix-gui-2.0/"
-
-## where to send error-messages to
-#server.errorlog = "/www/logs/lighttpd.error.log"
-
-# files to check for if .../ is requested
-index-file.names = ( "index.php", "index.html",
- "index.htm", "default.htm" )
-
-## set the event-handler (read the performance section in the manual)
-# server.event-handler = "freebsd-kqueue" # needed on OS X
-
-# mimetype mapping
-mimetype.assign = (
- ".pdf" => "application/pdf",
- ".sig" => "application/pgp-signature",
- ".spl" => "application/futuresplash",
- ".class" => "application/octet-stream",
- ".ps" => "application/postscript",
- ".torrent" => "application/x-bittorrent",
- ".dvi" => "application/x-dvi",
- ".gz" => "application/x-gzip",
- ".pac" => "application/x-ns-proxy-autoconfig",
- ".swf" => "application/x-shockwave-flash",
- ".tar.gz" => "application/x-tgz",
- ".tgz" => "application/x-tgz",
- ".tar" => "application/x-tar",
- ".zip" => "application/zip",
- ".mp3" => "audio/mpeg",
- ".m3u" => "audio/x-mpegurl",
- ".wma" => "audio/x-ms-wma",
- ".wax" => "audio/x-ms-wax",
- ".ogg" => "application/ogg",
- ".wav" => "audio/x-wav",
- ".gif" => "image/gif",
- ".jpg" => "image/jpeg",
- ".jpeg" => "image/jpeg",
- ".png" => "image/png",
- ".xbm" => "image/x-xbitmap",
- ".xpm" => "image/x-xpixmap",
- ".xwd" => "image/x-xwindowdump",
- ".css" => "text/css",
- ".html" => "text/html",
- ".htm" => "text/html",
- ".js" => "text/javascript",
- ".asc" => "text/plain",
- ".c" => "text/plain",
- ".cpp" => "text/plain",
- ".log" => "text/plain",
- ".conf" => "text/plain",
- ".text" => "text/plain",
- ".txt" => "text/plain",
- ".dtd" => "text/xml",
- ".xml" => "text/xml",
- ".mpeg" => "video/mpeg",
- ".mpg" => "video/mpeg",
- ".mov" => "video/quicktime",
- ".qt" => "video/quicktime",
- ".avi" => "video/x-msvideo",
- ".asf" => "video/x-ms-asf",
- ".asx" => "video/x-ms-asf",
- ".wmv" => "video/x-ms-wmv",
- ".bz2" => "application/x-bzip",
- ".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
- )
-
-# Use the "Content-Type" extended attribute to obtain mime type if possible
-#mimetype.use-xattr = "enable"
-
-
-## send a different Server: header
-## be nice and keep it at lighttpd
-# server.tag = "lighttpd"
-
-#### accesslog module
-#accesslog.filename = "/www/logs/access.log"
-#debug.log-request-handling = "enable"
-
-
-
-
-## deny access the file-extensions
-#
-# ~ is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-# of the document-root
-url.access-deny = ( "~", ".inc" )
-
-$HTTP["url"] =~ "\.pdf$" {
- server.range-requests = "disable"
-}
-
-##
-# which extensions should not be handle via static-file transfer
-#
-# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-######### Options that are good to be but not neccesary to be changed #######
-
-## bind to port (default: 80)
-server.port = 80
-
-## bind to localhost (default: all interfaces)
-#server.bind = "grisu.home.kneschke.de"
-
-## error-handler for status 404
-#server.error-handler-404 = "/error-handler.html"
-#server.error-handler-404 = "/error-handler.php"
-
-## to help the rc.scripts
-#server.pid-file = "/var/run/lighttpd.pid"
-
-
-###### virtual hosts
-##
-## If you want name-based virtual hosting add the next three settings and load
-## mod_simple_vhost
-##
-## document-root =
-## virtual-server-root + virtual-server-default-host + virtual-server-docroot
-## or
-## virtual-server-root + http-host + virtual-server-docroot
-##
-#simple-vhost.server-root = "/home/weigon/wwwroot/servers/"
-#simple-vhost.default-host = "grisu.home.kneschke.de"
-#simple-vhost.document-root = "/pages/"
-
-
-##
-## Format: <errorfile-prefix><status-code>.html
-## -> ..../status-404.html for 'File not found'
-#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
-
-## virtual directory listings
-#dir-listing.activate = "enable"
-
-## enable debugging
-#debug.log-request-header = "enable"
-#debug.log-response-header = "enable"
-#debug.log-request-handling = "enable"
-#debug.log-file-not-found = "enable"
-
-### only root can use these options
-#
-# chroot() to directory (default: no chroot() )
-#server.chroot = "/"
-
-## change uid to <uid> (default: don't care)
-#server.username = "wwwrun"
-
-## change uid to <uid> (default: don't care)
-#server.groupname = "wwwrun"
-
-#### compress module
-compress.cache-dir = "/tmp/lighttpd/cache/compress/"
-compress.filetype = ("text/plain", "text/html","text/javascript","text/css","image/png","text/php")
-
-#### proxy module
-## read proxy.txt for more info
-#proxy.server = ( ".php" =>
-# ( "localhost" =>
-# (
-# "host" => "192.168.0.101",
-# "port" => 80
-# )
-# )
-# )
-
-
-
-#### fastcgi module
-## read fastcgi.txt for more info
-## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
-#fastcgi.server = ( ".php" =>
-# ( "localhost" =>
-# (
-# "socket" => "/tmp/php-fastcgi.socket",
-# "bin-path" => "/usr/bin/php-cgi -n -c /usr/share/matrix-gui-2.0/php.ini"
-# )
-# )
-# )
-
-#### CGI module
-cgi.assign = ( ".php" => "/usr/bin/php-cgi", ".out" => "" )
-#cgi.assign = ( ".pl" => "/usr/bin/perl",
-# ".cgi" => "/usr/bin/perl" )
-#
-
-#### SSL engine
-#ssl.engine = "enable"
-#ssl.pemfile = "server.pem"
-
-#### status module
-#status.status-url = "/server-status"
-#status.config-url = "/server-config"
-
-#### auth module
-## read authentication.txt for more info
-#auth.backend = "plain"
-#auth.backend.plain.userfile = "lighttpd.user"
-#auth.backend.plain.groupfile = "lighttpd.group"
-
-#auth.backend.ldap.hostname = "localhost"
-#auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
-#auth.backend.ldap.filter = "(uid=$)"
-
-#auth.require = ( "/server-status" =>
-# (
-# "method" => "digest",
-# "realm" => "download archiv",
-# "require" => "user=jan"
-# ),
-# "/server-config" =>
-# (
-# "method" => "digest",
-# "realm" => "download archiv",
-# "require" => "valid-user"
-# )
-# )
-
-#### url handling modules (rewrite, redirect, access)
-#url.rewrite = ( "^/$" => "/server-status" )
-#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
-
-#### both rewrite/redirect support back reference to regex conditional using %n
-#$HTTP["host"] =~ "^www\.(.*)" {
-# url.redirect = ( "^/(.*)" => "http://%1/$1" )
-#}
-
-#
-# define a pattern for the host url finding
-# %% => % sign
-# %0 => domain name + tld
-# %1 => tld
-# %2 => domain name without tld
-# %3 => subdomain 1 name
-# %4 => subdomain 2 name
-#
-#evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
-
-#### expire module
-#expire.url = ( "/images/" => "access 2 hours", "/css/" => "access plus 1 seconds 2 minutes")
-$HTTP["url"] =~ "\.(jpg|gif|png)$" { expire.url = ( "" => "access 3 years" ) }
-
-#### ssi
-#ssi.extension = ( ".shtml" )
-
-#### rrdtool
-#rrdtool.binary = "/usr/bin/rrdtool"
-#rrdtool.db-name = "/var/www/lighttpd.rrd"
-
-#### setenv
-#setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" )
-#setenv.add-response-header = ( "X-Secret-Message" => "42" )
-setenv.add-environment = (
- "PATH" => "/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:."
-)
-
-## for mod_trigger_b4_dl
-# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
-# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
-# trigger-before-download.trigger-url = "^/trigger/"
-# trigger-before-download.download-url = "^/download/"
-# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
-# trigger-before-download.trigger-timeout = 10
-
-## for mod_cml
-## don't forget to add index.cml to server.indexfiles
-# cml.extension = ".cml"
-# cml.memcache-hosts = ( "127.0.0.1:11211" )
-
-#### variable usage:
-## variable name without "." is auto prefixed by "var." and becomes "var.bar"
-#bar = 1
-#var.mystring = "foo"
-
-## integer add
-#bar += 1
-## string concat, with integer cast as string, result: "www.foo1.com"
-#server.name = "www." + mystring + var.bar + ".com"
-## array merge
-#index-file.names = (foo + ".php") + index-file.names
-#index-file.names += (foo + ".php")
-
-#### include
-#include /etc/lighttpd/lighttpd-inc.conf
-## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
-#include "lighttpd-inc.conf"
-
-#### include_shell
-#include_shell "echo var.a=1"
-## the above is same as:
-#var.a=1
-
-
-###Franklin
-etag.use-inode = "enable"
-etag.use-mtime = "enable"
-etag.use-size = "enable"
-static-file.etags = "enable"
deleted file mode 100644
@@ -1,20 +0,0 @@
-DESCRIPTION = "Simple Application to force a screen refresh"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18"
-SECTION = "multimedia"
-
-inherit qt5
-
-PR = "r9"
-
-SRCREV = "4c8817e28ceed2dd886761e3ec1971b11436ba33"
-BRANCH ?= "master"
-
-SRC_URI = "git://git.ti.com/git/matrix-gui-v2/refresh-screen.git;protocol=https;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 0755 ${B}/refresh_screen ${D}/${bindir}
-}
@@ -21,8 +21,6 @@ IMAGE_INSTALL += "\
${@['','packagegroup-arago-tisdk-opencl'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
- packagegroup-arago-tisdk-matrix \
- packagegroup-arago-tisdk-matrix-extra \
packagegroup-arago-tisdk-multimedia \
packagegroup-arago-tisdk-addons \
packagegroup-arago-tisdk-addons-extra \
deleted file mode 100644
@@ -1,197 +0,0 @@
-DESCRIPTION = "Task to include Matrix v2"
-LICENSE = "MIT"
-PR = "r81"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-PACKAGES =+ "${PN}-extra"
-
-MATRIX_ESSENTIALS = " \
- matrix-gui \
- matrix-lighttpd-config \
-"
-
-MATRIX_GUI = " \
- refresh-screen \
- matrix-gui-browser \
-"
-MATRIX_GUI:omapl138 = ""
-
-MATRIX_COMMON_APPS = " \
- matrix-gui-armbenchmarks-demos \
- matrix-gui-crypto-demos \
- matrix-gui-oprofile-demos \
- matrix-gui-settings-demos \
- matrix-gui-usb-demos \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'matrix-gui-weston-terminal-demo', '', d)} \
-"
-
-MATRIX_QT_APPS = " \
- matrix-qt5-demo-animated \
- matrix-qt5-demo-webkit-browser \
- matrix-qt5-demo-calculator \
- matrix-qt5-demo-deform \
- matrix-gui-thermostat-demo \
-"
-
-MATRIX_QT_APPS:append:omap-a15 = " \
- matrix-analytics-pdm-anomaly-detection \
- matrix-hmi-demo-evse \
- matrix-hmi-demo-mmwavegesture \
-"
-
-MATRIX_QT_APPS:append:am65xx = " \
- matrix-analytics-pdm-anomaly-detection \
- \
- matrix-hmi-demo-evse \
- matrix-hmi-demo-mmwavegesture \
-"
-
-MATRIX_QT_APPS:append:ti33x = " \
- matrix-analytics-pdm-anomaly-detection \
- matrix-hmi-demo-evse \
- matrix-hmi-demo-protection-relays \
- matrix-hmi-demo-mmwavegesture \
-"
-
-MATRIX_QT_APPS:append:ti43x = " \
- matrix-analytics-pdm-anomaly-detection \
- matrix-gui-apps-image-gallery \
- \
- matrix-hmi-demo-evse \
- matrix-hmi-demo-mmwavegesture \
-"
-
-MATRIX_TOUCH_APPS = " \
- ${@bb.utils.contains('MACHINE_FEATURES','touchscreen','matrix-gui-touch-demos','',d)} \
-"
-
-MATRIX_GPU_DEMOS = " \
- matrix-3d-demo-kmscube \
-"
-
-MATRIX_GPU_DEMOS:append:omap-a15 = " \
- matrix-3d-demo-kmscubevideo \
-"
-
-MATRIX_GPU_DEMOS:omapl138 = ""
-
-MATRIX_OPENCL_APPS = " \
- matrix-opencl-demo-floatcompute \
- matrix-opencl-demo-vecadd \
-"
-
-MATRIX_OPENCL_APPS:append:dra7xx = " \
- matrix-video-analytics-opencv-opencl-opengl-demo \
- matrix-machinevision-demo-dlp3dscanner \
-"
-
-MATRIX_OPENCV_ARM_ONLY_APPS = " \
- matrix-machinevision-demo-barcoderoi \
- matrix-machinevision-demo-simplepeopletracking \
-"
-
-MATRIX_OPENCV_OPENCL_APPS = " \
- matrix-machinevision-demo-barcoderoi-f2f \
-"
-
-MATRIX_OPENCV_OPENCL_APPS:omap-a15 = " \
- matrix-machinevision-demo-barcoderoi \
- matrix-machinevision-demo-simplepeopletracking \
-"
-
-MATRIX_APPS = ""
-
-MATRIX_APPS:append:ti33x = " \
- matrix-multimedia-demo-aac \
- matrix-multimedia-demo-audiocapture \
- matrix-multimedia-demo-h264dec \
- matrix-multimedia-demo-mpeg4aacdec \
- matrix-multimedia-demo-mpeg4dec \
- \
- matrix-gui-generic-pm \
- matrix-gui-pm-demos-suspend \
- matrix-gui-clocks \
- matrix-gui-pm-demos-governor \
- \
- matrix-gui-ethernet-demos \
- \
- ${MATRIX_OPENCV_ARM_ONLY_APPS} \
-"
-
-MATRIX_APPS:append:ti43x = " \
- matrix-multimedia-demo-aac \
- matrix-multimedia-demo-audiocapture \
- matrix-multimedia-demo-h264dec \
- matrix-multimedia-demo-mpeg4aacdec \
- matrix-multimedia-demo-mpeg4dec \
- \
- matrix-gui-generic-pm \
- matrix-gui-pm-demos-suspend \
- matrix-gui-clocks \
- matrix-gui-pm-demos-governor \
- \
- ${MATRIX_OPENCV_ARM_ONLY_APPS} \
-"
-
-MATRIX_APPS:append:omap-a15 = " \
- matrix-multimedia-demo-aac \
- matrix-multimedia-demo-audiocapture \
- matrix-multimedia-demo-h265dec \
- \
- ${@bb.utils.contains('MACHINE_FEATURES','mmip','matrix-multimedia-demo-ivahdh264dec','matrix-multimedia-demo-h264dec',d)} \
- ${@bb.utils.contains('MACHINE_FEATURES','mmip','matrix-multimedia-demo-ivahdh264enc','',d)} \
- ${@bb.utils.contains('MACHINE_FEATURES','mmip','matrix-multimedia-demo-ivahdmjpegenc','',d)} \
- ${@bb.utils.contains('MACHINE_FEATURES','mmip','matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec','',d)} \
- ${@bb.utils.contains('MACHINE_FEATURES','mmip','','matrix-multimedia-demo-mpeg4aacdec',d)} \
- ${@bb.utils.contains('MACHINE_FEATURES','mmip','','matrix-multimedia-demo-mpeg4dec',d)} \
- \
- matrix-gui-generic-pm \
- matrix-gui-clocks \
- matrix-gui-pm-demos-governor \
-"
-
-# ${@['','matrix-gui-browser-demos'][bb.utils.contains('DISTRO_FEATURES','opengl',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \
-# \
-#
-
-MATRIX_APPS:append:am65xx = " \
- matrix-multimedia-demo-aac \
- matrix-multimedia-demo-audiocapture \
- matrix-multimedia-demo-h264dec \
- matrix-multimedia-demo-mpeg4aacdec \
- matrix-multimedia-demo-mpeg4dec \
- \
- ${MATRIX_OPENCV_ARM_ONLY_APPS} \
-"
-
-MATRIX_APPS:append:dra7xx = " \
- matrix-multimedia-demo-dsp66imgproc \
- matrix-tidl-demo-staticimg \
- matrix-tidl-demo-pnexamples \
- matrix-tidl-demo-livecam \
- matrix-tidl-demo-livecam-lg2 \
- matrix-tidl-demo-staticimg-lg2 \
- matrix-tidl-demo-staticimg-dsponly \
- matrix-tidl-demo-objdet \
- matrix-tidl-demo-objdet-livecam \
- matrix-tidl-demo-segment \
- matrix-tidl-demo-dogbreeds \
-"
-
-RDEPENDS:${PN} = " \
- ${MATRIX_ESSENTIALS} \
- ${MATRIX_APPS} \
- ${MATRIX_COMMON_APPS} \
- ${@bb.utils.contains('MACHINE_FEATURES','touchscreen',"${MATRIX_TOUCH_APPS}",'',d)} \
- ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${MATRIX_GUI}",'',d)} \
- ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${MATRIX_QT_APPS}",'',d)} \
- ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${MATRIX_GPU_DEMOS}",'',d)} \
- ${@['',"${MATRIX_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
-"
-
-RDEPENDS:${PN}-extra = " \
- ${@['',"${MATRIX_OPENCV_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
-"
@@ -14,16 +14,6 @@ MULTIMEDIA = " \
MULTIMEDIA:omapl138 = ""
-IMAGE_GALLERY_DEMO = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'image-gallery', '', d)}"
-
-MULTIMEDIA:append:ti43x = " \
- ${IMAGE_GALLERY_DEMO} \
-"
-
-MULTIMEDIA:append:omap-a15 = " \
- ${IMAGE_GALLERY_DEMO} \
-"
-
MULTIMEDIA:append:dra7xx = " \
vis \
hevc-arm-decoder \
@@ -18,5 +18,4 @@ RDEPENDS:${PN} = "\
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
qtserialport-examples \
qtcharts-examples \
- qt-tstat \
"
@@ -48,8 +48,6 @@ RDEPENDS:${PN} = "\
${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
- packagegroup-arago-tisdk-matrix \
- packagegroup-arago-tisdk-matrix-extra \
packagegroup-arago-tisdk-multimedia \
packagegroup-arago-tisdk-addons \
packagegroup-arago-tisdk-addons-extra \
deleted file mode 100644
@@ -1,55 +0,0 @@
-From 48350388ab4cb8a0965e7a3f8630bc3f3e3c8d7b Mon Sep 17 00:00:00 2001
-From: Franklin S Cooper Jr <fcooper@ti.com>
-Date: Mon, 20 Aug 2012 07:16:18 -0500
-Subject: [PATCH] php-native: Fix host contamination issue
-
-* Within ext/iconv/config.m4 there is a check in place to try to locate
- particular header files and if the header files aren't found then a
- default location is used (/usr/). Both the CFLAGS and LDFLAGS have this
- default location added to it. This leads to a host contamination issue
- which propagates to the rest of the entire config/build since CFLAGS and
- LDFLAGS will use the host's include and lib directory as the first place
- to check.
-
-* This issue was discovered when the configure was failing due to seeing the
- following error in the config.log:
- <path to work dir>/sysroots/x86_64-linux/usr/lib/libxml2.so: undefined reference to
- gzopen64@ZLIB_1.2.3.3. The /usr/lib directory in /sysroots/x86_64-linux
- contained zlib 1.2.6 while my host (Ubuntu 10.04) /usr/lib directory had
- zlib 1.2.3.3
-
-* Deleting the two lines solves that alter the CFLAGS and LDFLAGS fixes this
- issue. This isn't a valid fix for PHP but should work for OE.
-
-* This issue is in the latest 5.3.x version of php and possibly under 5.4.x.
-
-* Below contains several bug reports that seem to be based on this same issue:
- https://bugs.php.net/bug.php?id=53443
- https://bugs.php.net/bug.php?id=61130
- https://bugs.php.net/bug.php?id=53442
- None of the suggested fixes seem valid since /usr/ and /usr/local should never
- be considered a proper default location. A similar type of check is done in
- several other ext but for some reason only this issue shows up.
-
-Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
----
- ext/iconv/config.m4 | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
-index 13e0371..41c2db9 100644
---- a/ext/iconv/config.m4
-+++ b/ext/iconv/config.m4
-@@ -28,9 +28,6 @@ if test "$PHP_ICONV" != "no"; then
- PHP_ICONV_PREFIX="$ICONV_DIR"
- fi
-
-- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
-- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
--
- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
- else
-1.7.0.4
-
deleted file mode 100644
@@ -1,29 +0,0 @@
-# look for files in this layer first
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-PR:append = ".arago1"
-
-SRC_URI:append:virtclass-native = " file://0001-php-native-Fix-host-contamination-issue.patch"
-
-# Work around to address the fact that php-fpm and php-cgi can not coexist
-# php-cgi is used by Matrix and php-fpm is in beta for this version of php.
-# Once this issue is fix in meta-oe the below won't be needed.
-# Issue mentioned here: https://bugs.php.net/bug.php?id=60144
-
-EXTRA_OECONF:remove = "--enable-fpm"
-EXTRA_OECONF:append = " --disable-fpm"
-
-PACKAGES:remove = "${PN}-fpm"
-PACKAGES:remove = "${PN}-fpm-apache2"
-
-SYSTEMD_PACKAGES:remove = "${PN}-fpm"
-INITSCRIPT_PACKAGES:remove = "${PN}-fpm"
-
-do_install:prepend:pn-php() {
- # Add the below file even though we aren't going to use it.
- # do_install will complain and fail if this file isn't found.
- mkdir -p ${B}/sapi/fpm/
- touch ${B}/sapi/fpm/init.d.php-fpm
-}
-
-INSANE_SKIP:${PN} += "installed-vs-shipped"