Commit 42029fc8 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Update the versions of most external dependencies

parent a8f901e4
......@@ -4,8 +4,8 @@ if (MSVC)
ExternalProject_Add(
ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.zip
URL_MD5 8aca361a4713a1f491b0a5e33fee0f1f
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
URL_MD5 015ae4afa6f3e597232bfe1dab949ace
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat --prefix=${PREFIX_ext_boost}
BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=msvc-14.0 variant=release link=shared threading=multi architecture=x86 address-model=64 variant=release install
......@@ -27,8 +27,8 @@ if (MSVC)
ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.zip
URL_MD5 8aca361a4713a1f491b0a5e33fee0f1f
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
URL_MD5 015ae4afa6f3e597232bfe1dab949ace
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat --prefix=${PREFIX_ext_boost}
BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=msvc-14.0 variant=release link=shared threading=multi architecture=x86 variant=release install
......@@ -49,8 +49,8 @@ if (MSVC)
else()
ExternalProject_Add( ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.tar.bz2
URL_MD5 d6eef4b4cacb2183f2bf265a5a03a354
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.tar.bz2
URL_MD5 6095876341956f65f9d35939ccea1a9f
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.sh --prefix=${PREFIX_ext_boost} --with-libraries=system
BUILD_COMMAND <SOURCE_DIR>/b2 install
......
SET(EXTPREFIX_eigen3 "${EXTPREFIX}" )
ExternalProject_Add( ext_eigen3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/eigen3-3.2.6.tar.gz
URL_MD5 9f93bfc14ba0816220c9674e99b8c418
URL http://files.kde.org/krita/build/dependencies/eigen-eigen-07105f7124f9.tar.gz
URL_MD5 135d8d43aaee5fb54cf5f3e981b1a6db
INSTALL_DIR ${EXTPREFIX_eigen3}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/dart.diff
......
......@@ -3,8 +3,8 @@ SET(PREFIX_ext_expat "${EXTPREFIX}" )
if (MSVC)
ExternalProject_Add( ext_expat
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
URL http://files.kde.org/krita/build/dependencies/expat-2.2.0.tar.bz2
URL_MD5 2f47841c829facb346eb6e3fab5212e2
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/expat-2.1.0-20130311.diff
INSTALL_DIR ${PREFIX_ext_expat}
......@@ -19,8 +19,8 @@ else()
ExternalProject_Add( ext_expat
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
URL http://files.kde.org/krita/build/dependencies/expat-2.2.0.tar.bz2
URL_MD5 2f47841c829facb346eb6e3fab5212e2
INSTALL_DIR ${PREFIX_ext_expat}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_expat} ${GLOBAL_AUTOMAKE_PROFILE}
......
SET(PREFIX_ext_fontconfig "${EXTPREFIX}" )
ExternalProject_Add( ext_fontconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/fontconfig-2.11.94.tar.gz
URL_MD5 479be870c7f83f15f87bac085b61d641
URL http://files.kde.org/krita/build/dependencies/fontconfig-2.12.0.tar.gz
URL_MD5 d8b056231abcb6257db6dc6d745360b2
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_fontconfig} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
......
......@@ -18,7 +18,7 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/extra-cmake-modules-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/extra-cmake-modules-5.24.0.zip
URL_MD5 c302bb1771b7c366c6eeebf3742b2f54
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -34,7 +34,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/karchive-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/karchive-5.24.0.zip
URL_MD5 d6bf0fcb6dbcffe1328b75f427593fd0
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -51,7 +51,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kconfig-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kconfig-5.24.0.zip
URL_MD5 f321e98ce591fdb3632e04c770a5b0c6
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
......@@ -69,7 +69,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kwidgetsaddons-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kwidgetsaddons-5.24.0.zip
URL_MD5 bd32206b1973a3a13e7c405f135479c7
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
......@@ -87,7 +87,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kcompletion-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kcompletion-5.24.0.zip
URL_MD5 f853f34a8bb8433ced2d7c46148361ce
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -104,7 +104,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kcoreaddons-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kcoreaddons-5.24.0.zip
URL_MD5 75145cb1bc3a78fe4f13ce4383e76947
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
......@@ -122,7 +122,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kguiaddons-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kguiaddons-5.24.0.zip
URL_MD5 43b49b25d3ee9025d7172033d255e3b5
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -139,7 +139,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/ki18n-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/ki18n-5.24.0.zip
URL_MD5 7d60380d09f98defbf878ea9daba0fbb
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n.diff
......@@ -158,7 +158,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kitemmodels-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kitemmodels-5.24.0.zip
URL_MD5 708504fd52db768093baac3666503bc3
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -174,7 +174,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kitemviews-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kitemviews-5.24.0.zip
URL_MD5 9280c5e7e669cd6241b62c5a6958202d
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -190,7 +190,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kimageformats-02-02-2016.tgz
URL http://download.kde.org/stable/frameworks/5.24/kimageformats-5.24.0.zip
URL_MD5 09a923703832181455bc61d67c692040
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
......@@ -207,7 +207,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kwindowsystem-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kwindowsystem-5.24.0.zip
URL_MD5 990c241d7fa88774ccd5176ec6bdcbdc
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
......@@ -226,7 +226,7 @@ if (LINUX)
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kcrash-5.17.0.zip
URL http://download.kde.org/stable/frameworks/5.24/kcrash-5.24.0.zip
URL_MD5 b6b865aff352d697928a9165c6564f8f
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......
SET(PREFIX_ext_freetype "${EXTPREFIX}" )
ExternalProject_Add( ext_freetype
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/freetype-2.6.tar.gz
URL_MD5 1d733ea6c1b7b3df38169fbdbec47d2b
URL http://files.kde.org/krita/build/dependencies/freetype-2.6.5.tar.gz
URL_MD5 31b2276515d9ee1c7f37d9c9f4f3145a
INSTALL_DIR ${PREFIX_ext_freetype}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_freetype} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......
......@@ -17,8 +17,8 @@ ExternalProject_Add(
else (MSVC)
ExternalProject_Add( ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext-0.19.6.tar.gz
URL_MD5 6d1447f8c5c45c329371ef4bfe7d79a5
URL http://files.kde.org/krita/build/dependencies/gettext-0.19.8.tar.xz
URL_MD5 3e7ed1ac886b9b1a4e23e71113da6358
INSTALL_DIR ${PREFIX_ext_gettext}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java ${GLOBAL_AUTOMAKE_PROFILE}
......
SET(PREFIX_ext_jpeg "${EXTPREFIX}" )
if (MSVC)
ExternalProject_Add( ext_jpeg
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz
URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
INSTALL_DIR ${PREFIX_ext_jpeg}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DWITH_SIMD=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......@@ -14,8 +14,8 @@ ExternalProject_Add( ext_jpeg
else()
ExternalProject_Add( ext_jpeg
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
URL http://files.kde.org/krita/build/dependencieslibjpeg-turbo-1.5.0.tar.gz
URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_jpeg} ${GLOBAL_AUTOMAKE_PROFILE} --without-simd
BUILD_COMMAND make
......
......@@ -2,8 +2,8 @@ SET(PREFIX_ext_lcms2 "${EXTPREFIX}" )
if (MSVC)
ExternalProject_Add( ext_lcms2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/lcms2-2.7.tar.gz
URL_MD5 06c1626f625424a811fb4b5eb070839d
URL http://files.kde.org/krita/build/dependencies/lcms2-2.8rc1.tar.gz
URL_MD5 eb81dd3664ba25a69eb5d28f1c1915ba
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/lcms2-2.4-20130124.diff
INSTALL_DIR ${PREFIX_ext_lcms2}
......@@ -16,8 +16,8 @@ ExternalProject_Add( ext_lcms2
else (MSVC)
ExternalProject_Add( ext_lcms2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/lcms2-2.7.tar.gz
URL_MD5 06c1626f625424a811fb4b5eb070839d
URL http://files.kde.org/krita/build/dependencies/lcms2-2.8rc1.tar.gz
URL_MD5 eb81dd3664ba25a69eb5d28f1c1915ba
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_lcms2} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
......
SET(PREFIX_ext_libraw "${EXTPREFIX}" )
ExternalProject_Add( ext_libraw
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/LibRaw-0.17.1.tar.gz
URL_MD5 1d272599e73b2c1d718621b68dcae5a8
URL http://files.kde.org/krita/build/dependencies/LibRaw-0.17.2.tar.gz
URL_MD5 456626300777209def1ea784910f326a
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libraw.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libraw} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......
......@@ -2,8 +2,8 @@ SET(PREFIX_ext_libxml2 "${EXTPREFIX}" )
if (MSVC)
ExternalProject_Add( ext_libxml2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libxml2-2.8.0.tar.gz
URL_MD5 c62106f02ee00b6437f0fb9d370c1093
URL http://files.kde.org/krita/build/dependencies/libxml2-sources-2.9.3.tar.gz
URL_MD5 817ee2f5297e9763097074575903682d
INSTALL_DIR ${PREFIX_ext_libxml2}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libxml2-2.8.0-20110105.diff
......@@ -16,8 +16,8 @@ if (MSVC)
else (MSVC)
ExternalProject_Add( ext_libxml2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libxml2-2.8.0.tar.gz
URL_MD5 c62106f02ee00b6437f0fb9d370c1093
URL http://files.kde.org/krita/build/dependencies/libxml2-sources-2.9.3.tar.gz
URL_MD5 817ee2f5297e9763097074575903682d
INSTALL_DIR ${PREFIX_ext_libxml2}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_libxml2} ${GLOBAL_AUTOMAKE_PROFILE}
......
......@@ -2,8 +2,8 @@ SET(PREFIX_ext_libxslt "${EXTPREFIX}" )
if (MSVC)
ExternalProject_Add( ext_libxslt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.26.tar.gz
URL_MD5 e61d0364a30146aaa3001296f853b2b9
URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.29.tar.gz
URL_MD5 a129d3c44c022de3b9dcf6d6f288d72e
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libxslt-1.1.26-20101102.diff
INSTALL_DIR ${PREFIX_ext_libxslt}
......@@ -16,8 +16,8 @@ ExternalProject_Add( ext_libxslt
else (MSVC)
ExternalProject_Add( ext_libxslt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.26.tar.gz
URL_MD5 e61d0364a30146aaa3001296f853b2b9
URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.29.tar.gz
URL_MD5 a129d3c44c022de3b9dcf6d6f288d72e
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_libxslt} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
......
......@@ -8,8 +8,8 @@ if (MSVC)
ExternalProject_Add(
ext_ocio
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/ext_ocio.zip
URL_MD5 e0bc2c7177dc02bdc82e8f38f52b1058
URL http://files.kde.org/krita/build/dependencies/imageworks-OpenColorIO-v1.0.8-0-g19ed2e3.zip
URL_MD5 084584fb45d2979048e7acc2f10c756b
INSTALL_DIR ${EXTPREFIX_ocio}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF
......@@ -22,8 +22,8 @@ else()
ExternalProject_Add(
ext_ocio
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/opencolorio-a557a85454ee1ffa8cb66f8a96238e079c452f08.tgz
URL_MD5 c7db4cdcac40ab12870cdeb6bbd0b875
URL http://files.kde.org/krita/build/dependencies/imageworks-OpenColorIO-v1.0.8-0-g19ed2e3.tar.gz
URL_MD5 9838f5f1cf624a3d1253241f22e2179a
INSTALL_DIR ${EXTPREFIX_ocio}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF
......
SET(PREFIX_ext_png "${EXTPREFIX}" )
ExternalProject_Add( ext_png
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libpng-1.6.19.tar.gz
URL_MD5 f852029626d399bea8e20008af377ee5
URL http://files.kde.org/krita/build/dependencies/libpng-1.6.23.tar.xz
URL_MD5 9b320a05ed4db1f3f0865c8a951fd9aa
INSTALL_DIR ${PREFIX_ext_png}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_png} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......
SET(PREFIX_ext_poppler "${EXTPREFIX}" )
ExternalProject_Add( ext_poppler
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/poppler-0.38.0.tar.gz
URL_MD5 4554b04eedfd56c3a65be9f108e306f5
URL http://files.kde.org/krita/build/dependencies/poppler-0.45.0.tar.xz
URL_MD5 a66e8c3cf6dab91dab5ba90d362c6063
INSTALL_DIR ${PREFIX_ext_poppler}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_poppler} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=FALSE -BUILD_CPP_TESTS=FALSE -DENABLE_UTILS=FALSE -DENABLE_GLIB=FALSE
......
SET(PREFIX_ext_pthreads "${EXTPREFIX}" )
ExternalProject_Add( ext_pthreads
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/pthreads-w32-2-8-0-release.tar.gz
URL_MD5 6d30c693233b1464ef8983fedd8ccb22
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/pthreads-w32-2-9-1-release.tar.gz
URL_MD5 36ba827d6aa0fa9f9ae740a35626e2e3
INSTALL_DIR ${PREFIX_ext_pthreads}
INSTALL_DIR ${PREFIX_ext_pthreads}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/pthreads-w32-2-8-0-release-20110729.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_pthreads} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_pthreads} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch
)
diff -Nru pthreads-w32-2-8-0-release.orig/CMakeLists.txt pthreads-w32-2-8-0-release/CMakeLists.txt
--- pthreads-w32-2-8-0-release.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ pthreads-w32-2-8-0-release/CMakeLists.txt 2011-07-29 13:36:02.199191000 +0200
diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/CMakeLists.txt pthreads-w32-2-9-1-release/CMakeLists.txt
--- pthreads-w32-2-9-1-release.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ pthreads-w32-2-9-1-release/CMakeLists.txt 2013-09-01 13:00:26.055970400 +0200
@@ -0,0 +1,224 @@
+project(pthreads)
+
......@@ -8,7 +8,7 @@ diff -Nru pthreads-w32-2-8-0-release.orig/CMakeLists.txt pthreads-w32-2-8-0-rele
+
+option(BUILD_STATIC "build pthreads as a static library" OFF)
+option(BUILD_INLINED "build pthreads as with inlined functions" ON)
+option(BUILD_TESTS "build test executables for pthreads" OFF)
+option(BUILD_TESTS "build test executables for pthreads" ON)
+
+if(BUILD_TESTS)
+ enable_testing()
......@@ -226,11 +226,11 @@ diff -Nru pthreads-w32-2-8-0-release.orig/CMakeLists.txt pthreads-w32-2-8-0-rele
+ ARCHIVE DESTINATION lib)
+
+install(FILES ${pthreads_HDRS} DESTINATION include)
\ No newline at end of file
diff -Nru pthreads-w32-2-8-0-release.orig/config.h pthreads-w32-2-8-0-release/config.h
--- pthreads-w32-2-8-0-release.orig/config.h 2005-04-25 04:18:00.000000000 +0200
+++ pthreads-w32-2-8-0-release/config.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,134 +0,0 @@
\ Kein Zeilenumbruch am Dateiende.
diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/config.h pthreads-w32-2-9-1-release/config.h
--- pthreads-w32-2-9-1-release.orig/config.h 2011-05-30 02:31:00.000000000 +0200
+++ pthreads-w32-2-9-1-release/config.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,153 +0,0 @@
-/* config.h */
-
-#ifndef PTW32_CONFIG_H
......@@ -279,12 +279,26 @@ diff -Nru pthreads-w32-2-8-0-release.orig/config.h pthreads-w32-2-8-0-release/co
-/* Do we know about type mode_t? */
-#undef HAVE_MODE_T
-
-/*
- * Define if GCC has atomic builtins, i.e. __sync_* intrinsics
- * __sync_lock_* is implemented in mingw32 gcc 4.5.2 at least
- * so this define does not turn those on or off. If you get an
- * error from __sync_lock* then consider upgrading your gcc.
- */
-#undef HAVE_GCC_ATOMIC_BUILTINS
-
-/* Define if you have the timespec struct */
-#undef HAVE_STRUCT_TIMESPEC
-
-/* Define if you don't have the GetProcessAffinityMask() */
-#undef NEED_PROCESS_AFFINITY_MASK
-
-/* Define if your version of Windows TLSGetValue() clears WSALastError
- * and calling SetLastError() isn't enough restore it. You'll also need to
- * link against wsock32.lib (or libwsock32.a for MinGW).
- */
-#undef RETAIN_WSALASTERROR
-
-/*
-# ----------------------------------------------------------------------
-# The library can be built with some alternative behaviour to better
......@@ -327,37 +341,42 @@ diff -Nru pthreads-w32-2-8-0-release.orig/config.h pthreads-w32-2-8-0-release/co
- * If you find that these are incorrect or incomplete please report it
- * to the pthreads-win32 maintainer. Thanks.
- *********************************************************************/
-#ifdef WINCE
-#if defined(WINCE)
-#define NEED_DUPLICATEHANDLE
-#define NEED_CREATETHREAD
-#define NEED_ERRNO
-#define NEED_CALLOC
-#define NEED_FTIME
-//#define NEED_SEM
-/* #define NEED_SEM */
-#define NEED_UNICODE_CONSTS
-#define NEED_PROCESS_AFFINITY_MASK
-/* This may not be needed */
-#define RETAIN_WSALASTERROR
-#endif
-
-#ifdef _UWIN
-#if defined(_UWIN)
-#define HAVE_MODE_T
-#define HAVE_STRUCT_TIMESPEC
-#endif
-
-#ifdef __GNUC__
-#if defined(__GNUC__)
-#define HAVE_C_INLINE
-#endif
-
-#ifdef __MINGW32__
-#if defined(__MINGW64__)
-#define HAVE_MODE_T
-#define HAVE_STRUCT_TIMESPEC
-#elif defined(__MINGW32__)
-#define HAVE_MODE_T
-#endif
-
-#ifdef __BORLANDC__
-#if defined(__BORLANDC__)
-#endif
-
-#ifdef __WATCOMC__
-#if defined(__WATCOMC__)
-#endif
-
-#ifdef __DMC__
-#if defined(__DMC__)
-#define HAVE_SIGNAL_H
-#define HAVE_C_INLINE
-#endif
......@@ -365,10 +384,10 @@ diff -Nru pthreads-w32-2-8-0-release.orig/config.h pthreads-w32-2-8-0-release/co
-
-
-#endif
diff -Nru pthreads-w32-2-8-0-release.orig/config.h.cmake pthreads-w32-2-8-0-release/config.h.cmake
--- pthreads-w32-2-8-0-release.orig/config.h.cmake 1970-01-01 01:00:00.000000000 +0100
+++ pthreads-w32-2-8-0-release/config.h.cmake 2011-07-29 13:30:02.140596800 +0200
@@ -0,0 +1,134 @@
diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/config.h.cmake pthreads-w32-2-9-1-release/config.h.cmake
--- pthreads-w32-2-9-1-release.orig/config.h.cmake 1970-01-01 01:00:00.000000000 +0100
+++ pthreads-w32-2-9-1-release/config.h.cmake 2013-09-01 13:19:57.134952300 +0200
@@ -0,0 +1,148 @@
+/* config.h */
+
+#ifndef PTW32_CONFIG_H
......@@ -417,12 +436,26 @@ diff -Nru pthreads-w32-2-8-0-release.orig/config.h.cmake pthreads-w32-2-8-0-rele
+/* Do we know about type mode_t? */
+#undef HAVE_MODE_T
+
+/*
+ * Define if GCC has atomic builtins, i.e. __sync_* intrinsics
+ * __sync_lock_* is implemented in mingw32 gcc 4.5.2 at least
+ * so this define does not turn those on or off. If you get an
+ * error from __sync_lock* then consider upgrading your gcc.
+ */
+#undef HAVE_GCC_ATOMIC_BUILTINS
+
+/* Define if you have the timespec struct */
+#cmakedefine HAVE_STRUCT_TIMESPEC
+
+/* Define if you don't have the GetProcessAffinityMask() */
+#undef NEED_PROCESS_AFFINITY_MASK
+
+/* Define if your version of Windows TLSGetValue() clears WSALastError
+ * and calling SetLastError() isn't enough restore it. You'll also need to
+ * link against wsock32.lib (or libwsock32.a for MinGW).
+ */
+#undef RETAIN_WSALASTERROR
+
+/*
+# ----------------------------------------------------------------------
+# The library can be built with some alternative behaviour to better
......@@ -503,9 +536,9 @@ diff -Nru pthreads-w32-2-8-0-release.orig/config.h.cmake pthreads-w32-2-8-0-rele
+
+
+#endif
diff -Nru pthreads-w32-2-8-0-release.orig/ConfigureChecks.cmake pthreads-w32-2-8-0-release/ConfigureChecks.cmake
--- pthreads-w32-2-8-0-release.orig/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100
+++ pthreads-w32-2-8-0-release/ConfigureChecks.cmake 2011-07-29 13:35:12.121326700 +0200
diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/ConfigureChecks.cmake pthreads-w32-2-9-1-release/ConfigureChecks.cmake
--- pthreads-w32-2-9-1-release.orig/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100
+++ pthreads-w32-2-9-1-release/ConfigureChecks.cmake 2013-09-01 13:39:02.982491000 +0200
@@ -0,0 +1,16 @@
+# Configure checks for the config.h
+
......@@ -519,13 +552,13 @@ diff -Nru pthreads-w32-2-8-0-release.orig/ConfigureChecks.cmake pthreads-w32-2-8
+SET(CMAKE_EXTRA_INCLUDE_FILES)
+
+
+add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DHAVE_PTW32_CONFIG_H)
+
+configure_file(config.h.cmake ${CMAKE_SOURCE_DIR}/config.h)
+
diff -Nru pthreads-w32-2-8-0-release.orig/create.c pthreads-w32-2-8-0-release/create.c
--- pthreads-w32-2-8-0-release.orig/create.c 2005-05-06 09:31:31.000000000 +0200
+++ pthreads-w32-2-8-0-release/create.c 2011-07-29 13:23:37.214580300 +0200
diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/create.c pthreads-w32-2-9-1-release/create.c
--- pthreads-w32-2-9-1-release.orig/create.c 2012-03-18 06:11:43.000000000 +0100
+++ pthreads-w32-2-9-1-release/create.c 2013-09-01 13:00:26.086972100 +0200
@@ -94,6 +94,11 @@
int priority;
pthread_t self;
......@@ -538,10 +571,10 @@ diff -Nru pthreads-w32-2-8-0-release.orig/create.c pthreads-w32-2-8-0-release/cr
/*
* Before doing anything, check that tid can be stored through
* without invoking a memory protection error (segfault).
diff -Nru pthreads-w32-2-8-0-release.orig/implement.h pthreads-w32-2-8-0-release/implement.h
--- pthreads-w32-2-8-0-release.orig/implement.h 2005-06-03 10:36:27.000000000 +0200
+++ pthreads-w32-2-8-0-release/implement.h 2011-07-29 13:23:37.224580900 +0200
@@ -56,6 +56,7 @@
diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/implement.h pthreads-w32-2-9-1-release/implement.h
--- pthreads-w32-2-9-1-release.orig/implement.h 2012-03-18 06:11:43.000000000 +0100
+++ pthreads-w32-2-9-1-release/implement.h 2013-09-01 13:00:26.098972800 +0200
@@ -55,6 +55,7 @@
* note: ETIMEDOUT is correctly defined in winsock.h
*/
#include <winsock.h>
......@@ -549,7 +582,7 @@ diff -Nru pthreads-w32-2-8-0-release.orig/implement.h pthreads-w32-2-8-0-release
/*
* In case ETIMEDOUT hasn't been defined above somehow.
@@ -75,6 +76,8 @@
@@ -78,6 +79,8 @@
/* use local include files during development */
#include "semaphore.h"
#include "sched.h"
......
......@@ -3,8 +3,8 @@ if (WIN32)
ExternalProject_Add(
ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.zip
URL_MD5 03402708f260dcc917abae9bc559c1df
URL https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.zip
URL_MD5 9d7ea0cadcec7b5a63e8e83686756978
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/disable-wintab.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qtgui-private-headers.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
......@@ -28,8 +28,8 @@ else()
ExternalProject_Add(
ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.gz
URL_MD5 7a2a867bc12384f4161809136d49d4be
URL https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz
URL_MD5 f44fd4fcae71087f90d9c68e9d8be449
INSTALL_DIR ${EXTPREFIX_qt}
CONFIGURE_COMMAND "<SOURCE_DIR>/configure -confirm-license -opensource -nomake examples \
-no-openssl \
......@@ -50,8 +50,8 @@ else()
ExternalProject_Add(
ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.gz
URL_MD5 7a2a867bc12384f4161809136d49d4be
URL https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz
URL_MD5 f44fd4fcae71087f90d9c68e9d8be449
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qt-no-motion-compression.diff
INSTALL_DIR ${EXTPREFIX_qt}
CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXTPREFIX_qt} -opensource -confirm-license -nomake examples -no-sql-sqlite -no-openssl -no-qml-debug -no-mtdev -no-journald -no-syslog -no-nis -no-cups -no-tslib -no-directfb -no-linuxfb -no-libproxy -no-pch -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-harfbuzz -qt-freetype -qt-xcb -qt-xkbcommon-x11 -optimized-qmake -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview
......
......@@ -16,8 +16,8 @@ ExternalProject_Add( ext_tiff
else (MSVC)
ExternalProject_Add( ext_tiff
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/tiff-4.0.3.tar.gz
URL_MD5 051c1068e6a0627f461948c365290410
URL http://files.kde.org/krita/build/dependencies/tiff-4.0.6.tar.gz
URL_MD5 d1d2e940dea0b5ad435f21f03d96dd72
CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXTPREFIX_tiff} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
......
......@@ -3,8 +3,8 @@ if (MSVC)
ExternalProject_Add(
ext_zlib
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/zlib-1.2.7.tar.gz
URL_MD5 60df6a37c56e7c1366cca812414f7b85
URL http://files.kde.org/krita/build/dependencies/zlib-1.2.8.tar.gz
URL_MD5 44d667c142d7cda120332623eab69f40
INSTALL_DIR ${PREFIX_ext_zlib}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.7-20130123.diff
......@@ -17,8 +17,8 @@ ExternalProject_Add(
else ()
ExternalProject_Add( ext_zlib
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies//zlib-1.2.7.tar.gz
URL_MD5 60df6a37c56e7c1366cca812414f7b85
URL http://files.kde.org/krita/build/dependencies/zlib-1.2.8.tar.gz
URL_MD5 44d667c142d7cda120332623eab69f40
INSTALL_DIR ${PREFIX_ext_zlib}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.7.diff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment