From 583c0ee728de35cd5c2d7ad4307a715244684099 Mon Sep 17 00:00:00 2001 From: Albert Diserholt Date: Mon, 1 Jun 2020 08:51:59 +0200 Subject: dev-games/aseprite-1.2.19.2 Signed-off-by: Albert Diserholt --- dev-games/aseprite/Manifest | 10 +-- dev-games/aseprite/aseprite-1.2.19.2.ebuild | 95 ++++++++++++++++++++++ dev-games/aseprite/aseprite-1.2.19.ebuild | 95 ---------------------- .../files/aseprite-1.2.19-system_libarchive.patch | 84 ------------------- .../files/aseprite-1.2.19-system_libwebp.patch | 41 ---------- .../aseprite-1.2.19.2-system_libarchive.patch | 84 +++++++++++++++++++ .../files/aseprite-1.2.19.2-system_libwebp.patch | 41 ++++++++++ 7 files changed, 225 insertions(+), 225 deletions(-) create mode 100644 dev-games/aseprite/aseprite-1.2.19.2.ebuild delete mode 100644 dev-games/aseprite/aseprite-1.2.19.ebuild delete mode 100644 dev-games/aseprite/files/aseprite-1.2.19-system_libarchive.patch delete mode 100644 dev-games/aseprite/files/aseprite-1.2.19-system_libwebp.patch create mode 100644 dev-games/aseprite/files/aseprite-1.2.19.2-system_libarchive.patch create mode 100644 dev-games/aseprite/files/aseprite-1.2.19.2-system_libwebp.patch diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest index a54b3c9..eb746a0 100644 --- a/dev-games/aseprite/Manifest +++ b/dev-games/aseprite/Manifest @@ -1,12 +1,12 @@ AUX aseprite-1.2.18-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab AUX aseprite-1.2.18-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1 -AUX aseprite-1.2.19-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab -AUX aseprite-1.2.19-system_libwebp.patch 1539 BLAKE2B d9c47c64ec49f8030c4ac8fe299c20534bb2cf10c1d70013a7076d62d6d6ec5f4cefd8c8d886ba3a6c5f37d9de097af29fcb07f8e613382847ee5cff6881a637 SHA512 62fe435bf57b4ae81256cee002d1b780fa4e5f5ca26778be9dbd8258e78621fb3dda86c30ec5ae7569f739a5cf0f1e3f6ac19ff5c1cd6fcdf137cd81afefcaff +AUX aseprite-1.2.19.2-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab +AUX aseprite-1.2.19.2-system_libwebp.patch 1539 BLAKE2B d9c47c64ec49f8030c4ac8fe299c20534bb2cf10c1d70013a7076d62d6d6ec5f4cefd8c8d886ba3a6c5f37d9de097af29fcb07f8e613382847ee5cff6881a637 SHA512 62fe435bf57b4ae81256cee002d1b780fa4e5f5ca26778be9dbd8258e78621fb3dda86c30ec5ae7569f739a5cf0f1e3f6ac19ff5c1cd6fcdf137cd81afefcaff DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 DIST Aseprite-v1.2.18-Source.zip 24427303 BLAKE2B d8ae9b7dce73d1f2e9b8b4c851eadd32f62f9336487f62ab12c173b76deeca704eeda92fb17637d9d9c9742e45728d935b3eff7c0396da5260f84886cebd893e SHA512 5a95a12c1c86e5bcc46f92f00eb663d3f4f3a865cf68bf53601a1eb577b6581530bfbf944a20f63014f87ffc32cfc0961339900e353d138564d260cc038c5217 -DIST Aseprite-v1.2.19-Source.zip 24465351 BLAKE2B 618b651a1d33e9a39e74430f9e62d576418c598ac435a85df2ed1c0b5e5a1750673caa6501c641b6f057eb4c4f8997e6f1a9175df6a2893bfbfb7418f1674c60 SHA512 fabde9993c3587b747138b2e6e2791bca134dcbdca326313c3d8053c2a78a040ff81b7ff22ec380d75a58378d02560a8591707127f65a89bfda5bf17eaa0745e +DIST Aseprite-v1.2.19.2-Source.zip 24467556 BLAKE2B 25e09cb6fd5dc018f6c6ccfefac652116cc7675188ca5a0b6a0890f01b2a477de9a2eba432f31cc3a3357eb0e3fc1cef34b6e34d8629d511b4b4ec02d3ddc8c2 SHA512 16310cb7eb1343419a671039a2861c028e9d69aa6bd729708deac56c26e42b33befc10fff3d7ae87fd8e37c9277f9e4632e3553f43bf4c488696f0b4c6657a22 DIST aseprite-1.2.18-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce -DIST aseprite-1.2.19-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce +DIST aseprite-1.2.19.2-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 EBUILD aseprite-1.2.18.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384 -EBUILD aseprite-1.2.19.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384 +EBUILD aseprite-1.2.19.2.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384 diff --git a/dev-games/aseprite/aseprite-1.2.19.2.ebuild b/dev-games/aseprite/aseprite-1.2.19.2.ebuild new file mode 100644 index 0000000..8416f3c --- /dev/null +++ b/dev-games/aseprite/aseprite-1.2.19.2.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() { + elog "Aseprite is for personal use only. You may not distribute it." +} diff --git a/dev-games/aseprite/aseprite-1.2.19.ebuild b/dev-games/aseprite/aseprite-1.2.19.ebuild deleted file mode 100644 index 8416f3c..0000000 --- a/dev-games/aseprite/aseprite-1.2.19.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() { - elog "Aseprite is for personal use only. You may not distribute it." -} diff --git a/dev-games/aseprite/files/aseprite-1.2.19-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.19-system_libarchive.patch deleted file mode 100644 index c032508..0000000 --- a/dev-games/aseprite/files/aseprite-1.2.19-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.19-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.19-system_libwebp.patch deleted file mode 100644 index 4950296..0000000 --- a/dev-games/aseprite/files/aseprite-1.2.19-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) - add_subdirectory(libwebp) - endif() - diff --git a/dev-games/aseprite/files/aseprite-1.2.19.2-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.19.2-system_libarchive.patch new file mode 100644 index 0000000..c032508 --- /dev/null +++ b/dev-games/aseprite/files/aseprite-1.2.19.2-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.19.2-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.19.2-system_libwebp.patch new file mode 100644 index 0000000..4950296 --- /dev/null +++ b/dev-games/aseprite/files/aseprite-1.2.19.2-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) + add_subdirectory(libwebp) + endif() + -- cgit v1.2.3-65-gdbad