Fix up shared-libwebp.patch.

This commit is contained in:
ImperatorStorm 2022-01-12 23:23:40 -08:00
parent e61b3c9b5b
commit f1f431dac8
3 changed files with 5 additions and 5 deletions

View File

@ -47,7 +47,7 @@ pkgbase = aseprite
sha256sums = SKIP sha256sums = SKIP
sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441
sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7
sha256sums = 9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055
sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654
pkgname = aseprite pkgname = aseprite

View File

@ -58,7 +58,7 @@ sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d'
'SKIP' 'SKIP'
'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441'
'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7'
'9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055'
'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654')
prepare() { prepare() {

View File

@ -25,7 +25,7 @@ index f16f09660d..40065905d3 100644
@@ -229,9 +230,17 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code @@ -229,9 +230,17 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
# libwebp # libwebp
if(WITH_WEBP_SUPPORT) if(ENABLE_WEBP)
- set(WEBP_LIBRARIES webp webpdemux libwebpmux) - set(WEBP_LIBRARIES webp webpdemux libwebpmux)
- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) - set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
- include_directories(${WEBP_INCLUDE_DIR}) - include_directories(${WEBP_INCLUDE_DIR})
@ -51,8 +51,8 @@ index 4839d4097c..e8c3e83cbc 100644
add_subdirectory(giflib) add_subdirectory(giflib)
endif() endif()
-if(WITH_WEBP_SUPPORT) -if(ENABLE_WEBP)
+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) +if(ENABLE_WEBP AND NOT USE_SHARED_WEBP)
set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
add_subdirectory(libwebp) add_subdirectory(libwebp)
endif() endif()