Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
e938afc0
Commit
e938afc0
authored
Apr 18, 2021
by
Farid Abdelnour
🎥
Committed by
Julius Künzel
Apr 18, 2021
Browse files
More flatpak improvements
parent
72d3eef9
Pipeline
#58685
passed with stage
in 9 minutes and 10 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
packaging/flatpak/org.kde.kdenlive-nightly.json
View file @
e938afc0
...
...
@@ -20,6 +20,32 @@
"--env=FREI0R_PATH=/app/lib/frei0r-1"
,
"--env=LADSPA_PATH=/app/lib/ladspa"
],
"add-extensions"
:
{
"org.freedesktop.LinuxAudio.Plugins"
:
{
"directory"
:
"extensions/Plugins"
,
"version"
:
"20.08"
,
"add-ld-path"
:
"lib"
,
"merge-dirs"
:
"ladspa"
,
"subdirectories"
:
true
,
"no-autodownload"
:
true
},
"org.freedesktop.LinuxAudio.Plugins.swh"
:
{
"directory"
:
"extensions/Plugins/swh"
,
"version"
:
"20.08"
,
"add-ld-path"
:
"lib"
,
"merge-dirs"
:
"ladspa"
,
"autodelete"
:
false
,
"subdirectories"
:
true
},
"org.freedesktop.LinuxAudio.Plugins.TAP"
:
{
"directory"
:
"extensions/Plugins/TAP"
,
"version"
:
"20.08"
,
"add-ld-path"
:
"lib"
,
"merge-dirs"
:
"ladspa"
,
"autodelete"
:
false
,
"subdirectories"
:
true
}
},
"cleanup"
:
[
"/include"
,
"/lib/pkgconfig"
,
...
...
@@ -260,6 +286,28 @@
}
]
},
{
"name"
:
"exiv2"
,
"buildsystem"
:
"cmake-ninja"
,
"builddir"
:
true
,
"config-opts"
:
[
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
"cleanup"
:
[
"/bin"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://www.exiv2.org/builds/exiv2-0.27.3-Source.tar.gz"
,
"sha256"
:
"a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778"
},
{
"type"
:
"patch"
,
"path"
:
"patches/exiv2-fcf-protection-only-on-x86.patch"
}
]
},
{
"name"
:
"vidstab"
,
"buildsystem"
:
"cmake-ninja"
,
...
...
@@ -479,24 +527,6 @@
}
]
},
{
"name"
:
"nv-codec-headers"
,
"cleanup"
:
[
"*"
],
"no-autogen"
:
true
,
"make-install-args"
:
[
"PREFIX=/app"
],
"sources"
:
[
{
"type"
:
"git"
,
"url"
:
"https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"
,
"commit"
:
"7a81595786463d1c7efcb03aa85def69fc2cad41"
,
"tag"
:
"n11.0.10.0"
}
]
},
{
"name"
:
"mediasdk"
,
"buildsystem"
:
"cmake-ninja"
,
...
...
@@ -517,6 +547,52 @@
}
]
},
{
"name"
:
"opencl-headers"
,
"buildsystem"
:
"simple"
,
"build-commands"
:
[
"cp -av CL /app/include"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v2020.06.16.tar.gz"
,
"sha256"
:
"2f5a60e5ac4b127650618c58a7e3b35a84dbf23c1a0ac72eb5e7baf221600e06"
}
]
},
{
"name"
:
"amf-headers"
,
"buildsystem"
:
"simple"
,
"build-commands"
:
[
"cp -av amf/public/include/. /app/include/AMF"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v1.4.18.tar.gz"
,
"sha256"
:
"4f21ee07c8bb9b73ff48dbce7cb0917cdcd4d81d33333da391d97ce7f00642fe"
}
]
},
{
"name"
:
"nv-codec-headers"
,
"cleanup"
:
[
"*"
],
"no-autogen"
:
true
,
"make-install-args"
:
[
"PREFIX=/app"
],
"sources"
:
[
{
"type"
:
"git"
,
"url"
:
"https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"
,
"commit"
:
"7a81595786463d1c7efcb03aa85def69fc2cad41"
,
"tag"
:
"n11.0.10.0"
}
]
},
{
"name"
:
"ffmpeg"
,
"config-opts"
:
[
...
...
@@ -536,30 +612,26 @@
"--enable-libxml2"
,
"--enable-libx264"
,
"--enable-libx265"
,
"--enable-libopenjpeg"
,
"--enable-libdav1d"
,
"--enable-libv4l2"
,
"--enable-libmp3lame"
,
"--enable-vaapi"
,
"--enable-libass"
,
"--enable-gnutls"
,
"--enable-libzimg"
,
"--enable-libaom"
,
"--enable-libvidstab"
,
"--enable-libmfx"
"--enable-vaapi"
,
"--enable-libmfx"
,
"--enable-amf"
,
"--enable-opencl"
,
"--enable-ffnvcodec"
,
"--enable-cuda-llvm"
,
"--enable-nvenc"
,
"--enable-vdpau"
,
"--enable-nvdec"
,
"--enable-cuvid"
],
"build-options"
:
{
"arch"
:
{
"x86_64"
:
{
"config-opts"
:
[
"--enable-ffnvcodec"
,
"--enable-cuda-llvm"
,
"--enable-nvenc"
,
"--enable-vdpau"
,
"--enable-nvdec"
,
"--enable-cuvid"
]
}
}
},
"cleanup"
:
[
"/share/ffmpeg/examples"
],
...
...
@@ -596,6 +668,44 @@
}
]
},
{
"name"
:
"libzen"
,
"subdir"
:
"Project/GNU/Library"
,
"config-opts"
:
[
"--enable-shared"
,
"--disable-static"
],
"cleanup"
:
[
"/bin"
,
"/include"
,
"/lib/pkgconfig"
,
"/lib/*.la"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://mediaarea.net/download/source/libzen/0.4.39/libzen_0.4.39.tar.xz"
,
"sha256"
:
"cded5d7774294e7d5b42768ceb285243709b6e99eec6e980a3cf7f0890dbb622"
}
]
},
{
"name"
:
"libmediainfo"
,
"subdir"
:
"Project/GNU/Library"
,
"config-opts"
:
[
"--enable-shared"
,
"--disable-static"
,
"--with-libcurl"
],
"cleanup"
:
[
"/bin"
,
"/include"
,
"/lib/pkgconfig"
,
"/lib/*.la"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://mediaarea.net/download/source/libmediainfo/21.03/libmediainfo_21.03.tar.xz"
,
"sha256"
:
"56b7e9abf80cba48032165cd7a46fd8d43dd63e3af35765f66c3f134caaca4ca"
}
]
},
{
"name"
:
"mediainfo-cli"
,
"subdir"
:
"Project/GNU/CLI"
,
"cleanup"
:
[
"share/pixmaps"
,
"/share/apps"
,
"/share/kde4"
,
"/share/kservices5"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://mediaarea.net/download/source/mediainfo/21.03/mediainfo_21.03.tar.xz"
,
"sha256"
:
"de50ca0b2c607b8999d3c9e542d27c97030a59f31859b612335315be6850021e"
}
]
},
{
"name"
:
"rubberband"
,
"config-opts"
:
[
...
...
@@ -651,6 +761,9 @@
"config-opts"
:
[
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
"post-install"
:
[
"install -d /app/extensions/Plugins"
],
"sources"
:
[
{
"type"
:
"git"
,
...
...
packaging/flatpak/patches/exiv2-fcf-protection-only-on-x86.patch
0 → 100644
View file @
e938afc0
Author: Pino Toscano <pino@debian.org>
Description: Use -fcf-protection only on x86 architectures
It does not exist elsewhere.
Forwarded: no
Last-Update: 2020-08-09
--- a/cmake/compilerFlags.cmake
+++ b/cmake/compilerFlags.cmake
@@ -26,7 +26,10 @@
if ( MINGW OR UNIX OR MSYS ) # MINGW, Li
# This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
- add_compile_options(-fstack-clash-protection -fcf-protection)
+ add_compile_options(-fstack-clash-protection)
+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "i686|x86_64")
+ add_compile_options(-fcf-protection)
+ endif()
endif()
if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment