From 67de03cafc64116470d03e6bfe6330eb4a606269 Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 02:21:59 +0100 Subject: [PATCH 01/12] add flatpak json and makefile, need manifest and developer copyright --- .gitignore | 2 + Makefile | 6 ++ online.winehub.GPUViewer.json | 132 ++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 Makefile create mode 100644 online.winehub.GPUViewer.json diff --git a/.gitignore b/.gitignore index ce3fba6..dfd2c9f 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.txt Files/__pycache__/* +.flatpak-builder/ +build/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5b9d5e6 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ + + +all: gpu-viewer + +gpu-viewer: + flatpak-builder build online.winehub.GPUViewer.json --force-clean --user --install \ No newline at end of file diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json new file mode 100644 index 0000000..96537a9 --- /dev/null +++ b/online.winehub.GPUViewer.json @@ -0,0 +1,132 @@ +{ + "app-id": "online.winehub.GPUViewer", + "runtime": "org.freedesktop.Platform", + "runtime-version": "18.08", + "sdk": "org.freedesktop.Sdk", + "finish-args": [ + "--share=ipc", + "--socket=wayland", + "--socket=x11", + "--device=dri", + "--require-version=0.9.0" + ], + "command": "gpu-viewer", + "modules": [ + { + "name": "pycairo", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://github.com/pygobject/pycairo/releases/download/v1.18.0/pycairo-1.18.0.tar.gz", + "sha256": "abd42a4c9c2069febb4c38fe74bfc4b4a9d3a89fea3bc2e4ba7baff7a20f783f" + } + ] + }, + { + "name": "cairo", + "buildsystem": "autotools", + "sources": [ + { + "type": "archive", + "url": "https://cairographics.org/releases/cairo-1.16.0.tar.xz", + "sha256": "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" + } + ] + }, + { + "name": "pygobject", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/pygobject/3.30/pygobject-3.30.4.tar.xz", + "sha256": "2dc1a1a444b82955e65b81c2a2511ecf8032404beba4ef1d48144168f2f64c43" + } + ] + }, + { + "name": "mesa-demos", + "buildsystem": "simple", + "build-commands": [ + "cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX -lGL -lpthread -DPACKAGE_VERSION=\"8.4.0\" -DPACKAGE_STRING=\"mesa-demos\ 8.4.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\&component=Demos\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa-demos\" -DVERSION=\"8.4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1", + "install -m755 src/xdemos/glxinfo /app/bin" + ], + "sources": [ + { + "type": "archive", + "url": "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2", + "sha256": "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" + } + ] + }, + { + "name": "khronos-headers", + "buildsystem": "simple", + "build-commands": [ + "cp -r CL/ /app/include/" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/KhronosGroup/OpenCL-Headers" + } + ] + }, + { + "name": "clinfo", + "buildsystem": "simple", + "build-commands": [ + "CFLAGS=\"-I/app/include\" make", + "mkdir /app/share/man", + "install -m755 clinfo /app/bin/clinfo", + "make PREFIX=/app MANDIR=/app/share/man install" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz", + "sha256": "f77021a57b3afcdebc73107e2254b95780026a9df9aa4f8db6aff11c03f0ec6c" + } + ] + }, + { + "name": "vulkan-tools", + "buildsystem": "simple", + "build-commands": [ + "ls", + "cmake -DCMAKE_INSTALL_PREFIX:PATH=/app -DCMAKE_INSTALL_LIBDIR=%{libdir} -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DGLSLANG_SPIRV_INCLUDE_DIR=./ -DBUILD_TESTS=OFF -DBUILD_LAYERS=OFF -DBUILD_DEMOS=ON", + "make vulkaninfo", + "install -m755 demos/vulkaninfo /app/bin/vulkaninfo" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0.tar.gz", + "sha256": "ab6bd8162b246bc5d73dcfb3b69ed7a35b12b739735493f47304b0fc852463e1" + } + ] + }, + { + "name": "gpuviewer-tools", + "buildsystem": "simple", + "build-commands": [ + "sed -i \"s/sudo//g\" install", + "sed -i \"s/\\/usr\\/bin/\\/app\\/bin/g\" install", + "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" install", + "mkdir -p /app/share/applications/", + "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" gpu-viewer.desktop", + "sh -c ./install", + "echo -e \"#!/bin/sh\ncd /app/share/gpu-viewer/Files/\npython3 GPUViewer.py\" >/app/bin/gpu-viewer", + "chmod 755 /app/bin/gpu-viewer" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/arunsivaramanneo/GPU-Viewer/archive/v1.15.tar.gz", + "sha256": "366abf2322b6c4dd9852b3352cfbe397b4481bf2fc8f210813cede98bc19fcf5" + } + ] + } + ] +} From 8ce1538627429df915dc8f3068aaba2b53e622b2 Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 16:33:01 +0100 Subject: [PATCH 02/12] add appdata with copyright and change desktop icon --- online.winehub.GPUViewer.appdata.xml | 24 +++++++++++++++++++++ online.winehub.GPUViewer.json | 31 ++++++++++++++++++---------- 2 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 online.winehub.GPUViewer.appdata.xml diff --git a/online.winehub.GPUViewer.appdata.xml b/online.winehub.GPUViewer.appdata.xml new file mode 100644 index 0000000..f30c91a --- /dev/null +++ b/online.winehub.GPUViewer.appdata.xml @@ -0,0 +1,24 @@ + + + online.winehub.GPUViewer + CC0-1.0 + GPUViewer + GPUViewer by Arun Sivaraman + +

A front-end to glxinfo, vulkaninfo, clinfo and es2_info

+ + + Graphics + + https://github.com/arunsivaramanneo/GPU-Viewer + https://github.com/arunsivaramanneo/GPU-Viewer + LicenseRef-proprietary + Arun Sivaraman + + + GPUViewer details + https://user-images.githubusercontent.com/30646692/49328576-271fd880-f599-11e8-95d3-d9db4b03e91b.png + + + + \ No newline at end of file diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json index 96537a9..9f0d930 100644 --- a/online.winehub.GPUViewer.json +++ b/online.winehub.GPUViewer.json @@ -50,7 +50,7 @@ "buildsystem": "simple", "build-commands": [ "cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX -lGL -lpthread -DPACKAGE_VERSION=\"8.4.0\" -DPACKAGE_STRING=\"mesa-demos\ 8.4.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\&component=Demos\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa-demos\" -DVERSION=\"8.4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1", - "install -m755 src/xdemos/glxinfo /app/bin" + "install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin" ], "sources": [ { @@ -64,7 +64,7 @@ "name": "khronos-headers", "buildsystem": "simple", "build-commands": [ - "cp -r CL/ /app/include/" + "cp -r CL/ ${FLATPAK_DEST}/include/" ], "sources": [ { @@ -77,10 +77,10 @@ "name": "clinfo", "buildsystem": "simple", "build-commands": [ - "CFLAGS=\"-I/app/include\" make", + "CFLAGS=\"-I${FLATPAK_DEST}/include\" make", "mkdir /app/share/man", - "install -m755 clinfo /app/bin/clinfo", - "make PREFIX=/app MANDIR=/app/share/man install" + "install -m755 clinfo ${FLATPAK_DEST}/bin/clinfo", + "make PREFIX=/app MANDIR=${FLATPAK_DEST}/share/man install" ], "sources": [ { @@ -95,9 +95,9 @@ "buildsystem": "simple", "build-commands": [ "ls", - "cmake -DCMAKE_INSTALL_PREFIX:PATH=/app -DCMAKE_INSTALL_LIBDIR=%{libdir} -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DGLSLANG_SPIRV_INCLUDE_DIR=./ -DBUILD_TESTS=OFF -DBUILD_LAYERS=OFF -DBUILD_DEMOS=ON", + "cmake -DCMAKE_INSTALL_PREFIX:PATH=${FLATPAK_DEST} -DCMAKE_INSTALL_LIBDIR=%{libdir} -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DGLSLANG_SPIRV_INCLUDE_DIR=./ -DBUILD_TESTS=OFF -DBUILD_LAYERS=OFF -DBUILD_DEMOS=ON", "make vulkaninfo", - "install -m755 demos/vulkaninfo /app/bin/vulkaninfo" + "install -m755 demos/vulkaninfo ${FLATPAK_DEST}/bin/vulkaninfo" ], "sources": [ { @@ -111,20 +111,29 @@ "name": "gpuviewer-tools", "buildsystem": "simple", "build-commands": [ - "sed -i \"s/sudo//g\" install", - "sed -i \"s/\\/usr\\/bin/\\/app\\/bin/g\" install", - "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" install", + "mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/512x512/", + "install -m644 Images/GPU_Viewer.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/", + "sed -i \"s/sudo//g\" install", + "sed -i \"s/\\/usr\\/bin/\\/app\\/bin/g\" install", + "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" install", "mkdir -p /app/share/applications/", "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" gpu-viewer.desktop", + "sed \"s/Icon/Icon=GPU_Viewer.png/g\"", "sh -c ./install", "echo -e \"#!/bin/sh\ncd /app/share/gpu-viewer/Files/\npython3 GPUViewer.py\" >/app/bin/gpu-viewer", - "chmod 755 /app/bin/gpu-viewer" + "chmod 755 ${FLATPAK_DEST}/bin/gpu-viewer", + "mkdir -p ${FLATPAK_DEST}/share/appdata", + "install -m6440 online.winehub.GPUViewer.appdata.xml ${FLATPAK_DEST}/share/appdata" ], "sources": [ { "type": "archive", "url": "https://github.com/arunsivaramanneo/GPU-Viewer/archive/v1.15.tar.gz", "sha256": "366abf2322b6c4dd9852b3352cfbe397b4481bf2fc8f210813cede98bc19fcf5" + }, + { + "type": "file", + "path": "online.winehub.GPUViewer.appdata.xml" } ] } From c847680f501692665211b252f44a1dbe865d2368 Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 16:46:45 +0100 Subject: [PATCH 03/12] change categories from appdata --- online.winehub.GPUViewer.appdata.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/online.winehub.GPUViewer.appdata.xml b/online.winehub.GPUViewer.appdata.xml index f30c91a..0064b3d 100644 --- a/online.winehub.GPUViewer.appdata.xml +++ b/online.winehub.GPUViewer.appdata.xml @@ -8,7 +8,9 @@

A front-end to glxinfo, vulkaninfo, clinfo and es2_info

- Graphics + GTK + GNOME + System https://github.com/arunsivaramanneo/GPU-Viewer https://github.com/arunsivaramanneo/GPU-Viewer From b7bbccf1e0782978ae0aa8d8f84394e476115bfb Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 16:57:21 +0100 Subject: [PATCH 04/12] some little clean ups --- online.winehub.GPUViewer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json index 9f0d930..6c0af7d 100644 --- a/online.winehub.GPUViewer.json +++ b/online.winehub.GPUViewer.json @@ -78,9 +78,9 @@ "buildsystem": "simple", "build-commands": [ "CFLAGS=\"-I${FLATPAK_DEST}/include\" make", - "mkdir /app/share/man", + "mkdir ${FLATPAK_DEST}/share/man", "install -m755 clinfo ${FLATPAK_DEST}/bin/clinfo", - "make PREFIX=/app MANDIR=${FLATPAK_DEST}/share/man install" + "make PREFIX=${FLATPAK_DEST} MANDIR=${FLATPAK_DEST}/share/man install" ], "sources": [ { @@ -116,7 +116,7 @@ "sed -i \"s/sudo//g\" install", "sed -i \"s/\\/usr\\/bin/\\/app\\/bin/g\" install", "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" install", - "mkdir -p /app/share/applications/", + "mkdir -p ${FLATPAK_DEST}/share/applications/", "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" gpu-viewer.desktop", "sed \"s/Icon/Icon=GPU_Viewer.png/g\"", "sh -c ./install", From 3b74876eaea888e5dcc119d42dbf1adb6b1eaed6 Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 17:44:25 +0100 Subject: [PATCH 05/12] add cleanup to json --- online.winehub.GPUViewer.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json index 6c0af7d..4675ad9 100644 --- a/online.winehub.GPUViewer.json +++ b/online.winehub.GPUViewer.json @@ -10,6 +10,15 @@ "--device=dri", "--require-version=0.9.0" ], + "cleanup": [ + "/include", + "/share/gtk-doc", + "/lib/debug", + "/share/man", + "/bin/cairo-trace", + "*.a", + "*.la" + ], "command": "gpu-viewer", "modules": [ { From b11892c078a4a7b014734867c9b4e5ef1fe53e48 Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 20:58:53 +0100 Subject: [PATCH 06/12] convert json into yaml --- Makefile | 2 +- online.winehub.GPUViewer.json | 150 ---------------------------------- online.winehub.GPUViewer.yml | 109 ++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 151 deletions(-) delete mode 100644 online.winehub.GPUViewer.json create mode 100644 online.winehub.GPUViewer.yml diff --git a/Makefile b/Makefile index 5b9d5e6..51d6ea3 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,4 @@ all: gpu-viewer gpu-viewer: - flatpak-builder build online.winehub.GPUViewer.json --force-clean --user --install \ No newline at end of file + flatpak-builder build online.winehub.GPUViewer.yml --force-clean --user --install diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json deleted file mode 100644 index 4675ad9..0000000 --- a/online.winehub.GPUViewer.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "app-id": "online.winehub.GPUViewer", - "runtime": "org.freedesktop.Platform", - "runtime-version": "18.08", - "sdk": "org.freedesktop.Sdk", - "finish-args": [ - "--share=ipc", - "--socket=wayland", - "--socket=x11", - "--device=dri", - "--require-version=0.9.0" - ], - "cleanup": [ - "/include", - "/share/gtk-doc", - "/lib/debug", - "/share/man", - "/bin/cairo-trace", - "*.a", - "*.la" - ], - "command": "gpu-viewer", - "modules": [ - { - "name": "pycairo", - "buildsystem": "meson", - "sources": [ - { - "type": "archive", - "url": "https://github.com/pygobject/pycairo/releases/download/v1.18.0/pycairo-1.18.0.tar.gz", - "sha256": "abd42a4c9c2069febb4c38fe74bfc4b4a9d3a89fea3bc2e4ba7baff7a20f783f" - } - ] - }, - { - "name": "cairo", - "buildsystem": "autotools", - "sources": [ - { - "type": "archive", - "url": "https://cairographics.org/releases/cairo-1.16.0.tar.xz", - "sha256": "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" - } - ] - }, - { - "name": "pygobject", - "buildsystem": "meson", - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/pygobject/3.30/pygobject-3.30.4.tar.xz", - "sha256": "2dc1a1a444b82955e65b81c2a2511ecf8032404beba4ef1d48144168f2f64c43" - } - ] - }, - { - "name": "mesa-demos", - "buildsystem": "simple", - "build-commands": [ - "cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX -lGL -lpthread -DPACKAGE_VERSION=\"8.4.0\" -DPACKAGE_STRING=\"mesa-demos\ 8.4.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\&component=Demos\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa-demos\" -DVERSION=\"8.4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1", - "install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin" - ], - "sources": [ - { - "type": "archive", - "url": "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2", - "sha256": "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" - } - ] - }, - { - "name": "khronos-headers", - "buildsystem": "simple", - "build-commands": [ - "cp -r CL/ ${FLATPAK_DEST}/include/" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/KhronosGroup/OpenCL-Headers" - } - ] - }, - { - "name": "clinfo", - "buildsystem": "simple", - "build-commands": [ - "CFLAGS=\"-I${FLATPAK_DEST}/include\" make", - "mkdir ${FLATPAK_DEST}/share/man", - "install -m755 clinfo ${FLATPAK_DEST}/bin/clinfo", - "make PREFIX=${FLATPAK_DEST} MANDIR=${FLATPAK_DEST}/share/man install" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz", - "sha256": "f77021a57b3afcdebc73107e2254b95780026a9df9aa4f8db6aff11c03f0ec6c" - } - ] - }, - { - "name": "vulkan-tools", - "buildsystem": "simple", - "build-commands": [ - "ls", - "cmake -DCMAKE_INSTALL_PREFIX:PATH=${FLATPAK_DEST} -DCMAKE_INSTALL_LIBDIR=%{libdir} -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DGLSLANG_SPIRV_INCLUDE_DIR=./ -DBUILD_TESTS=OFF -DBUILD_LAYERS=OFF -DBUILD_DEMOS=ON", - "make vulkaninfo", - "install -m755 demos/vulkaninfo ${FLATPAK_DEST}/bin/vulkaninfo" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0.tar.gz", - "sha256": "ab6bd8162b246bc5d73dcfb3b69ed7a35b12b739735493f47304b0fc852463e1" - } - ] - }, - { - "name": "gpuviewer-tools", - "buildsystem": "simple", - "build-commands": [ - "mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/512x512/", - "install -m644 Images/GPU_Viewer.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/", - "sed -i \"s/sudo//g\" install", - "sed -i \"s/\\/usr\\/bin/\\/app\\/bin/g\" install", - "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" install", - "mkdir -p ${FLATPAK_DEST}/share/applications/", - "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" gpu-viewer.desktop", - "sed \"s/Icon/Icon=GPU_Viewer.png/g\"", - "sh -c ./install", - "echo -e \"#!/bin/sh\ncd /app/share/gpu-viewer/Files/\npython3 GPUViewer.py\" >/app/bin/gpu-viewer", - "chmod 755 ${FLATPAK_DEST}/bin/gpu-viewer", - "mkdir -p ${FLATPAK_DEST}/share/appdata", - "install -m6440 online.winehub.GPUViewer.appdata.xml ${FLATPAK_DEST}/share/appdata" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/arunsivaramanneo/GPU-Viewer/archive/v1.15.tar.gz", - "sha256": "366abf2322b6c4dd9852b3352cfbe397b4481bf2fc8f210813cede98bc19fcf5" - }, - { - "type": "file", - "path": "online.winehub.GPUViewer.appdata.xml" - } - ] - } - ] -} diff --git a/online.winehub.GPUViewer.yml b/online.winehub.GPUViewer.yml new file mode 100644 index 0000000..21d267d --- /dev/null +++ b/online.winehub.GPUViewer.yml @@ -0,0 +1,109 @@ +app-id: online.winehub.GPUViewer +runtime: org.freedesktop.Platform +runtime-version: '18.08' +sdk: org.freedesktop.Sdk +finish-args: + - --share=ipc + - --socket=wayland + - --socket=x11 + - --device=dri + - --require-version=0.9.0 +cleanup: + - /include + - /share/gtk-doc + - /lib/debug + - /share/man + - /bin/cairo-trace + - '*.a' + - '*.la' +command: gpu-viewer +modules: + - name: pycairo + buildsystem: meson + sources: + - type: archive + url: https://github.com/pygobject/pycairo/releases/download/v1.18.0/pycairo-1.18.0.tar.gz + sha256: abd42a4c9c2069febb4c38fe74bfc4b4a9d3a89fea3bc2e4ba7baff7a20f783f + - name: cairo + buildsystem: autotools + sources: + - type: archive + url: https://cairographics.org/releases/cairo-1.16.0.tar.xz + sha256: 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 + - name: pygobject + buildsystem: meson + sources: + - type: archive + url: https://download.gnome.org/sources/pygobject/3.30/pygobject-3.30.4.tar.xz + sha256: 2dc1a1a444b82955e65b81c2a2511ecf8032404beba4ef1d48144168f2f64c43 + - name: mesa-demos + buildsystem: simple + build-commands: + - cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX + -lGL -lpthread -DPACKAGE_VERSION="8.4.0" -DPACKAGE_STRING="mesa-demos 8.4.0" + -DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\&component=Demos" + -DPACKAGE_URL="" -DPACKAGE="mesa-demos" -DVERSION="8.4.0" -DSTDC_HEADERS=1 + -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 + -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 + -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 + - install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin + sources: + - type: archive + url: ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2 + sha256: 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d + - name: khronos-headers + buildsystem: simple + build-commands: + - cp -r CL/ ${FLATPAK_DEST}/include/ + sources: + - type: git + url: https://github.com/KhronosGroup/OpenCL-Headers + - name: clinfo + buildsystem: simple + build-commands: + - CFLAGS="-I${FLATPAK_DEST}/include" make + - mkdir ${FLATPAK_DEST}/share/man + - install -m755 clinfo ${FLATPAK_DEST}/bin/clinfo + - make PREFIX=${FLATPAK_DEST} MANDIR=${FLATPAK_DEST}/share/man install + sources: + - type: archive + url: https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz + sha256: f77021a57b3afcdebc73107e2254b95780026a9df9aa4f8db6aff11c03f0ec6c + - name: vulkan-tools + buildsystem: simple + build-commands: + - ls + - cmake -DCMAKE_INSTALL_PREFIX:PATH=${FLATPAK_DEST} -DCMAKE_INSTALL_LIBDIR=%{libdir} + -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes + -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON + -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DGLSLANG_SPIRV_INCLUDE_DIR=./ + -DBUILD_TESTS=OFF -DBUILD_LAYERS=OFF -DBUILD_DEMOS=ON + - make vulkaninfo + - install -m755 demos/vulkaninfo ${FLATPAK_DEST}/bin/vulkaninfo + sources: + - type: archive + url: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0.tar.gz + sha256: ab6bd8162b246bc5d73dcfb3b69ed7a35b12b739735493f47304b0fc852463e1 + - name: gpuviewer-tools + buildsystem: simple + build-commands: + - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/512x512/ + - install -m644 Images/GPU_Viewer.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/ + - sed -i "s/sudo//g" install + - sed -i "s/\/usr\/bin/\/app\/bin/g" install + - sed -i "s/\/usr\/share/\/app\/share/g" install + - mkdir -p ${FLATPAK_DEST}/share/applications/ + - sed -i "s/\/usr\/share/\/app\/share/g" gpu-viewer.desktop + - sed "s/Icon/Icon=GPU_Viewer.png/g" + - sh -c ./install + - "echo -e \"#!/bin/sh\ncd /app/share/gpu-viewer/Files/\npython3 GPUViewer.py\"\ + \ >/app/bin/gpu-viewer" + - chmod 755 ${FLATPAK_DEST}/bin/gpu-viewer + - mkdir -p ${FLATPAK_DEST}/share/appdata + - install -m6440 online.winehub.GPUViewer.appdata.xml ${FLATPAK_DEST}/share/appdata + sources: + - type: archive + url: https://github.com/arunsivaramanneo/GPU-Viewer/archive/v1.15.tar.gz + sha256: 366abf2322b6c4dd9852b3352cfbe397b4481bf2fc8f210813cede98bc19fcf5 + - type: file + path: online.winehub.GPUViewer.appdata.xml From 588c06d6584f849f03b5116d92536551937eb37a Mon Sep 17 00:00:00 2001 From: winehub Date: Wed, 2 Jan 2019 21:08:56 +0100 Subject: [PATCH 07/12] insert lines between modules --- online.winehub.GPUViewer.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/online.winehub.GPUViewer.yml b/online.winehub.GPUViewer.yml index 21d267d..c2609ec 100644 --- a/online.winehub.GPUViewer.yml +++ b/online.winehub.GPUViewer.yml @@ -2,12 +2,14 @@ app-id: online.winehub.GPUViewer runtime: org.freedesktop.Platform runtime-version: '18.08' sdk: org.freedesktop.Sdk + finish-args: - --share=ipc - --socket=wayland - --socket=x11 - --device=dri - --require-version=0.9.0 + cleanup: - /include - /share/gtk-doc @@ -16,7 +18,9 @@ cleanup: - /bin/cairo-trace - '*.a' - '*.la' + command: gpu-viewer + modules: - name: pycairo buildsystem: meson @@ -24,18 +28,21 @@ modules: - type: archive url: https://github.com/pygobject/pycairo/releases/download/v1.18.0/pycairo-1.18.0.tar.gz sha256: abd42a4c9c2069febb4c38fe74bfc4b4a9d3a89fea3bc2e4ba7baff7a20f783f + - name: cairo buildsystem: autotools sources: - type: archive url: https://cairographics.org/releases/cairo-1.16.0.tar.xz sha256: 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 + - name: pygobject buildsystem: meson sources: - type: archive url: https://download.gnome.org/sources/pygobject/3.30/pygobject-3.30.4.tar.xz sha256: 2dc1a1a444b82955e65b81c2a2511ecf8032404beba4ef1d48144168f2f64c43 + - name: mesa-demos buildsystem: simple build-commands: @@ -51,6 +58,7 @@ modules: - type: archive url: ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2 sha256: 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d + - name: khronos-headers buildsystem: simple build-commands: @@ -58,6 +66,7 @@ modules: sources: - type: git url: https://github.com/KhronosGroup/OpenCL-Headers + - name: clinfo buildsystem: simple build-commands: @@ -69,10 +78,10 @@ modules: - type: archive url: https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz sha256: f77021a57b3afcdebc73107e2254b95780026a9df9aa4f8db6aff11c03f0ec6c + - name: vulkan-tools buildsystem: simple build-commands: - - ls - cmake -DCMAKE_INSTALL_PREFIX:PATH=${FLATPAK_DEST} -DCMAKE_INSTALL_LIBDIR=%{libdir} -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON @@ -84,6 +93,7 @@ modules: - type: archive url: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0.tar.gz sha256: ab6bd8162b246bc5d73dcfb3b69ed7a35b12b739735493f47304b0fc852463e1 + - name: gpuviewer-tools buildsystem: simple build-commands: From 33c0b17a5c6c9fbfcd5eacf96e914124856a996c Mon Sep 17 00:00:00 2001 From: winehub Date: Thu, 3 Jan 2019 21:00:47 +0100 Subject: [PATCH 08/12] copy json also into repo --- online.winehub.GPUViewer.json | 150 ++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 online.winehub.GPUViewer.json diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json new file mode 100644 index 0000000..2a03d9e --- /dev/null +++ b/online.winehub.GPUViewer.json @@ -0,0 +1,150 @@ +{ + "app-id": "online.winehub.GPUViewer", + "runtime": "org.freedesktop.Platform", + "runtime-version": "18.08", + "sdk": "org.freedesktop.Sdk", + "finish-args": [ + "--share=ipc", + "--socket=wayland", + "--socket=x11", + "--device=dri", + "--require-version=0.9.0" + ], + "cleanup": [ + "/include", + "/share/gtk-doc", + "/lib/debug", + "/share/man", + "/bin/cairo-trace", + "*.a", + "*.la" + ], + "command": "gpu-viewer", + "modules": [ + { + "name": "pycairo", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://github.com/pygobject/pycairo/releases/download/v1.18.0/pycairo-1.18.0.tar.gz", + "sha256": "abd42a4c9c2069febb4c38fe74bfc4b4a9d3a89fea3bc2e4ba7baff7a20f783f" + } + ] + }, + { + "name": "cairo", + "buildsystem": "autotools", + "sources": [ + { + "type": "archive", + "url": "https://cairographics.org/releases/cairo-1.16.0.tar.xz", + "sha256": "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" + } + ] + }, + { + "name": "pygobject", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/pygobject/3.30/pygobject-3.30.4.tar.xz", + "sha256": "2dc1a1a444b82955e65b81c2a2511ecf8032404beba4ef1d48144168f2f64c43" + } + ] + }, + { + "name": "mesa-demos", + "buildsystem": "simple", + "build-commands": [ + "cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX -lGL -lpthread -DPACKAGE_VERSION=\"8.4.0\" -DPACKAGE_STRING=\"mesa-demos 8.4.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\\?product=Mesa\\&component=Demos\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa-demos\" -DVERSION=\"8.4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1", + "install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin" + ], + "sources": [ + { + "type": "archive", + "url": "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2", + "sha256": "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" + } + ] + }, + { + "name": "khronos-headers", + "buildsystem": "simple", + "build-commands": [ + "cp -r CL/ ${FLATPAK_DEST}/include/" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/KhronosGroup/OpenCL-Headers" + } + ] + }, + { + "name": "clinfo", + "buildsystem": "simple", + "build-commands": [ + "CFLAGS=\"-I${FLATPAK_DEST}/include\" make", + "mkdir ${FLATPAK_DEST}/share/man", + "install -m755 clinfo ${FLATPAK_DEST}/bin/clinfo", + "make PREFIX=${FLATPAK_DEST} MANDIR=${FLATPAK_DEST}/share/man install" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz", + "sha256": "f77021a57b3afcdebc73107e2254b95780026a9df9aa4f8db6aff11c03f0ec6c" + } + ] + }, + { + "name": "vulkan-tools", + "buildsystem": "simple", + "build-commands": [ + "ls", + "cmake -DCMAKE_INSTALL_PREFIX:PATH=${FLATPAK_DEST} -DCMAKE_INSTALL_LIBDIR=%{libdir} -DCMAKE_INSTALL_SYSCONFDIR:PATH=/app/etc -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH:BOOL=yes -DBUILD_VKJSON=OFF -DBUILD_WSI_MIR_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DGLSLANG_SPIRV_INCLUDE_DIR=./ -DBUILD_TESTS=OFF -DBUILD_LAYERS=OFF -DBUILD_DEMOS=ON", + "make vulkaninfo", + "install -m755 demos/vulkaninfo ${FLATPAK_DEST}/bin/vulkaninfo" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0.tar.gz", + "sha256": "ab6bd8162b246bc5d73dcfb3b69ed7a35b12b739735493f47304b0fc852463e1" + } + ] + }, + { + "name": "gpuviewer-tools", + "buildsystem": "simple", + "build-commands": [ + "mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/512x512/", + "install -m644 Images/GPU_Viewer.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/", + "sed -i \"s/sudo//g\" install", + "sed -i \"s/\\/usr\\/bin/\\/app\\/bin/g\" install", + "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" install", + "mkdir -p ${FLATPAK_DEST}/share/applications/", + "sed -i \"s/\\/usr\\/share/\\/app\\/share/g\" gpu-viewer.desktop", + "sed \"s/Icon/Icon=GPU_Viewer.png/g\"", + "sh -c ./install", + "echo -e \"#!/bin/sh\ncd /app/share/gpu-viewer/Files/\npython3 GPUViewer.py\" >/app/bin/gpu-viewer", + "chmod 755 ${FLATPAK_DEST}/bin/gpu-viewer", + "mkdir -p ${FLATPAK_DEST}/share/appdata", + "install -m6440 online.winehub.GPUViewer.appdata.xml ${FLATPAK_DEST}/share/appdata" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/arunsivaramanneo/GPU-Viewer/archive/v1.15.tar.gz", + "sha256": "366abf2322b6c4dd9852b3352cfbe397b4481bf2fc8f210813cede98bc19fcf5" + }, + { + "type": "file", + "path": "online.winehub.GPUViewer.appdata.xml" + } + ] + } + ] +} From 9b73825d657625f1c3b6d8774cb004aa348cf762 Mon Sep 17 00:00:00 2001 From: winehub Date: Thu, 3 Jan 2019 21:02:06 +0100 Subject: [PATCH 09/12] revert back to json --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 51d6ea3..06a0ca6 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,4 @@ all: gpu-viewer gpu-viewer: - flatpak-builder build online.winehub.GPUViewer.yml --force-clean --user --install + flatpak-builder build online.winehub.GPUViewer.json --force-clean --user --install From 5086bfbaa5c372957fa1c80bf20a5b5f057e8220 Mon Sep 17 00:00:00 2001 From: winehub Date: Sat, 5 Jan 2019 11:39:51 +0100 Subject: [PATCH 10/12] Change mesa demos from ftp to https server. --- online.winehub.GPUViewer.json | 2 +- online.winehub.GPUViewer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json index 2a03d9e..69219ed 100644 --- a/online.winehub.GPUViewer.json +++ b/online.winehub.GPUViewer.json @@ -64,7 +64,7 @@ "sources": [ { "type": "archive", - "url": "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2", + "url": "https://mesa.freedesktop.org/archive/demos/mesa-demos-8.4.0.tar.bz2", "sha256": "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" } ] diff --git a/online.winehub.GPUViewer.yml b/online.winehub.GPUViewer.yml index c2609ec..9e285bd 100644 --- a/online.winehub.GPUViewer.yml +++ b/online.winehub.GPUViewer.yml @@ -56,7 +56,7 @@ modules: - install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin sources: - type: archive - url: ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2 + url: https://mesa.freedesktop.org/archive/demos/mesa-demos-8.4.0.tar.bz2 sha256: 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d - name: khronos-headers From 62628e330c316ae27c56dc4d46e4b6e4e44eec75 Mon Sep 17 00:00:00 2001 From: winehub Date: Sat, 12 Jan 2019 01:58:12 +0100 Subject: [PATCH 11/12] add es2_info --- Makefile | 2 +- online.winehub.GPUViewer.json | 4 +++- online.winehub.GPUViewer.yml | 14 +++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 06a0ca6..51d6ea3 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,4 @@ all: gpu-viewer gpu-viewer: - flatpak-builder build online.winehub.GPUViewer.json --force-clean --user --install + flatpak-builder build online.winehub.GPUViewer.yml --force-clean --user --install diff --git a/online.winehub.GPUViewer.json b/online.winehub.GPUViewer.json index 69219ed..7e8c01a 100644 --- a/online.winehub.GPUViewer.json +++ b/online.winehub.GPUViewer.json @@ -59,7 +59,9 @@ "buildsystem": "simple", "build-commands": [ "cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX -lGL -lpthread -DPACKAGE_VERSION=\"8.4.0\" -DPACKAGE_STRING=\"mesa-demos 8.4.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\\?product=Mesa\\&component=Demos\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa-demos\" -DVERSION=\"8.4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1", - "install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin" + "cd src/egl/opengles2; gcc -o es2_info es2_info.c -O2 -lX11 -lXext -lGLX -lGL -lEGL -lpthread -DPACKAGE_VERSION=\"8.4.0\" -DPACKAGE_STRING=\"mesa-demos 8.4.0\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\\?product=Mesa\\&component=Demos\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa-demos\" -DVERSION=\"8.4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1", + "install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin", + "install -m755 src/egl/opengles2/es2_info ${FLATPAK_DEST}/bin" ], "sources": [ { diff --git a/online.winehub.GPUViewer.yml b/online.winehub.GPUViewer.yml index 9e285bd..4fb3383 100644 --- a/online.winehub.GPUViewer.yml +++ b/online.winehub.GPUViewer.yml @@ -19,6 +19,8 @@ cleanup: - '*.a' - '*.la' +no-debuginfo: false + command: gpu-viewer modules: @@ -46,14 +48,24 @@ modules: - name: mesa-demos buildsystem: simple build-commands: - - cd src/xdemos;gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX + - cd src/xdemos; gcc -o glxinfo glxinfo.c glinfo_common.c -O2 -lX11 -lXext -lGLX -lGL -lpthread -DPACKAGE_VERSION="8.4.0" -DPACKAGE_STRING="mesa-demos 8.4.0" -DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\&component=Demos" -DPACKAGE_URL="" -DPACKAGE="mesa-demos" -DVERSION="8.4.0" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 + - cd src/egl/opengles2; gcc -o es2_info es2_info.c -O2 -lX11 -lXext -lGLX + -lEGL -lGL -lpthread -DPACKAGE_VERSION="8.4.0" -DPACKAGE_STRING="mesa-demos 8.4.0" + -DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\&component=Demos" + -DPACKAGE_URL="" -DPACKAGE="mesa-demos" -DVERSION="8.4.0" -DSTDC_HEADERS=1 + -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 + -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 + -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 + - install -m755 src/xdemos/glxinfo ${FLATPAK_DEST}/bin + - install -m755 src/egl/opengles2/es2_info ${FLATPAK_DEST}/bin + sources: - type: archive url: https://mesa.freedesktop.org/archive/demos/mesa-demos-8.4.0.tar.bz2 From 39bbc20eca11e2c74b4a8ee27120ae4fb7a25a44 Mon Sep 17 00:00:00 2001 From: winehub Date: Sun, 13 Jan 2019 16:58:44 +0100 Subject: [PATCH 12/12] try to get the desktop application in function, not yet --- gpu-viewer.desktop | 1 - online.winehub.GPUViewer.yml | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gpu-viewer.desktop b/gpu-viewer.desktop index c27a3b1..284d83e 100755 --- a/gpu-viewer.desktop +++ b/gpu-viewer.desktop @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Encoding=UTF-8 version=1.15 diff --git a/online.winehub.GPUViewer.yml b/online.winehub.GPUViewer.yml index 4fb3383..bf74b39 100644 --- a/online.winehub.GPUViewer.yml +++ b/online.winehub.GPUViewer.yml @@ -109,14 +109,14 @@ modules: - name: gpuviewer-tools buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/512x512/ - - install -m644 Images/GPU_Viewer.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/ + - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/512x512/apps + - install -m644 Images/GPU_Viewer.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/apps - sed -i "s/sudo//g" install - sed -i "s/\/usr\/bin/\/app\/bin/g" install - sed -i "s/\/usr\/share/\/app\/share/g" install - mkdir -p ${FLATPAK_DEST}/share/applications/ - - sed -i "s/\/usr\/share/\/app\/share/g" gpu-viewer.desktop - - sed "s/Icon/Icon=GPU_Viewer.png/g" + - sed -i "/Icon=/c\Icon=GPU_Viewer" gpu-viewer.desktop + - sed -i "/Exec=/c\Exec=gpu-viewer" gpu-viewer.desktop - sh -c ./install - "echo -e \"#!/bin/sh\ncd /app/share/gpu-viewer/Files/\npython3 GPUViewer.py\"\ \ >/app/bin/gpu-viewer"