Made dev-games/aseprite-1.2.17 use system libwebp

Signed-off-by: Albert Diserholt <albert@diserholt.com>

4 files changed, 55 insertions, 18 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index aa7f740..32507b3 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,6 +1,7 @@
-AUX aseprite-1.2.17-system_libarchive.patch 3837 BLAKE2B f9b5f4eb6f81befbaa0fb1255501367aa6ac7c7e20a16a1764a51afdaf2a09208c6a7f68708d1d65e04499bb004e438415d7402537166ab5954e3437a4b32aca SHA512 5eaac64aa9ee339b6991d42b46798392b668f2715e3f99455c8bfc860acb06d5525c0d431d833428037cce67572dcf48d1b384bbffefc79184cafa57acbdc8d2
+AUX aseprite-1.2.17-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.17-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
 DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
 DIST Aseprite-v1.2.17-Source.zip 24303986 BLAKE2B d3034d4491cef993f3f1238c42375a469c60c8ab69ab571670c233300169c1821943e59ca142cf9a7afd54100cffc729204fac5f55ec55218089b7f41228659c SHA512 559203dc0bca4da6145b08c3cca4e5dd40fbf3e5c5e4a7de4b05ed16c32d10de96034923aab42168daec5b64ea7459babd468d5d7b0de69337c4f95f2edc85bd
 DIST aseprite-1.2.17-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
 EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.17.ebuild 2021 BLAKE2B 4233a4ecd4e633a984457ed610b065f55bf93bd27cc6abdfada648209a4b9a9a10e8ebf6e649fed376aed51b3015737734c53aae7c660cdefb5bd4019ec114c8 SHA512 26ea0b676c09dcba6663f09d89d350571f2c7e7ca4532c31f5cd686295121f02aac2290df92023dd443978f51ca68208653b2a9ca1ede5d611b383855c94843e
+EBUILD aseprite-1.2.17.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
diff --git a/dev-games/aseprite/aseprite-1.2.17.ebuild b/dev-games/aseprite/aseprite-1.2.17.ebuild
index 1b9446f..8416f3c 100644
--- a/dev-games/aseprite/aseprite-1.2.17.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.17.ebuild
@@ -10,7 +10,10 @@ HOMEPAGE="http://www.aseprite.org"
 LICENSE="Proprietary"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-system_libarchive.patch"
+	"${FILESDIR}/${P}-system_libwebp.patch"
+)
 
 SKIA_VERSION="m81-b607b32047"
 SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip"
@@ -37,7 +40,7 @@ RDEPEND="
 	>=media-libs/giflib-5.0
 	media-libs/fontconfig
 	media-libs/libpng:0
-	webp? ( !!media-libs/libwebp )
+	webp? ( media-libs/libwebp )
 	net-misc/curl
 	sys-apps/util-linux
 	sys-libs/zlib
@@ -78,6 +81,7 @@ src_configure() {
 		-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"
diff --git a/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
index 7cd457b..c032508 100644
--- a/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
@@ -2,15 +2,15 @@ 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)
+@@ -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_LIBLOADPNG "Use your installed copy of libloadpng" off)
  option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
-@@ -193,6 +194,15 @@ else()
+ option(USE_SHARED_PIXMAN  "Use your installed copy of pixman" off)
+@@ -202,6 +202,15 @@ else()
  endif()
  include_directories(${ZLIB_INCLUDE_DIRS})
  
@@ -26,20 +26,11 @@ index dae638be8..dd5d17794 100644
  # 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_CURRENT_BINARY_DIR}/third_party/cmark)
-+  include_directories(${CMARK_DIR})
- endif()
- 
- if(REQUIRE_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)
+@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT)
    add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
  endif()
  
@@ -62,7 +53,7 @@ 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,16 +113,18 @@ endif()
+@@ -105,16 +105,18 @@ endif()
  add_subdirectory(json11)
  
  # libarchive
diff --git a/dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch
new file mode 100644
index 0000000..8c7e417
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.17-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
+@@ -65,6 +65,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)
+@@ -219,9 +220,14 @@
+ 
+ # libwebp
+ if(WITH_WEBP_SUPPORT)
+-  set(WEBP_LIBRARIES webp webpdemux webpmux)
+-  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 webpmux)
++    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)
+   # Enable img2webp so "webpmux" library is built
+   set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
+   add_subdirectory(libwebp)