From 40d9d7038ce686492d58b0b3c8b12f1b9265e6f6 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 7 Aug 2022 20:24:47 +0200 Subject: [PATCH 01/25] =?UTF-8?q?[autopatch]=20Add=20Common=20Platform?= =?UTF-8?q?=C2=A0Enumeration=20id=20to=20`manifest.json`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index ab1f7bf..c699962 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,8 @@ "license": "GPL-2.0", "website": "https://kodi.tv", "admindoc": "https://kodi.wiki/view/Main_Page", - "code": "https://github.com/xbmc" + "code": "https://github.com/xbmc", + "cpe": "cpe:2.3:a:kodi:kodi" }, "license": "GPL-2.0", "maintainer": { @@ -28,7 +29,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" From 0bfebb3cd4ca0fc9bf89d1c4d22072d6ea0ac957 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 Sep 2022 20:59:32 +0000 Subject: [PATCH 02/25] Auto-update README --- README.md | 20 ++++++++++---------- README_fr.md | 28 ++++++++++++++++------------ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index a18f4d2..51d4760 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Kodi for YunoHost -[![Integration level](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![Working status](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) [![Install Kodi with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kodi) *[Lire ce readme en français.](./README_fr.md)* @@ -21,28 +21,28 @@ Kodi is a media center and entertainment hub that brings all your digital media **Shipped version:** 19.1~ynh1 - ## Screenshots -![](./doc/screenshots/screenshot1.gif) +![Screenshot of Kodi](./doc/screenshots/screenshot1.gif) ## Documentation and resources -* Official app website: https://kodi.tv -* Official admin documentation: https://kodi.wiki/view/Main_Page -* Upstream app code repository: https://github.com/xbmc -* YunoHost documentation for this app: https://yunohost.org/app_kodi -* Report a bug: https://github.com/YunoHost-Apps/kodi_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/kodi_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/kodi_ynh/tree/testing --debug or sudo yunohost app upgrade kodi -u https://github.com/YunoHost-Apps/kodi_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 272adf5..042383f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Kodi pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) [![Installer Kodi avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kodi) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Kodi rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -14,31 +18,31 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Kodi is a media center and entertainment hub that brings all your digital media together. It is 100% free and open source, very customisable and runs on a wide variety of devices. Users can play and view most videos, music, podcasts, games and other digital media files from local and network storage media and the internet. -**Version incluse :** 19.1~ynh1 - +**Version incluse :** 19.1~ynh1 ## Captures d'écran -![](./doc/screenshots/screenshot1.gif) +![Capture d'écran de Kodi](./doc/screenshots/screenshot1.gif) ## Documentations et ressources -* Site officiel de l'app : https://kodi.tv -* Documentation officielle de l'admin : https://kodi.wiki/view/Main_Page -* Dépôt de code officiel de l'app : https://github.com/xbmc -* Documentation YunoHost pour cette app : https://yunohost.org/app_kodi -* Signaler un bug : https://github.com/YunoHost-Apps/kodi_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/kodi_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/kodi_ynh/tree/testing --debug ou sudo yunohost app upgrade kodi -u https://github.com/YunoHost-Apps/kodi_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From e28aa783592383d3a18b50748e10954fc037032a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 5 Jul 2023 00:42:23 +0200 Subject: [PATCH 03/25] [autopatch] Fix Host and X-Forwarded-For header spoofing --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d76ee1d..ccd4528 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__/; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Scheme $scheme; proxy_set_header Upgrade $http_upgrade; From c3222091dac067e480abf2c60fbe01ba844df9af Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 4 Jul 2023 22:42:26 +0000 Subject: [PATCH 04/25] Auto-update README --- README.md | 4 ++-- README_fr.md | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 51d4760..80199a7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Kodi for YunoHost -[![Integration level](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![Working status](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![Working status](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) + [![Install Kodi with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kodi) *[Lire ce readme en français.](./README_fr.md)* @@ -20,7 +21,6 @@ Kodi is a media center and entertainment hub that brings all your digital media **Shipped version:** 19.1~ynh1 - ## Screenshots ![Screenshot of Kodi](./doc/screenshots/screenshot1.gif) diff --git a/README_fr.md b/README_fr.md index 042383f..9641e6f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,31 +5,31 @@ It shall NOT be edited by hand. # Kodi pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/kodi.svg)](https://dash.yunohost.org/appci/app/kodi) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/kodi.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/kodi.maintain.svg) + [![Installer Kodi avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kodi) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Kodi rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Kodi rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Kodi is a media center and entertainment hub that brings all your digital media together. It is 100% free and open source, very customisable and runs on a wide variety of devices. Users can play and view most videos, music, podcasts, games and other digital media files from local and network storage media and the internet. -**Version incluse :** 19.1~ynh1 +**Version incluse :** 19.1~ynh1 +## Captures d’écran -## Captures d'écran - -![Capture d'écran de Kodi](./doc/screenshots/screenshot1.gif) +![Capture d’écran de Kodi](./doc/screenshots/screenshot1.gif) ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -45,4 +45,4 @@ ou sudo yunohost app upgrade kodi -u https://github.com/YunoHost-Apps/kodi_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 541c063569893644cf9dda3ed6727c95bde58b60 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 23:13:49 +0200 Subject: [PATCH 05/25] fix --- conf/systemd.service | 2 +- manifest.json | 2 +- scripts/install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 69dd552..5e84458 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Kodi Media Center +Description=Kodi: Media Center # if you don't need the MySQL DB backend, this should be sufficient After=systemd-user-sessions.service network.target sound.target diff --git a/manifest.json b/manifest.json index c699962..ffaeca2 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "url": "blog.cecchettosylvain.fr" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 445936d..1ceab68 100644 --- a/scripts/install +++ b/scripts/install @@ -160,7 +160,7 @@ ynh_script_progression --message="Securing files and directories..." chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" -usermod -a -G cdrom,audio,video,plugdev,users,dialout,dip,input,netdev "$app" +usermod -a -G cdrom,audio,video,plugdev,users,dialout,dip,input "$app" #================================================= # INTEGRATE SERVICE IN YUNOHOST From dd001ab11bc1ae42003f77125a3e0a64256f9e34 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 23:14:30 +0200 Subject: [PATCH 06/25] Update install --- scripts/install | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/install b/scripts/install index 1ceab68..902b4e9 100644 --- a/scripts/install +++ b/scripts/install @@ -182,11 +182,6 @@ ynh_systemd_action --service_name=$app --action="start" #================================================= ynh_script_progression --message="Configuring permissions..." -ynh_app_setting_set "$app" protected_uris "/" - -domainregex=$(echo "$domain" | sed 's/-/\%&/g') -ynh_app_setting_set "$app" skipped_regex "$domainregex/jsonrpc.*$,$domainregex/image.*$" - # Make app public if necessary if [ $is_public -eq 1 ] then From 0bafdc31eb3510f7bf667df7a9944f80b09fdd53 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 31 Aug 2023 23:09:24 +0200 Subject: [PATCH 07/25] Yoloattempt to add samba-common-bin as dep, which should install command nmblookup which seems to be required somehow --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e5be016..7062bbf 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="xorg xinit dbus-x11 kodi" -arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi" +arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi samba-common-bin" package_check_dependencies="xserver-xorg-video-dummy" From 7e71dc1e7658516dfe0177cd06d86862e4f7f348 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 31 Aug 2023 23:29:02 +0200 Subject: [PATCH 08/25] (same as previous commit) --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7062bbf..15ac25c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="xorg xinit dbus-x11 kodi" +pkg_dependencies="xorg xinit dbus-x11 kodi samba-common-bin" arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi samba-common-bin" From b3601b761e354af3b166110d0c177a155c227c87 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 31 Aug 2023 23:37:54 +0200 Subject: [PATCH 09/25] Dunno what I'm doing but sounds like we might need the libvdpau1 package ... --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 15ac25c..93e3b79 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="xorg xinit dbus-x11 kodi samba-common-bin" arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi samba-common-bin" -package_check_dependencies="xserver-xorg-video-dummy" +package_check_dependencies="xserver-xorg-video-dummy libvdpau1" #================================================= # PERSONAL HELPERS From db843d3d84cb937506016125d4619877bb95afc5 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 00:03:10 +0200 Subject: [PATCH 10/25] hmmmm idk let's try to install vlc to get the proper drivers somehow ... --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 93e3b79..f941d9c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="xorg xinit dbus-x11 kodi samba-common-bin" arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi samba-common-bin" -package_check_dependencies="xserver-xorg-video-dummy libvdpau1" +package_check_dependencies="xserver-xorg-video-dummy vlc" #================================================= # PERSONAL HELPERS From d76715371f029e60705f05ffd089973265f2e56e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 00:09:47 +0200 Subject: [PATCH 11/25] @_@ --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f941d9c..cfb5eac 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="xorg xinit dbus-x11 kodi samba-common-bin" arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi samba-common-bin" -package_check_dependencies="xserver-xorg-video-dummy vlc" +package_check_dependencies="xserver-xorg-video-dummy nvidia-libvdpau" #================================================= # PERSONAL HELPERS From e77819db6f81d6b270c6286b6b45583b8f099ac2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 00:15:01 +0200 Subject: [PATCH 12/25] =?UTF-8?q?@=5F@=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 902b4e9..c421ddb 100644 --- a/scripts/install +++ b/scripts/install @@ -85,6 +85,7 @@ ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="nvidia-vdpau-driver" pkg_dependencies="$pkg_dependencies $package_check_dependencies" fi From b3c5ea95d9fe79b7f4a8765313ff452347607d1d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 00:15:17 +0200 Subject: [PATCH 13/25] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index cfb5eac..15ac25c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="xorg xinit dbus-x11 kodi samba-common-bin" arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi samba-common-bin" -package_check_dependencies="xserver-xorg-video-dummy nvidia-libvdpau" +package_check_dependencies="xserver-xorg-video-dummy" #================================================= # PERSONAL HELPERS From d1fc33033129f0725d2deb8fd0125aa7d844edf8 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 00:25:58 +0200 Subject: [PATCH 14/25] =?UTF-8?q?@=5F@=C2=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c421ddb..177187a 100644 --- a/scripts/install +++ b/scripts/install @@ -85,7 +85,7 @@ ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then - ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="nvidia-vdpau-driver" + ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="nvidia-vdpau-driver nvidia-installer-cleanup nvidia-legacy-check libvdpau1 nvidia-alternative" pkg_dependencies="$pkg_dependencies $package_check_dependencies" fi From 1c0b190d702942013ea3b0f4d14e34154633b0ff Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 00:35:42 +0200 Subject: [PATCH 15/25] =?UTF-8?q?@=5F@=E2=81=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 177187a..d2999be 100644 --- a/scripts/install +++ b/scripts/install @@ -85,7 +85,7 @@ ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then - ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="nvidia-vdpau-driver nvidia-installer-cleanup nvidia-legacy-check libvdpau1 nvidia-alternative" + ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) contrib non-free" --package="nvidia-vdpau-driver nvidia-installer-cleanup nvidia-legacy-check libvdpau1 nvidia-alternative" pkg_dependencies="$pkg_dependencies $package_check_dependencies" fi From 2d9f6632597a26c98921a24bbceaba6775827a5e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 01:11:21 +0200 Subject: [PATCH 16/25] ihavenoideawhatimdoing.jpg --- conf/systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/systemd.service b/conf/systemd.service index 5e84458..b07bb99 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -13,6 +13,7 @@ Type=simple User=__APP__ Group=__APP__ #PAMName=login # you might want to try this one, did not work on all systems +Environment="LIBVA_DRIVER_NAME=nvidia" # FIXME : Hmmm this should only be needed for package check context I think ? ExecStart=/usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/kodi -- :0 -nolisten tcp vt7 Restart=on-abort RestartSec=5 From b28ac2e3bd2a2dd3946fb10a9b1157d0173583d0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 01:40:56 +0200 Subject: [PATCH 17/25] =?UTF-8?q?ihavenoideawhatimdoing.jpg=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/xorg.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/xorg.conf b/conf/xorg.conf index d5f88b6..3b2c660 100644 --- a/conf/xorg.conf +++ b/conf/xorg.conf @@ -17,5 +17,6 @@ Section "Screen" SubSection "Display" Depth 24 Modes "1024x800" + Gamma 1:1:1 EndSubSection -EndSection \ No newline at end of file +EndSection From 285066aca1563e1b2901dee417909f4bbaff1fa5 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 01:48:55 +0200 Subject: [PATCH 18/25] =?UTF-8?q?ihavenoideawhatimdoing.jpg=C2=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/xorg.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/xorg.conf b/conf/xorg.conf index 3b2c660..7fad607 100644 --- a/conf/xorg.conf +++ b/conf/xorg.conf @@ -7,6 +7,7 @@ Section "Monitor" Identifier "Configured Monitor" HorizSync 31.5-48.5 VertRefresh 50-70 + Gamma 1 1 1 EndSection Section "Screen" @@ -17,6 +18,5 @@ Section "Screen" SubSection "Display" Depth 24 Modes "1024x800" - Gamma 1:1:1 EndSubSection EndSection From 1ca817ddd88ca9b3e82fde97ef2f2f8837d7e6a1 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 02:07:57 +0200 Subject: [PATCH 19/25] Update dummy xorg.conf --- conf/xorg.conf | 154 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 141 insertions(+), 13 deletions(-) diff --git a/conf/xorg.conf b/conf/xorg.conf index 7fad607..451ba68 100644 --- a/conf/xorg.conf +++ b/conf/xorg.conf @@ -1,22 +1,150 @@ +# Taken from https://gist.github.com/divinity76/ce210b5dbcd9ea7d0585ac403caef577 + +Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" +EndSection + +Section "InputDevice" + Identifier "dummy_mouse" + Option "CorePointer" "true" + Driver "void" +EndSection + +Section "InputDevice" + Identifier "dummy_keyboard" + Option "CoreKeyboard" "true" + Driver "void" +EndSection + Section "Device" - Identifier "Configured Video Device" - Driver "dummy" + Identifier "dummy_videocard" + Driver "dummy" + Option "ConstantDPI" "true" + #VideoRam 4096000 + #VideoRam 256000 + VideoRam 192000 EndSection Section "Monitor" - Identifier "Configured Monitor" - HorizSync 31.5-48.5 - VertRefresh 50-70 - Gamma 1 1 1 + Identifier "dummy_monitor" + HorizSync 5.0 - 1000.0 + VertRefresh 5.0 - 200.0 + #To add your own modes here, use a modeline calculator, like: + #http://xtiming.sourceforge.net/cgi-bin/xtiming.pl + #or using the "gtf" command line tool (http://gtf.sourceforge.net/) + + #This can be used to get a specific DPI, but only for the default resolution: + #DisplaySize 508 317 + #NOTE: the highest modes will not work without increasing the VideoRam + # for the dummy video card. + Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953 + Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478 + Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602 + Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301 + Modeline "6400x2160" 160.51 6400 6432 7040 7072 2160 2212 2216 2269 + Modeline "5680x1440" 142.66 5680 5712 6248 6280 1440 1474 1478 1513 + Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261 + Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135 + Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261 + Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361 + Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261 + Modeline "4720x3840" 227.86 4720 4752 5616 5648 3840 3933 3940 4033 + Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025 + Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689 + Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151 + Modeline "3840x1200" 108.89 3840 3872 4280 4312 1200 1228 1232 1261 + Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093 + Modeline "3864x1050" 338.00 3864 4112 4520 5176 1050 1053 1063 1089 + Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214 + Modeline "3600x1080" 91.02 3600 3632 3976 4008 1080 1105 1109 1135 + Modeline "3520x1196" 99.53 3520 3552 3928 3960 1196 1224 1228 1256 + Modeline "3360x1050" 293.75 3360 3576 3928 4496 1050 1053 1063 1089 + Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135 + Modeline "3120x1050" 272.75 3120 3320 3648 4176 1050 1053 1063 1089 + Modeline "2728x1680" 148.02 2728 2760 3320 3352 1680 1719 1726 1765 + Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151 + Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554 + Modeline "2048x1152" 197.97 2048 2184 2408 2768 1152 1153 1156 1192 + Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681 + Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513 + Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457 + Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261 + Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135 + Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103 + Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261 + Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946 + Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946 + ModeLine "1366x768" 72.00 1366 1414 1446 1494 768 771 777 803 + Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076 + Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841 + Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807 + Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807 + Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807 + Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076 + + + #common resolutions for android devices (both orientations): + Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345 + Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841 + Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345 + Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757 + Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076 + Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807 + Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076 + Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631 + Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009 + Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563 + Modeline "600x800" 15.17 600 632 688 720 800 818 822 841 + Modeline "800x600" 14.50 800 832 880 912 600 614 617 631 + Modeline "480x854" 13.34 480 512 560 592 854 873 877 897 + Modeline "848x480" 12.09 848 880 920 952 480 491 493 505 + Modeline "480x800" 12.43 480 512 552 584 800 818 822 841 + Modeline "800x480" 11.46 800 832 872 904 480 491 493 505 + #resolutions for android devices (both orientations) + #minus the status bar + #38px status bar (and width rounded up) + Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305 + Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801 + Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305 + Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717 + Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036 + Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767 + Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036 + Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591 + Modeline "536x922" 16.01 536 568 624 656 922 943 947 969 + Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523 + Modeline "600x762" 14.39 600 632 680 712 762 779 783 801 + Modeline "800x562" 13.52 800 832 880 912 562 575 578 591 + Modeline "480x810" 12.59 480 512 552 584 810 828 832 851 + Modeline "848x442" 11.09 848 880 920 952 442 452 454 465 + Modeline "480x762" 11.79 480 512 552 584 762 779 783 801 EndSection Section "Screen" - Identifier "Default Screen" - Monitor "Configured Monitor" - Device "Configured Video Device" - DefaultDepth 24 - SubSection "Display" + Identifier "dummy_screen" + Device "dummy_videocard" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Viewport 0 0 Depth 24 - Modes "1024x800" - EndSubSection + #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200" + Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200" + #Virtual 32000 32000 + #Virtual 16384 8192 + #Virtual 8192 4096 + #Virtual 5120 3200 + Virtual 1024 768 + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "dummy_layout" + Screen "dummy_screen" + InputDevice "dummy_mouse" + InputDevice "dummy_keyboard" EndSection From e17e22c0dec3e3401b094e1162cc253209af796f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 03:00:50 +0200 Subject: [PATCH 20/25] zgrmbl --- conf/xorg.conf | 93 ++----------------------------------------------- scripts/install | 6 +++- 2 files changed, 7 insertions(+), 92 deletions(-) diff --git a/conf/xorg.conf b/conf/xorg.conf index 451ba68..11c0d8e 100644 --- a/conf/xorg.conf +++ b/conf/xorg.conf @@ -1,4 +1,4 @@ -# Taken from https://gist.github.com/divinity76/ce210b5dbcd9ea7d0585ac403caef577 +# Adapted from https://gist.github.com/divinity76/ce210b5dbcd9ea7d0585ac403caef577 Section "ServerFlags" Option "DontVTSwitch" "true" @@ -24,8 +24,6 @@ Section "Device" Identifier "dummy_videocard" Driver "dummy" Option "ConstantDPI" "true" - #VideoRam 4096000 - #VideoRam 256000 VideoRam 192000 EndSection @@ -39,89 +37,7 @@ Section "Monitor" #This can be used to get a specific DPI, but only for the default resolution: #DisplaySize 508 317 - #NOTE: the highest modes will not work without increasing the VideoRam - # for the dummy video card. - Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953 - Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478 - Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602 - Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301 - Modeline "6400x2160" 160.51 6400 6432 7040 7072 2160 2212 2216 2269 - Modeline "5680x1440" 142.66 5680 5712 6248 6280 1440 1474 1478 1513 - Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261 - Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135 - Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261 - Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361 - Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261 - Modeline "4720x3840" 227.86 4720 4752 5616 5648 3840 3933 3940 4033 - Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025 - Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689 - Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151 - Modeline "3840x1200" 108.89 3840 3872 4280 4312 1200 1228 1232 1261 - Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093 - Modeline "3864x1050" 338.00 3864 4112 4520 5176 1050 1053 1063 1089 - Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214 - Modeline "3600x1080" 91.02 3600 3632 3976 4008 1080 1105 1109 1135 - Modeline "3520x1196" 99.53 3520 3552 3928 3960 1196 1224 1228 1256 - Modeline "3360x1050" 293.75 3360 3576 3928 4496 1050 1053 1063 1089 - Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135 - Modeline "3120x1050" 272.75 3120 3320 3648 4176 1050 1053 1063 1089 - Modeline "2728x1680" 148.02 2728 2760 3320 3352 1680 1719 1726 1765 - Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151 - Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554 - Modeline "2048x1152" 197.97 2048 2184 2408 2768 1152 1153 1156 1192 - Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681 - Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513 - Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457 - Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261 - Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135 - Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103 - Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261 - Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946 - Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946 - ModeLine "1366x768" 72.00 1366 1414 1446 1494 768 771 777 803 - Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076 - Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841 - Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807 - Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807 - Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807 - Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076 - - - #common resolutions for android devices (both orientations): - Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345 - Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841 - Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345 Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757 - Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076 - Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807 - Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076 - Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631 - Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009 - Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563 - Modeline "600x800" 15.17 600 632 688 720 800 818 822 841 - Modeline "800x600" 14.50 800 832 880 912 600 614 617 631 - Modeline "480x854" 13.34 480 512 560 592 854 873 877 897 - Modeline "848x480" 12.09 848 880 920 952 480 491 493 505 - Modeline "480x800" 12.43 480 512 552 584 800 818 822 841 - Modeline "800x480" 11.46 800 832 872 904 480 491 493 505 - #resolutions for android devices (both orientations) - #minus the status bar - #38px status bar (and width rounded up) - Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305 - Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801 - Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305 - Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717 - Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036 - Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767 - Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036 - Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591 - Modeline "536x922" 16.01 536 568 624 656 922 943 947 969 - Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523 - Modeline "600x762" 14.39 600 632 680 712 762 779 783 801 - Modeline "800x562" 13.52 800 832 880 912 562 575 578 591 - Modeline "480x810" 12.59 480 512 552 584 810 828 832 851 - Modeline "848x442" 11.09 848 880 920 952 442 452 454 465 - Modeline "480x762" 11.79 480 512 552 584 762 779 783 801 EndSection Section "Screen" @@ -132,12 +48,7 @@ Section "Screen" SubSection "Display" Viewport 0 0 Depth 24 - #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200" - Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200" - #Virtual 32000 32000 - #Virtual 16384 8192 - #Virtual 8192 4096 - #Virtual 5120 3200 + Modes "1280x720" Virtual 1024 768 EndSubSection EndSection diff --git a/scripts/install b/scripts/install index d2999be..8688d86 100644 --- a/scripts/install +++ b/scripts/install @@ -85,7 +85,7 @@ ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then - ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) contrib non-free" --package="nvidia-vdpau-driver nvidia-installer-cleanup nvidia-legacy-check libvdpau1 nvidia-alternative" + #ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) contrib non-free" --package="nvidia-vdpau-driver nvidia-installer-cleanup nvidia-legacy-check libvdpau1 nvidia-alternative" pkg_dependencies="$pkg_dependencies $package_check_dependencies" fi @@ -99,6 +99,10 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then cp ../conf/xorg.conf /etc/X11/xorg.conf fi +#FIXME : this is only for debugging on the CI ... +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr +exit 1 + #================================================= # CREATE DEDICATED USER #================================================= From 0de4e5ba1200e01651228fb7984195c2a89fed36 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 03:27:55 +0200 Subject: [PATCH 21/25] zgrmbl --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 8688d86..92f0a13 100644 --- a/scripts/install +++ b/scripts/install @@ -101,6 +101,7 @@ fi #FIXME : this is only for debugging on the CI ... LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output DUMMY0 --gamma 0:0:0 --mode 1024x768 exit 1 #================================================= From 3e0ae801f0ca4d5f057d203400b2d618ee7c2e06 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 03:35:42 +0200 Subject: [PATCH 22/25] zgrmbl --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 92f0a13..6c3424e 100644 --- a/scripts/install +++ b/scripts/install @@ -100,8 +100,8 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then fi #FIXME : this is only for debugging on the CI ... -LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr -LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output DUMMY0 --gamma 0:0:0 --mode 1024x768 +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output DUMMY0 --gamma 0:0:0 --mode 1024x768 --crtc 0 exit 1 #================================================= From ccb40475e2db8e66f550b9345a72b06b6d192c57 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 03:44:16 +0200 Subject: [PATCH 23/25] zgrmbl --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6c3424e..fccdba2 100644 --- a/scripts/install +++ b/scripts/install @@ -101,7 +101,10 @@ fi #FIXME : this is only for debugging on the CI ... LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 -LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output DUMMY0 --gamma 0:0:0 --mode 1024x768 --crtc 0 +echo "===========" >&2 +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output default --gamma 0:0:0 --mode 1024x768 --crtc 0 +echo "===========" >&2 +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 exit 1 #================================================= From c951bd5bcfa988c366dd1e2f1532841fa86dc95a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 1 Sep 2023 03:52:22 +0200 Subject: [PATCH 24/25] zgrmbl --- scripts/install | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index fccdba2..e74101c 100644 --- a/scripts/install +++ b/scripts/install @@ -99,14 +99,6 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then cp ../conf/xorg.conf /etc/X11/xorg.conf fi -#FIXME : this is only for debugging on the CI ... -LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 -echo "===========" >&2 -LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output default --gamma 0:0:0 --mode 1024x768 --crtc 0 -echo "===========" >&2 -LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 -exit 1 - #================================================= # CREATE DEDICATED USER #================================================= @@ -140,6 +132,14 @@ ynh_script_progression --message="Configuring Kodi..." mkdir -p "$final_path/.kodi/userdata/" ynh_add_config --template="../conf/advancedsettings.xml" --destination="$final_path/.kodi/userdata/advancedsettings.xml" +#FIXME : this is only for debugging on the CI ... +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 +echo "===========" >&2 +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr --output DUMMY0 --gamma 0:0:0 --mode 1024x768 --crtc 0 >&2 +echo "===========" >&2 +LIBVA_DRIVER_NAME=nvidia /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/lib/x86_64-linux-gnu/kodi/kodi-xrandr >&2 +exit 1 + mkdir -p "$final_path/.kodi/addons/" if [[ $YNH_ARCH != arm* ]]; then ynh_setup_source --dest_dir="$final_path/.kodi/addons/" --source_id="arm-chorus2" From b3c4cda5a325e63467281ffa81958100b61948f1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 21 Dec 2023 13:28:10 +0000 Subject: [PATCH 25/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 80199a7..d72619e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Kodi is a media center and entertainment hub that brings all your digital media * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 9641e6f..e2c5bd8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Kodi is a media center and entertainment hub that brings all your digital media * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs