diff --git a/flatpak/README b/flatpak/README
index ff468dc..6508d68 100644
--- a/flatpak/README
+++ b/flatpak/README
@@ -79,3 +79,8 @@ for packaging
}
]
}
+
+
+** Declare flatpak on flathub :
+
+https://github.com/brunoherbelin/flathub
diff --git a/flatpak/io.github.brunoherbelin.Vimix.desktop b/flatpak/io.github.brunoherbelin.Vimix.desktop
deleted file mode 100644
index 37bd29f..0000000
--- a/flatpak/io.github.brunoherbelin.Vimix.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=vimix
-Comment=Live video mixing.
-Categories=AudioVideo;Video;Graphics;Utility;
-Icon=io.github.brunoherbelin.Vimix.svg
-Exec=vimix
-Terminal=false
diff --git a/flatpak/io.github.brunoherbelin.Vimix.json b/flatpak/io.github.brunoherbelin.Vimix.json
index 46cd82e..e79fe95 100644
--- a/flatpak/io.github.brunoherbelin.Vimix.json
+++ b/flatpak/io.github.brunoherbelin.Vimix.json
@@ -4,6 +4,8 @@
"runtime-version": "43",
"sdk": "org.gnome.Sdk",
"command": "vimix",
+ "rename-desktop-file": "vimix.desktop",
+ "rename-icon": "vimix",
"finish-args": [
"--socket=wayland",
"--socket=fallback-x11",
@@ -22,7 +24,10 @@
"/share/gdb",
"/share/info",
"/share/man",
- "/lib/debug"
+ "/share/doc",
+ "/lib/pkgconfig",
+ "/lib/debug",
+ "*.a"
],
"modules": [
{
@@ -143,12 +148,10 @@
],
"sources": [
{
- "type": "git",
- "url": "https://github.com/brunoherbelin/vimix.git",
- "tag": "0.7.3"
+ "type":"dir",
+ "path": "/home/bhbn/Development/vimix"
}
]
}
- ],
- "_comment": "run 'git config --global --add protocol.file.allow always' before build"
+ ]
}
diff --git a/flatpak/io.github.brunoherbelin.Vimix.svg b/flatpak/io.github.brunoherbelin.Vimix.svg
deleted file mode 100644
index 9ffe555..0000000
--- a/flatpak/io.github.brunoherbelin.Vimix.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
\ No newline at end of file
diff --git a/share/applications/vimix.desktop b/share/applications/vimix.desktop
new file mode 100644
index 0000000..ff21eb7
--- /dev/null
+++ b/share/applications/vimix.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=vimix
+GenericName=Video mixer
+Comment=Live video mixing
+Categories=AudioVideo;Video;Graphics;
+Icon=vimix.svg
+Exec=vimix
+MimeType=application/mix+xml
+Terminal=false
diff --git a/share/icons/hicolor/scalable/apps/vimix.svg b/share/icons/hicolor/scalable/apps/vimix.svg
new file mode 100644
index 0000000..00f4fe0
--- /dev/null
+++ b/share/icons/hicolor/scalable/apps/vimix.svg
@@ -0,0 +1,232 @@
+
+
diff --git a/flatpak/io.github.brunoherbelin.Vimix.metainfo.xml b/share/metainfo/io.github.brunoherbelin.Vimix.metainfo.xml
similarity index 92%
rename from flatpak/io.github.brunoherbelin.Vimix.metainfo.xml
rename to share/metainfo/io.github.brunoherbelin.Vimix.metainfo.xml
index ebe8079..e81c7e3 100644
--- a/flatpak/io.github.brunoherbelin.Vimix.metainfo.xml
+++ b/share/metainfo/io.github.brunoherbelin.Vimix.metainfo.xml
@@ -1,8 +1,8 @@
-
+
io.github.brunoherbelin.Vimix
- io.github.brunoherbelin.Vimix.desktop
+ vimix.desktop
vimix
Video live mixer
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71a9be6..d5b1470 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -266,6 +266,8 @@ IF(APPLE)
ELSE(APPLE)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/share DESTINATION ${CMAKE_INSTALL_PREFIX})
+
install(TARGETS ${VMIX_BINARY}
CONFIGURATIONS Release RelWithDebInfo
RUNTIME DESTINATION bin COMPONENT Runtime