From 2ba9980ba8a4eefab233c0571cd333de1f84e8cf Mon Sep 17 00:00:00 2001 From: Albert Diserholt Date: Tue, 3 Oct 2017 22:25:16 +0200 Subject: Updated Aseprite to version 1.2.2 --- dev-games/aseprite/Manifest | 3 + dev-games/aseprite/aseprite-1.2.2.ebuild | 109 +++++++++++++++++++++ .../files/aseprite-system_libarchive.patch | 87 ++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 dev-games/aseprite/aseprite-1.2.2.ebuild create mode 100644 dev-games/aseprite/files/aseprite-system_libarchive.patch diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest index 003dc6a..be382d2 100644 --- a/dev-games/aseprite/Manifest +++ b/dev-games/aseprite/Manifest @@ -1,4 +1,7 @@ +AUX aseprite-system_libarchive.patch 3043 SHA256 26b18b4be713aa41eba64433b45b4d45c0aa9b2b48b4c4a676df57e6fccca744 SHA512 c148baf4282a3fc2f4a23395dbd35b2296b586161409af1e7b9325e7e5a65da469da582dd04106434350032591f4e9dc7efa619585cca5b750f2c2c079c79535 WHIRLPOOL e8a57354a5198a60f604813ff14935da383913e7c63bbb446e2b7983f61728bd34629eaa40e00bfcf3888ca0e7ebfbede60443282993c30a177d599f29d044cf DIST Aseprite-v1.1.13-Source.zip 12809688 SHA256 f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 WHIRLPOOL 18af949c5a0d7f2b866e8c9a45fcf3fb623722c44537abbf8b3e79501e6f898b9e037e7afc83170b9383a567ff5889ab2013b1624a06a45c074220b68a51b736 +DIST Aseprite-v1.2.2-Source.zip 20082797 SHA256 95fe1f9f8ee57aedd82b90dc358f3f0782cfe7f8d398af98a5df11fa4a00a98e SHA512 0798bacb626a0f7e0a2c3984c342cd30d1da5ff2be839c395667c359e1a2c422daf7c1e4a74594f12385f6fec46868948f2491bc609ccd9fa992566fa631c06a WHIRLPOOL 1d65f9a0ba60f867da73793e9158a44bd4b9e63d863717de444f0d547cd1a57d81112a7f8f4b7731c8a25e4f54c650b7ff66d04d7dc4b765fc36de67afd2fb50 EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24 +EBUILD aseprite-1.2.2.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e EBUILD aseprite-1.2_beta9.ebuild 2981 SHA256 734aeabb701c559fb8a4f448cd7db716d1b0985c8671d8aea6c48786449e814b SHA512 57c9589cb28105e8a069edb905670d4c0ed71dfa620545117c3eac3ae7c1fc62f4c69f8cafce88c7f51c7242904e0fb209c09376034cb075e8c2a15e96541fbf WHIRLPOOL 85e3d939a4ce8c43f7bbca7e192166eb3498a9612edacb3a0ed98282c8df8b25bef006754e1e62956f0d35d3422ca153b40b015e562e03767e95afac126a0134 EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24 diff --git a/dev-games/aseprite/aseprite-1.2.2.ebuild b/dev-games/aseprite/aseprite-1.2.2.ebuild new file mode 100644 index 0000000..1a74919 --- /dev/null +++ b/dev-games/aseprite/aseprite-1.2.2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit cmake-utils toolchain-funcs + +DESCRIPTION="Animated sprite editor & pixel art tool" +HOMEPAGE="http://www.aseprite.org" +LICENSE="Proprietary" +SLOT="0" + +PATCHES=( "${FILESDIR}/${PN}-system_libarchive.patch" ) + +if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/aseprite/aseprite" + EGIT_BRANCH="master" + if [[ ${PV} != 9999* ]]; then + EGIT_COMMIT="v${PV/_/-}" + fi +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}" +fi + +IUSE=" + debug + memleak + webp + system-allegro + +system-curl + +system-giflib + +system-jpeg + +system-libpng + +system-libwebp + +system-pixman + +system-tinyxml + +system-zlib" + +RDEPEND=" + app-arch/libarchive + app-text/cmark + system-tinyxml? ( dev-libs/tinyxml ) + system-allegro? ( media-libs/allegro:0[X,png] ) + system-giflib? ( >=media-libs/giflib-5.0 ) + system-libpng? ( media-libs/libpng:0 ) + webp? ( system-libwebp? ( media-libs/libwebp ) ) + system-curl? ( net-misc/curl ) + system-zlib? ( sys-libs/zlib ) + system-jpeg? ( virtual/jpeg:= ) + x11-libs/libX11 + x11-libs/libXxf86dga + system-pixman? ( x11-libs/pixman )" +DEPEND="$RDEPEND + app-arch/unzip" + #dev-cpp/gtest + +DOCS=( EULA.txt + docs/ase-file-specs.md + docs/LICENSES.md + README.md ) + +src_prepare() { + cmake-utils_src_prepare + + if use system-allegro; then + ewarn "system-allegro is enabled. It has know issues which are solved" + ewarn "in the bundled version:" + ewarn " * You will not be able to resize the window." + ewarn " * You will have problems adding HSV colours on non-English systems." + fi +} + +src_configure() { + use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release + + local mycmakeargs=( + -DCURL_STATICLIB=OFF + -DENABLE_UPDATER=OFF + -DFULLSCREEN_PLATFORM=ON + -DENABLE_TESTS=OFF + -DBUILD_GMOCK=OFF + $(use system-pixman && echo \ + -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \ + -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so") + -DUSE_SHARED_CMARK=ON + -DUSE_SHARED_CURL="$(usex system-curl)" + -DUSE_SHARED_GIFLIB="$(usex system-giflib)" + -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)" + -DUSE_SHARED_LIBARCHIVE=ON + -DUSE_SHARED_LIBPNG="$(usex system-libpng)" + -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)" + -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)" + -DUSE_SHARED_TINYXML="$(usex system-tinyxml)" + -DUSE_SHARED_PIXMAN="$(usex system-pixman)" + -DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files." + -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)" + -DWITH_WEBP_SUPPORT="$(usex webp)" + -DENABLE_MEMLEAK="$(usex memleak)" + ) + + 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-system_libarchive.patch b/dev-games/aseprite/files/aseprite-system_libarchive.patch new file mode 100644 index 0000000..4d8a174 --- /dev/null +++ b/dev-games/aseprite/files/aseprite-system_libarchive.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dae638be8..dd5d17794 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,6 +64,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_LIBLOADPNG "Use your installed copy of libloadpng" off) + option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off) +@@ -193,6 +194,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) +@@ -294,7 +304,7 @@ if(USE_SHARED_CMARK) + else() + add_definitions(-DCMARK_STATIC_DEFINE) + set(CMARK_LIBRARIES libcmark_static) +- include_directories(${CMAKE_BINARY_DIR}/third_party/cmark) ++ include_directories(${CMARK_DIR}) + endif() + + if(USE_SHARED_CURL) +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 +@@ -82,9 +82,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}) + + if(ENABLE_SCRIPTING) + target_link_libraries(app-lib script-lib) +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 +@@ -113,13 +113,15 @@ endif() + add_subdirectory(json11) + + # libarchive +-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)") +-add_subdirectory(libarchive) +-target_include_directories(archive_static INTERFACE +- $) ++if(NOT USE_SHARED_LIBARCHIVE) ++ 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)") ++ add_subdirectory(libarchive) ++ target_include_directories(archive_static INTERFACE ++ $) ++endif() + + # benchmark + if(ENABLE_BENCHMARKS) -- cgit v1.2.3-65-gdbad