Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
f87002ed
Commit
f87002ed
authored
Nov 19, 2020
by
Jean-Baptiste Mardelle
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add libass target for AppImage
parent
5baea514
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
1 deletion
+15
-1
packaging/appimage/3rdparty/CMakeLists.txt
packaging/appimage/3rdparty/CMakeLists.txt
+1
-0
packaging/appimage/3rdparty/ext_ass/CMakeLists.txt
packaging/appimage/3rdparty/ext_ass/CMakeLists.txt
+12
-0
packaging/appimage/3rdparty/ext_ffmpeg/CMakeLists.txt
packaging/appimage/3rdparty/ext_ffmpeg/CMakeLists.txt
+1
-1
packaging/appimage/build-dependencies.sh
packaging/appimage/build-dependencies.sh
+1
-0
No files found.
packaging/appimage/3rdparty/CMakeLists.txt
View file @
f87002ed
...
...
@@ -104,6 +104,7 @@ add_subdirectory( ext_libvpx )
add_subdirectory
(
ext_nv-codec-headers
)
add_subdirectory
(
ext_amf
)
add_subdirectory
(
ext_mfx
)
add_subdirectory
(
ext_ass
)
add_subdirectory
(
ext_ffmpeg
)
add_subdirectory
(
ext_cairo
)
add_subdirectory
(
ext_pango
)
...
...
packaging/appimage/3rdparty/ext_ass/CMakeLists.txt
0 → 100644
View file @
f87002ed
ExternalProject_Add
(
ext_libass
DOWNLOAD_DIR
${
EXT_DOWNLOAD_DIR
}
GIT_REPOSITORY https://github.com/libass/libass.git
CONFIGURE_COMMAND <SOURCE_DIR>/autogen.sh && <SOURCE_DIR>/configure --prefix=
${
EXT_INSTALL_DIR
}
${
AT_HOST
}
${
AT_SHARED_ONLY
}
BUILD_IN_SOURCE 1
BUILD_ALWAYS TRUE
BUILD_COMMAND $
(
MAKE
)
clean
COMMAND $
(
MAKE
)
INSTALL_COMMAND $
(
MAKE
)
install
)
packaging/appimage/3rdparty/ext_ffmpeg/CMakeLists.txt
View file @
f87002ed
...
...
@@ -7,7 +7,7 @@ ExternalProject_Add(
UPDATE_COMMAND git checkout debian/7%4.3-3
# PATCH_COMMAND rm <SOURCE_DIR>/tests/ref/fate/sub-scc
GIT_TAG debian/master
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=
${
EXT_INSTALL_DIR
}
--extra-ldflags=
"-L
${
EXT_INSTALL_DIR
}
/lib -lstdc++ -lm -lrt -ldl"
--extra-cflags=
"-I$EXT_INSTALL_DIR/include"
--enable-shared --enable-avfilter --enable-gpl --enable-avresample --enable-libx265 --enable-libvpx --enable-libx264 --disable-doc --enable-libmp3lame --enable-libopus --enable-libvorbis --enable-nvenc --enable-
libmfx --enable-vaapi
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=
${
EXT_INSTALL_DIR
}
--extra-ldflags=
"-L
${
EXT_INSTALL_DIR
}
/lib -lstdc++ -lm -lrt -ldl"
--extra-cflags=
"-I$EXT_INSTALL_DIR/include"
--enable-shared --enable-avfilter --enable-gpl --enable-avresample --enable-libx265 --enable-libvpx --enable-libx264 --disable-doc --enable-libmp3lame --enable-libopus --enable-libvorbis --enable-nvenc --enable-
vaapi --enable-amf --enable-libass
BUILD_ALWAYS TRUE
BUILD_IN_SOURCE 1
BUILD_COMMAND $
(
MAKE
)
clean
...
...
packaging/appimage/build-dependencies.sh
View file @
f87002ed
...
...
@@ -126,6 +126,7 @@ cmake --build . --target ext_opus -j$CPU_CORES
cmake
--build
.
--target
ext_nv-codec-headers
-j
$CPU_CORES
cmake
--build
.
--target
ext_amf
-j
$CPU_CORES
cmake
--build
.
--target
ext_mfx
-j
$CPU_CORES
cmake
--build
.
--target
ext_libass
-j
$CPU_CORES
cmake
--build
.
--target
ext_ffmpeg
-j
$CPU_CORES
cmake
--build
.
--target
ext_sox
-j
$CPU_CORES
cmake
--build
.
--target
ext_jack
-j
$CPU_CORES
...
...
Julius Künzel
@jlskuz
mentioned in issue
#666
·
Nov 23, 2020
mentioned in issue
#666
mentioned in issue #666
Toggle commit list
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