From 4034cbc02a58c457e29973bfad3e3b6f875e12dd Mon Sep 17 00:00:00 2001 From: Albert Diserholt Date: Tue, 20 Apr 2021 16:41:04 +0200 Subject: dev-games/aseprite-1.2.27 Signed-off-by: Albert Diserholt --- dev-games/aseprite/Manifest | 10 +-- dev-games/aseprite/aseprite-1.2.26.ebuild | 95 ---------------------- dev-games/aseprite/aseprite-1.2.27.ebuild | 95 ++++++++++++++++++++++ .../files/aseprite-1.2.26-system_libarchive.patch | 84 ------------------- .../files/aseprite-1.2.26-system_libwebp.patch | 41 ---------- .../files/aseprite-1.2.27-system_libarchive.patch | 84 +++++++++++++++++++ .../files/aseprite-1.2.27-system_libwebp.patch | 41 ++++++++++ 7 files changed, 225 insertions(+), 225 deletions(-) delete mode 100644 dev-games/aseprite/aseprite-1.2.26.ebuild create mode 100644 dev-games/aseprite/aseprite-1.2.27.ebuild delete mode 100644 dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch delete mode 100644 dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch create mode 100644 dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch create mode 100644 dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest index 4a991e0..8ad48f1 100644 --- a/dev-games/aseprite/Manifest +++ b/dev-games/aseprite/Manifest @@ -1,12 +1,12 @@ AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb -AUX aseprite-1.2.26-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab -AUX aseprite-1.2.26-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb +AUX aseprite-1.2.27-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab +AUX aseprite-1.2.27-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee -DIST Aseprite-v1.2.26-Source.zip 24506961 BLAKE2B 1e57477ecb37d76bc1b56cd649300b6030c95c67b6575515a8bf2e024ab377f25e740763fcbe0a92a1156c1157e169d51ec71979c59bd8bac186352baafd75ca SHA512 7dcf18bf006d1d59e641b2e13d67dfec44323f0a5dfc2ebee57d427cf9d58595c67c1b47a6b656df97b33fafcc3a19dac7e9d7522bb4069ad2d02bd5b0364c9c +DIST Aseprite-v1.2.27-Source.zip 24507948 BLAKE2B 1c321a1762e9e0dfa0982f77f37520f4f0b6c61a9bf96956b20137a61cbd066953bd3304dfc32df25922a24c7700c1ac5af2324ec07ac96505edf283d564e9f7 SHA512 6f8cdc64ac79c61c40c41f9f7f78ff5a3705087d818fd64cc2a56f7c9d8ae12aa5d201ea341cc75b1062fe0b467d89304da4f019c7d8b1d95203f5377e10ef94 DIST aseprite-1.2.21-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce -DIST aseprite-1.2.26-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce +DIST aseprite-1.2.27-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 EBUILD aseprite-1.2.21.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97 -EBUILD aseprite-1.2.26.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97 +EBUILD aseprite-1.2.27.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97 diff --git a/dev-games/aseprite/aseprite-1.2.26.ebuild b/dev-games/aseprite/aseprite-1.2.26.ebuild deleted file mode 100644 index 54db779..0000000 --- a/dev-games/aseprite/aseprite-1.2.26.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=7 -inherit cmake-utils toolchain-funcs - -DESCRIPTION="Animated sprite editor & pixel art tool" -HOMEPAGE="http://www.aseprite.org" -LICENSE="Proprietary" -SLOT="0" - -PATCHES=( - "${FILESDIR}/${P}-system_libarchive.patch" - "${FILESDIR}/${P}-system_libwebp.patch" -) - -SKIA_VERSION="m81-b607b32047" -SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip" -SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download" -SKIA_URI="${SKIA_BASE_URL}/${SKIA_VERSION}/${SKIA_FILE} -> ${P}-skia-${SKIA_VERSION}.zip" - -ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip" -ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}" - -SRC_URI="${ASEPRITE_URI} ${SKIA_URI}" -KEYWORDS="~amd64 ~x86" - -IUSE=" - debug - memleak - webp" - -RDEPEND=" - app-arch/libarchive - app-text/cmark - dev-libs/expat - dev-libs/tinyxml - media-libs/freetype:2 - >=media-libs/giflib-5.0 - media-libs/fontconfig - media-libs/libpng:0 - webp? ( media-libs/libwebp ) - net-misc/curl - sys-apps/util-linux - sys-libs/zlib - virtual/jpeg:= - x11-libs/libX11 - x11-libs/pixman" - -DOCS=( EULA.txt - docs/ase-file-specs.md - docs/LICENSES.md - README.md ) - -src_unpack() { - mkdir -p "${P}/skia" - cd "${P}" - unpack "${ASEPRITE_FILE}" - ( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" ) -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release - - local mycmakeargs=( - -DENABLE_UPDATER=OFF - -DFULLSCREEN_PLATFORM=ON - -DUSE_SHARED_CMARK=ON - -DUSE_SHARED_CURL=ON - -DUSE_SHARED_GIFLIB=ON - -DUSE_SHARED_JPEGLIB=ON - -DUSE_SHARED_ZLIB=ON - -DUSE_SHARED_LIBARCHIVE=ON - -DUSE_SHARED_LIBPNG=ON - -DUSE_SHARED_TINYXML=ON - -DUSE_SHARED_PIXMAN=ON - -DUSE_SHARED_FREETYPE=ON - -DUSE_SHARED_HARFBUZZ=ON - -DUSE_SHARED_WEBP=ON - -DWITH_WEBP_SUPPORT="$(usex webp)" - -DENABLE_MEMLEAK="$(usex memleak)" - -DSKIA_DIR="${S}/skia" - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - ewarn "Aseprite is for personal use only. You may not distribute it." -} diff --git a/dev-games/aseprite/aseprite-1.2.27.ebuild b/dev-games/aseprite/aseprite-1.2.27.ebuild new file mode 100644 index 0000000..54db779 --- /dev/null +++ b/dev-games/aseprite/aseprite-1.2.27.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=7 +inherit cmake-utils toolchain-funcs + +DESCRIPTION="Animated sprite editor & pixel art tool" +HOMEPAGE="http://www.aseprite.org" +LICENSE="Proprietary" +SLOT="0" + +PATCHES=( + "${FILESDIR}/${P}-system_libarchive.patch" + "${FILESDIR}/${P}-system_libwebp.patch" +) + +SKIA_VERSION="m81-b607b32047" +SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip" +SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download" +SKIA_URI="${SKIA_BASE_URL}/${SKIA_VERSION}/${SKIA_FILE} -> ${P}-skia-${SKIA_VERSION}.zip" + +ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip" +ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}" + +SRC_URI="${ASEPRITE_URI} ${SKIA_URI}" +KEYWORDS="~amd64 ~x86" + +IUSE=" + debug + memleak + webp" + +RDEPEND=" + app-arch/libarchive + app-text/cmark + dev-libs/expat + dev-libs/tinyxml + media-libs/freetype:2 + >=media-libs/giflib-5.0 + media-libs/fontconfig + media-libs/libpng:0 + webp? ( media-libs/libwebp ) + net-misc/curl + sys-apps/util-linux + sys-libs/zlib + virtual/jpeg:= + x11-libs/libX11 + x11-libs/pixman" + +DOCS=( EULA.txt + docs/ase-file-specs.md + docs/LICENSES.md + README.md ) + +src_unpack() { + mkdir -p "${P}/skia" + cd "${P}" + unpack "${ASEPRITE_FILE}" + ( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" ) +} + +src_prepare() { + cmake-utils_src_prepare +} + +src_configure() { + use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release + + local mycmakeargs=( + -DENABLE_UPDATER=OFF + -DFULLSCREEN_PLATFORM=ON + -DUSE_SHARED_CMARK=ON + -DUSE_SHARED_CURL=ON + -DUSE_SHARED_GIFLIB=ON + -DUSE_SHARED_JPEGLIB=ON + -DUSE_SHARED_ZLIB=ON + -DUSE_SHARED_LIBARCHIVE=ON + -DUSE_SHARED_LIBPNG=ON + -DUSE_SHARED_TINYXML=ON + -DUSE_SHARED_PIXMAN=ON + -DUSE_SHARED_FREETYPE=ON + -DUSE_SHARED_HARFBUZZ=ON + -DUSE_SHARED_WEBP=ON + -DWITH_WEBP_SUPPORT="$(usex webp)" + -DENABLE_MEMLEAK="$(usex memleak)" + -DSKIA_DIR="${S}/skia" + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + ewarn "Aseprite is for personal use only. You may not distribute it." +} diff --git a/dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch deleted file mode 100644 index c032508..0000000 --- a/dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dae638be8..dd5d17794 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off) - option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) - option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) - option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) -+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) - option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) - option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) - option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) -@@ -202,6 +202,15 @@ else() - endif() - include_directories(${ZLIB_INCLUDE_DIRS}) - -+# libarchive -+if(USE_SHARED_LIBARCHIVE) -+ find_library(ARCHIVE_LIBRARIES NAMES archive) -+ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h) -+else() -+ add_definitions(-DLIBARCHIVE_STATIC) -+ set(ARCHIVE_LIBRARIES archive_static) -+endif() -+ - # libpng - if(USE_SHARED_LIBPNG) - find_package(PNG REQUIRED) -diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt -index a9e80d73c..619acac92 100644 ---- a/src/app/CMakeLists.txt -+++ b/src/app/CMakeLists.txt -@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT) - add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT) - endif() - --# libarchive definitions --add_definitions(-DLIBARCHIVE_STATIC) -- - ###################################################################### - # app-lib target - -@@ -551,7 +548,7 @@ target_link_libraries(app-lib - ${FREETYPE_LIBRARIES} - ${HARFBUZZ_LIBRARIES} - json11 -- archive_static -+ ${ARCHIVE_LIBRARIES} - fmt - tinyexpr) - -diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index 596ffa2e4..977816439 100644 ---- a/third_party/CMakeLists.txt -+++ b/third_party/CMakeLists.txt -@@ -105,16 +105,18 @@ endif() - add_subdirectory(json11) - - # libarchive --set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") --set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") --set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") --set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") --set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") --set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") --set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") --add_subdirectory(libarchive) --target_include_directories(archive_static INTERFACE -- $) -+if(NOT USE_SHARED_LIBARCHIVE) -+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") -+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") -+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") -+ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") -+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") -+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") -+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") -+ add_subdirectory(libarchive) -+ target_include_directories(archive_static INTERFACE -+ $) -+endif() - - # benchmark - if(ENABLE_BENCHMARKS) diff --git a/dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch deleted file mode 100644 index 896e03e..0000000 --- a/dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100 -+++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200 -@@ -66,6 +66,7 @@ - option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) - option(USE_SHARED_FREETYPE "Use shared FreeType library" off) - option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) -+option(USE_SHARED_WEBP "Use your installed copy of webp" off) - option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) - option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) - option(ENABLE_NEWS "Enable the news in Home tab" on) -@@ -229,9 +230,14 @@ - - # libwebp - if(WITH_WEBP_SUPPORT) -- set(WEBP_LIBRARIES webp webpdemux libwebpmux) -- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) -- include_directories(${WEBP_INCLUDE_DIR}) -+ if(USE_SHARED_WEBP) -+ find_library(WEBP_LIBRARIES NAMES webp) -+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) -+ else() -+ set(WEBP_LIBRARIES webp webpdemux libwebpmux) -+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) -+ include_directories(${WEBP_INCLUDE_DIR}) -+ endif() - endif() - - # tinyxml -diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt ---- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200 -+++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200 -@@ -32,7 +32,7 @@ - add_subdirectory(giflib) - endif() - --if(WITH_WEBP_SUPPORT) -+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) - set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") - add_subdirectory(libwebp) - endif() diff --git a/dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch new file mode 100644 index 0000000..c032508 --- /dev/null +++ b/dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dae638be8..dd5d17794 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off) + option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) + option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) + option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) ++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) + option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) + option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) +@@ -202,6 +202,15 @@ else() + endif() + include_directories(${ZLIB_INCLUDE_DIRS}) + ++# libarchive ++if(USE_SHARED_LIBARCHIVE) ++ find_library(ARCHIVE_LIBRARIES NAMES archive) ++ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h) ++else() ++ add_definitions(-DLIBARCHIVE_STATIC) ++ set(ARCHIVE_LIBRARIES archive_static) ++endif() ++ + # libpng + if(USE_SHARED_LIBPNG) + find_package(PNG REQUIRED) +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index a9e80d73c..619acac92 100644 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT) + add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT) + endif() + +-# libarchive definitions +-add_definitions(-DLIBARCHIVE_STATIC) +- + ###################################################################### + # app-lib target + +@@ -551,7 +548,7 @@ target_link_libraries(app-lib + ${FREETYPE_LIBRARIES} + ${HARFBUZZ_LIBRARIES} + json11 +- archive_static ++ ${ARCHIVE_LIBRARIES} + fmt + tinyexpr) + +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 596ffa2e4..977816439 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -105,16 +105,18 @@ endif() + add_subdirectory(json11) + + # libarchive +-set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") +-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") +-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") +-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") +-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") +-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") +-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") +-add_subdirectory(libarchive) +-target_include_directories(archive_static INTERFACE +- $) ++if(NOT USE_SHARED_LIBARCHIVE) ++ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") ++ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") ++ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") ++ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") ++ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") ++ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") ++ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") ++ add_subdirectory(libarchive) ++ target_include_directories(archive_static INTERFACE ++ $) ++endif() + + # benchmark + if(ENABLE_BENCHMARKS) diff --git a/dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch new file mode 100644 index 0000000..896e03e --- /dev/null +++ b/dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch @@ -0,0 +1,41 @@ +diff -uNr a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100 ++++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200 +@@ -66,6 +66,7 @@ + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) + option(USE_SHARED_FREETYPE "Use shared FreeType library" off) + option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) ++option(USE_SHARED_WEBP "Use your installed copy of webp" off) + option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) + option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) + option(ENABLE_NEWS "Enable the news in Home tab" on) +@@ -229,9 +230,14 @@ + + # libwebp + if(WITH_WEBP_SUPPORT) +- set(WEBP_LIBRARIES webp webpdemux libwebpmux) +- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) +- include_directories(${WEBP_INCLUDE_DIR}) ++ if(USE_SHARED_WEBP) ++ find_library(WEBP_LIBRARIES NAMES webp) ++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) ++ else() ++ set(WEBP_LIBRARIES webp webpdemux libwebpmux) ++ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) ++ include_directories(${WEBP_INCLUDE_DIR}) ++ endif() + endif() + + # tinyxml +diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +--- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200 ++++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200 +@@ -32,7 +32,7 @@ + add_subdirectory(giflib) + endif() + +-if(WITH_WEBP_SUPPORT) ++if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) + set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") + add_subdirectory(libwebp) + endif() -- cgit v1.2.3-65-gdbad