diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | shared-libwebp.patch | 4 |
3 files changed, 3 insertions, 11 deletions
@@ -46,7 +46,7 @@ pkgbase = aseprite sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 - sha256sums = 6c52f390d486bbd4bd3b7b0c1b835861335c5d9ef4a244f96054e026ad9eabac + sha256sums = 320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 @@ -56,7 +56,7 @@ sha256sums=('b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' - '6c52f390d486bbd4bd3b7b0c1b835861335c5d9ef4a244f96054e026ad9eabac' + '320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') @@ -68,20 +68,14 @@ prepare() { mkdir -p skia bsdtar xf skia-$_skiaver.tar.gz --strip-components=1 -C skia # Fix up Aseprite's desktop integration - echo desktop env -C aseprite patch -tp1 <desktop.patch # Allow using more shared libs - echo fmt env -C aseprite patch -tp1 <shared-fmt.patch - echo libarchive env -C aseprite patch -tp1 <shared-libarchive.patch - echo libwebp env -C aseprite patch -tp1 <shared-libwebp.patch - echo pixman env -C aseprite patch -tp1 <optional-pixman.patch # Their "FindSkia" module forcefully tries to use Skia's FreeType and HarfBuzz, # but we don't clone those because we use the shared ones. Avoid overwriting the settings instead. - echo skiadeps env -C aseprite patch -tp1 <shared-skia-deps.patch } diff --git a/shared-libwebp.patch b/shared-libwebp.patch index c4c5219220a9..bdeb0d032c5b 100644 --- a/shared-libwebp.patch +++ b/shared-libwebp.patch @@ -22,7 +22,7 @@ index af077f6..fed17ff 100644 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) -@@ -350,14 +353,18 @@ add_subdirectory(laf) +@@ -328,14 +351,17 @@ add_subdirectory(laf) # libwebp if(ENABLE_WEBP) # Use libwebp from Skia @@ -34,12 +34,10 @@ index af077f6..fed17ff 100644 + set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) + find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) + else() -+ if(LAF_BACKEND STREQUAL "skia") find_library(WEBP_LIBRARIES webp NAMES libwebp # required for Windows PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") -+ endif() - else() - set(WEBP_LIBRARIES webp webpdemux libwebpmux) - set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |