[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] /: Update AppImage dependencies
From:       Łukasz_Wojniłowicz <null () kde ! org>
Date:       2018-09-11 19:01:46
Message-ID: E1fznv0-0005jl-2c () code ! kde ! org
[Download RAW message or body]

Git commit 25d39a493f4157f1c1ad700ee349fb7ce17b24ac by Łukasz Wojniłowicz.
Committed on 11/09/2018 at 19:01.
Pushed by wojnilowicz into branch 'master'.

Update AppImage dependencies

M  +2    -0    3rdparty/CMakeLists.txt
A  +13   -0    3rdparty/ext_jpeg/CMakeLists.txt
A  +16   -0    3rdparty/ext_nasm/CMakeLists.txt
M  +2    -1    packaging/linux/appimage/build-deps.sh

https://commits.kde.org/kmymoney/25d39a493f4157f1c1ad700ee349fb7ce17b24ac

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 38e6859d8..2beb05dd2 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -63,6 +63,8 @@ add_subdirectory( ext_icu )
 add_subdirectory( ext_xml )
 add_subdirectory( ext_gettext )
 add_subdirectory( ext_png )
+add_subdirectory( ext_nasm )
+add_subdirectory( ext_jpeg )
 add_subdirectory( ext_boost )
 add_subdirectory( ext_xslt )
 add_subdirectory( ext_fontconfig)
diff --git a/3rdparty/ext_jpeg/CMakeLists.txt b/3rdparty/ext_jpeg/CMakeLists.txt
new file mode 100644
index 000000000..0134a0852
--- /dev/null
+++ b/3rdparty/ext_jpeg/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(PREFIX_ext_jpeg "${EXTPREFIX}")
+
+ExternalProject_Add( ext_jpeg
+  DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+  URL https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-2.0.0.tar.gz
+  URL_MD5 b12a3fcf1d078db38410f27718a91b83
+
+  INSTALL_DIR ${PREFIX_ext_jpeg}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} \
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} +
+  UPDATE_COMMAND ""
+  DEPENDS ext_nasm
+)
diff --git a/3rdparty/ext_nasm/CMakeLists.txt b/3rdparty/ext_nasm/CMakeLists.txt
new file mode 100644
index 000000000..392926073
--- /dev/null
+++ b/3rdparty/ext_nasm/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(PREFIX_ext_nasm "${EXTPREFIX}")
+
+ExternalProject_Add(
+  ext_nasm
+  DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+  URL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.xz
+  URL_MD5 d5ca2ad7121ccbae69dd606b1038532c
+
+  INSTALL_DIR ${PREFIX_ext_nasm}
+  CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_nasm} \
${GLOBAL_AUTOMAKE_PROFILE} +  BUILD_COMMAND make
+  INSTALL_COMMAND make install
+
+  UPDATE_COMMAND ""
+  BUILD_IN_SOURCE 1
+)
diff --git a/packaging/linux/appimage/build-deps.sh \
b/packaging/linux/appimage/build-deps.sh index 6980a29fc..4dcf362b5 100755
--- a/packaging/linux/appimage/build-deps.sh
+++ b/packaging/linux/appimage/build-deps.sh
@@ -63,7 +63,8 @@ cmake --build . --config RelWithDebInfo --target ext_iconv
 # cmake --build . --config RelWithDebInfo --target ext_icu
 cmake --build . --config RelWithDebInfo --target ext_xml # must be before gettext
 cmake --build . --config RelWithDebInfo --target ext_gettext
-# cmake --build . --config RelWithDebInfo --target ext_png
+cmake --build . --config RelWithDebInfo --target ext_jpeg
+cmake --build . --config RelWithDebInfo --target ext_png
 cmake --build . --config RelWithDebInfo --target ext_boost
 cmake --build . --config RelWithDebInfo --target ext_xslt # for ext_xmlsec1
 # cmake --build . --config RelWithDebInfo --target ext_fontconfig


[prev in list] [next in list] [prev in thread] [next in thread]