From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B17359CB2 for ; Sat, 16 Apr 2016 11:03:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EC0521C01A; Sat, 16 Apr 2016 11:03:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 187B921C01A for ; Sat, 16 Apr 2016 11:03:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C265340924 for ; Sat, 16 Apr 2016 11:03:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C701C7 for ; Sat, 16 Apr 2016 11:03:28 +0000 (UTC) From: "Albert Diserholt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Albert Diserholt" Message-ID: <1460804469.cd658f1161b7738a47b55c41922292be1b72bb44.albert@gentoo> Subject: [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/ X-VCS-Repository: repo/user/Drauthius X-VCS-Files: dev-games/aseprite/Manifest dev-games/aseprite/aseprite-1.1.1.ebuild dev-games/aseprite/aseprite-1.1.4.1.ebuild dev-games/aseprite/aseprite-9999.ebuild dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch dev-games/aseprite/files/aseprite-freetype-include.patch X-VCS-Directories: dev-games/aseprite/files/ dev-games/aseprite/ X-VCS-Committer: albert X-VCS-Committer-Name: Albert Diserholt X-VCS-Revision: cd658f1161b7738a47b55c41922292be1b72bb44 X-VCS-Branch: master Date: Sat, 16 Apr 2016 11:03:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f8493bdd-e8c4-4dec-ae7f-4c49e8a84978 X-Archives-Hash: aa5eb8674027f77703b85cf2311989ae commit: cd658f1161b7738a47b55c41922292be1b72bb44 Author: Albert Diserholt diserholt com> AuthorDate: Sat Apr 16 11:01:09 2016 +0000 Commit: Albert Diserholt diserholt com> CommitDate: Sat Apr 16 11:01:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=cd658f11 dev-games/aseprite: New upstream version Added webp use flag. Upstream now releases zip files of the complete source code, removing the need to checkout code with git. dev-games/aseprite/Manifest | 8 ++-- dev-games/aseprite/aseprite-1.1.1.ebuild | 13 ++--- ...eprite-1.1.1.ebuild => aseprite-1.1.4.1.ebuild} | 56 +++++++++++++++------- dev-games/aseprite/aseprite-9999.ebuild | 56 +++++++++++++++------- ...patch => aseprite-freetype-include-1.1.1.patch} | 0 5 files changed, 85 insertions(+), 48 deletions(-) diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest index 3692f5f..b3177ee 100644 --- a/dev-games/aseprite/Manifest +++ b/dev-games/aseprite/Manifest @@ -1,3 +1,5 @@ -AUX aseprite-freetype-include.patch 423 SHA256 143f1084b5a9eda6767549fa067076c9307e787c5daaab621fab0212c7970f6a SHA512 113925bd48fce8473137c6a8d814acc701dd8740c5cb17bbb889ffdf2cefdc970c32b9f40ce72453a1c6b6719c35fec0a9d6c3d6d49bdabfe2d804b7c7b4f892 WHIRLPOOL a3466656f4bd5250967685fe6c55a9087b47f8a1091afae9ef24548b0a92a9354696f58dfa6137ef75131b8c9d9e61f160684a2fc371db5579da999b4fd9cc2c -EBUILD aseprite-1.1.1.ebuild 2501 SHA256 3ea306bb955c3db46c60cd8bf0987bdbcb7378b6089dc4c68d276b3f03806faf SHA512 c68fcfc4e9b6c982a2a077d128f041fcc1ea37caf85fd054dd01bf146f9ab272a701dda7eb1f3fc1a685b44f6f1045b1b7fda0e394bc88e534d36ed67fe23525 WHIRLPOOL 32c83cf1f0f1aab510f5357232b64010e83e04f5e1791149dfb773ac7106a92819f055daa63208f09fafabcabb60d57957b0f6def8e617f99cdc38130f9454db -EBUILD aseprite-9999.ebuild 2501 SHA256 3ea306bb955c3db46c60cd8bf0987bdbcb7378b6089dc4c68d276b3f03806faf SHA512 c68fcfc4e9b6c982a2a077d128f041fcc1ea37caf85fd054dd01bf146f9ab272a701dda7eb1f3fc1a685b44f6f1045b1b7fda0e394bc88e534d36ed67fe23525 WHIRLPOOL 32c83cf1f0f1aab510f5357232b64010e83e04f5e1791149dfb773ac7106a92819f055daa63208f09fafabcabb60d57957b0f6def8e617f99cdc38130f9454db +AUX aseprite-freetype-include-1.1.1.patch 423 SHA256 143f1084b5a9eda6767549fa067076c9307e787c5daaab621fab0212c7970f6a SHA512 113925bd48fce8473137c6a8d814acc701dd8740c5cb17bbb889ffdf2cefdc970c32b9f40ce72453a1c6b6719c35fec0a9d6c3d6d49bdabfe2d804b7c7b4f892 WHIRLPOOL a3466656f4bd5250967685fe6c55a9087b47f8a1091afae9ef24548b0a92a9354696f58dfa6137ef75131b8c9d9e61f160684a2fc371db5579da999b4fd9cc2c +DIST Aseprite-v1.1.4.1-Source.zip 11723085 SHA256 731ac44259217626dde91cdcae9a24cdd4337540fc91bbe5c05cebcb12869879 SHA512 deeb42c123517e17378498584bb788f375e8aaaf046d5f9732848a5bd794a1af1d8381ff51271f9e30c198478e0f716ae23495972b693db9049ff4c2b8968672 WHIRLPOOL 5c2bd1bf8f5d187c385086a431ab070f55308b01089ce703e54093963402a9300295ea1cbf3602021fea1211ae68c6a2a07391e8e054827ce82ee60462001c4a +EBUILD aseprite-1.1.1.ebuild 2448 SHA256 7895541da855d083cff2bb2b24ddd780819fd6bcf335d1703be46ba728ada828 SHA512 f9f58d56c495381f2225524b427f32469599c8102fa92894a4ceb230d94445e5b107f9f8eac3f72f96887f5b817e6d90945fe649aad25f0835a9cda20baaf81d WHIRLPOOL db45a1d6564a959fa74372954f62e62061985810b86cd0541e81311d6fa4999d8a7f2b1e2d0445e89afb2d7a7b34dd584682a562f82721ec3280d100f317772f +EBUILD aseprite-1.1.4.1.ebuild 2916 SHA256 4bf92aa71fb2adf844c8ac26479a627b04109ac20db1f92ea57f99597c0cbd4f SHA512 06e2ac0a22ad1d06be5fb6df4cdfdaa7146cd431c91635abc2596fdd9ded9cfeba9150d22dd2b4b414feacca6cdc797867e635774ff2e6ac539731b780098ca6 WHIRLPOOL 32fced5f3b7de835c9097a8ce39d52fa2b7eb91aec25bd1aba12d0a3b9a3978fd69aecfda41e3a5449068974a67b063d2eeefafcc9f090288e8c064def801e34 +EBUILD aseprite-9999.ebuild 2916 SHA256 4bf92aa71fb2adf844c8ac26479a627b04109ac20db1f92ea57f99597c0cbd4f SHA512 06e2ac0a22ad1d06be5fb6df4cdfdaa7146cd431c91635abc2596fdd9ded9cfeba9150d22dd2b4b414feacca6cdc797867e635774ff2e6ac539731b780098ca6 WHIRLPOOL 32fced5f3b7de835c9097a8ce39d52fa2b7eb91aec25bd1aba12d0a3b9a3978fd69aecfda41e3a5449068974a67b063d2eeefafcc9f090288e8c064def801e34 diff --git a/dev-games/aseprite/aseprite-1.1.1.ebuild b/dev-games/aseprite/aseprite-1.1.1.ebuild index 114a481..ac956ad 100644 --- a/dev-games/aseprite/aseprite-1.1.1.ebuild +++ b/dev-games/aseprite/aseprite-1.1.1.ebuild @@ -8,13 +8,8 @@ inherit cmake-utils toolchain-funcs git-r3 DESCRIPTION="Animated sprite editor & pixel art tool" HOMEPAGE="http://www.aseprite.org" EGIT_REPO_URI="https://github.com/aseprite/aseprite" - -if [[ ${PV} = 9999 ]]; then - EGIT_COMMIT="master" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64 ~x86" -fi +EGIT_COMMIT="v${PV}" +KEYWORDS="~amd64 ~x86" LICENSE="GPL-2" SLOT="0" @@ -29,7 +24,7 @@ RDEPEND=" system-libpng? ( media-libs/libpng:0 ) system-curl? ( net-misc/curl ) system-zlib? ( sys-libs/zlib ) - system-jpeg? ( virtual/jpeg ) + system-jpeg? ( virtual/jpeg:= ) x11-libs/libX11 system-pixman? ( x11-libs/pixman )" DEPEND="$RDEPEND @@ -43,7 +38,7 @@ DOCS=( docs/files/ase.txt README.md ) src_prepare() { - use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include.patch" + use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include-${PV}.patch" cmake-utils_src_prepare diff --git a/dev-games/aseprite/aseprite-1.1.1.ebuild b/dev-games/aseprite/aseprite-1.1.4.1.ebuild similarity index 68% copy from dev-games/aseprite/aseprite-1.1.1.ebuild copy to dev-games/aseprite/aseprite-1.1.4.1.ebuild index 114a481..0553cae 100644 --- a/dev-games/aseprite/aseprite-1.1.1.ebuild +++ b/dev-games/aseprite/aseprite-1.1.4.1.ebuild @@ -3,23 +3,37 @@ # $Id$ EAPI=6 -inherit cmake-utils toolchain-funcs git-r3 +inherit cmake-utils toolchain-funcs DESCRIPTION="Animated sprite editor & pixel art tool" HOMEPAGE="http://www.aseprite.org" -EGIT_REPO_URI="https://github.com/aseprite/aseprite" +LICENSE="GPL-2" +SLOT="0" -if [[ ${PV} = 9999 ]]; then +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/aseprite/aseprite" EGIT_COMMIT="master" else - EGIT_COMMIT="v${PV}" + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip" KEYWORDS="~amd64 ~x86" + S="${WORKDIR}" fi -LICENSE="GPL-2" -SLOT="0" - -IUSE="debug memleak +system-curl +system-tinyxml +system-giflib +system-libpng +system-zlib +system-jpeg +system-pixman +system-freetype system-allegro" +IUSE=" + debug + memleak + webp + system-allegro + +system-curl + +system-freetype + +system-giflib + +system-jpeg + +system-libpng + +system-libwebp + +system-pixman + +system-tinyxml + +system-zlib" RDEPEND=" system-tinyxml? ( dev-libs/tinyxml ) @@ -27,12 +41,14 @@ RDEPEND=" system-freetype? ( media-libs/freetype:2 ) 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 ) + system-jpeg? ( virtual/jpeg:= ) x11-libs/libX11 system-pixman? ( x11-libs/pixman )" DEPEND="$RDEPEND + app-arch/unzip dev-cpp/gtest" DOCS=( docs/files/ase.txt @@ -41,15 +57,16 @@ DOCS=( docs/files/ase.txt docs/files/pic.txt docs/files/picpro.txt README.md ) +# EULA.txt not applicable to source code distribution. src_prepare() { - use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include.patch" - cmake-utils_src_prepare if use system-allegro; then - ewarn "system-allegro is enabled. It has a bug which prevents" - ewarn "resizing of the Aseprite window." + 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 } @@ -60,22 +77,25 @@ src_configure() { -DCURL_STATICLIB=OFF -DENABLE_UPDATER=OFF -DFULLSCREEN_PLATFORM=ON + -DENABLE_TESTS=ON $(use system-pixman && echo \ -DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \ -DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so") $(use system-freetype && echo \ -DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \ -DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so") + -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)" -DUSE_SHARED_CURL="$(usex system-curl)" + -DUSE_SHARED_FREETYPE="$(usex system-freetype)" -DUSE_SHARED_GIFLIB="$(usex system-giflib)" -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)" - -DUSE_SHARED_ZLIB="$(usex system-zlib)" + -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)" -DUSE_SHARED_LIBPNG="$(usex system-libpng)" - -DUSE_SHARED_TINYXML="$(usex system-tinyxml)" -DUSE_SHARED_PIXMAN="$(usex system-pixman)" - -DUSE_SHARED_FREETYPE="$(usex system-freetype)" - -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)" - -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)" + -DUSE_SHARED_TINYXML="$(usex system-tinyxml)" + -DUSE_SHARED_ZLIB="$(usex system-zlib)" + -DWITH_WEBP_SUPPORT="$(usex webp)" + -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)" -DENABLE_memleak="$(usex memleak)" ) diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild index 114a481..0553cae 100644 --- a/dev-games/aseprite/aseprite-9999.ebuild +++ b/dev-games/aseprite/aseprite-9999.ebuild @@ -3,23 +3,37 @@ # $Id$ EAPI=6 -inherit cmake-utils toolchain-funcs git-r3 +inherit cmake-utils toolchain-funcs DESCRIPTION="Animated sprite editor & pixel art tool" HOMEPAGE="http://www.aseprite.org" -EGIT_REPO_URI="https://github.com/aseprite/aseprite" +LICENSE="GPL-2" +SLOT="0" -if [[ ${PV} = 9999 ]]; then +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/aseprite/aseprite" EGIT_COMMIT="master" else - EGIT_COMMIT="v${PV}" + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip" KEYWORDS="~amd64 ~x86" + S="${WORKDIR}" fi -LICENSE="GPL-2" -SLOT="0" - -IUSE="debug memleak +system-curl +system-tinyxml +system-giflib +system-libpng +system-zlib +system-jpeg +system-pixman +system-freetype system-allegro" +IUSE=" + debug + memleak + webp + system-allegro + +system-curl + +system-freetype + +system-giflib + +system-jpeg + +system-libpng + +system-libwebp + +system-pixman + +system-tinyxml + +system-zlib" RDEPEND=" system-tinyxml? ( dev-libs/tinyxml ) @@ -27,12 +41,14 @@ RDEPEND=" system-freetype? ( media-libs/freetype:2 ) 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 ) + system-jpeg? ( virtual/jpeg:= ) x11-libs/libX11 system-pixman? ( x11-libs/pixman )" DEPEND="$RDEPEND + app-arch/unzip dev-cpp/gtest" DOCS=( docs/files/ase.txt @@ -41,15 +57,16 @@ DOCS=( docs/files/ase.txt docs/files/pic.txt docs/files/picpro.txt README.md ) +# EULA.txt not applicable to source code distribution. src_prepare() { - use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include.patch" - cmake-utils_src_prepare if use system-allegro; then - ewarn "system-allegro is enabled. It has a bug which prevents" - ewarn "resizing of the Aseprite window." + 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 } @@ -60,22 +77,25 @@ src_configure() { -DCURL_STATICLIB=OFF -DENABLE_UPDATER=OFF -DFULLSCREEN_PLATFORM=ON + -DENABLE_TESTS=ON $(use system-pixman && echo \ -DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \ -DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so") $(use system-freetype && echo \ -DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \ -DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so") + -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)" -DUSE_SHARED_CURL="$(usex system-curl)" + -DUSE_SHARED_FREETYPE="$(usex system-freetype)" -DUSE_SHARED_GIFLIB="$(usex system-giflib)" -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)" - -DUSE_SHARED_ZLIB="$(usex system-zlib)" + -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)" -DUSE_SHARED_LIBPNG="$(usex system-libpng)" - -DUSE_SHARED_TINYXML="$(usex system-tinyxml)" -DUSE_SHARED_PIXMAN="$(usex system-pixman)" - -DUSE_SHARED_FREETYPE="$(usex system-freetype)" - -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)" - -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)" + -DUSE_SHARED_TINYXML="$(usex system-tinyxml)" + -DUSE_SHARED_ZLIB="$(usex system-zlib)" + -DWITH_WEBP_SUPPORT="$(usex webp)" + -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)" -DENABLE_memleak="$(usex memleak)" ) diff --git a/dev-games/aseprite/files/aseprite-freetype-include.patch b/dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch similarity index 100% rename from dev-games/aseprite/files/aseprite-freetype-include.patch rename to dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch