talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

aseprite: 1.3.7 -> 1.3.13 (#377614)

Browse Source
This commit is contained in:
Pol Dellaiera 2025-06-03 15:12:02 +02:00 committed by GitHub
commit e608bfb550
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 74 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
pkgs/by-name/as/aseprite/package.nix
View File

@ -33,15 +33,35 @@
clangStdenv.mkDerivation (finalAttrs: { clangStdenv.mkDerivation (finalAttrs: {
pname = "aseprite"; pname = "aseprite";
version = "1.3.7"; version = "1.3.13";
src = fetchFromGitHub { srcs = [
owner = "aseprite"; (fetchFromGitHub {
repo = "aseprite"; name = "aseprite-source";
rev = "v" + finalAttrs.version; owner = "aseprite";
fetchSubmodules = true; repo = "aseprite";
hash = "sha256-75kYJXmyags0cW2D5Ksq1uUrFSCAkFOdmn7Ya/6jLXc="; tag = "v${finalAttrs.version}";
}; fetchSubmodules = true;
hash = "sha256-eeB/4fQp1lbNYQj9LpNhOn7DYxaTc+BcmyvY2vPzpxk=";
})
# Translation strings
(fetchFromGitHub {
name = "aseprite-strings";
owner = "aseprite";
repo = "strings";
rev = "7b0af61dec1d98242d7eb2e9cab835d442d21235";
hash = "sha256-8OwwHCFP55pwLjk5O+a36hDZf9uX3P7cNliJM5SZdAg=";
})
];
# Sets the main build directory to "aseprite-source" since multiple sources are fetched.
sourceRoot = "aseprite-source";
# Translation files are copied without overwriting existing ones to preserve the potentially more up-to-date English file from the main source.
postUnpack = ''
cp --no-clobber $PWD/aseprite-strings/* ./aseprite-source/data/strings
'';
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -75,33 +95,15 @@ clangStdenv.mkDerivation (finalAttrs: {
]; ];
patches = [ patches = [
# https://github.com/aseprite/aseprite/issues/4486
# FIXME: remove on next release.
(fetchpatch {
name = "ENABLE_UPDATER-fix.patch";
url = "https://github.com/aseprite/aseprite/commit/8fce589.patch";
hash = "sha256-DbL6kK//gQXbsXEn/t+KTuoM7E9ocPAsVqEO+lYrka4=";
})
./shared-fmt.patch ./shared-fmt.patch
./shared-libwebp.patch ./shared-libwebp.patch
./shared-skia-deps.patch ./shared-skia-deps.patch
]; ];
postPatch = postPatch = ''
let substituteInPlace src/ver/CMakeLists.txt \
# Translation strings --replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
strings = fetchFromGitHub { '';
owner = "aseprite";
repo = "strings";
rev = "e18a09fefbb6cd904e506183d5fbe08558a52ed4";
hash = "sha256-GyCCxbhgf0vST20EH/+KkNLrF+U9Xzgpxlao8s925PQ=";
};
in
''
sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-"
rm -rf data/strings
cp -r ${strings} data/strings
'';
cmakeFlags = [ cmakeFlags = [
"-DENABLE_DESKTOP_INTEGRATION=ON" "-DENABLE_DESKTOP_INTEGRATION=ON"
@ -116,7 +118,7 @@ clangStdenv.mkDerivation (finalAttrs: {
"-DUSE_SHARED_LIBPNG=ON" "-DUSE_SHARED_LIBPNG=ON"
"-DUSE_SHARED_LIBWEBP=ON" "-DUSE_SHARED_LIBWEBP=ON"
"-DUSE_SHARED_PIXMAN=ON" "-DUSE_SHARED_PIXMAN=ON"
"-DUSE_SHARED_TINYXML=ON" "-DUSE_SHARED_TINYXML=OFF"
"-DUSE_SHARED_WEBP=ON" "-DUSE_SHARED_WEBP=ON"
"-DUSE_SHARED_ZLIB=ON" "-DUSE_SHARED_ZLIB=ON"
# Disable libarchive programs. # Disable libarchive programs.
@ -124,7 +126,7 @@ clangStdenv.mkDerivation (finalAttrs: {
"-DENABLE_CPIO=OFF" "-DENABLE_CPIO=OFF"
"-DENABLE_TAR=OFF" "-DENABLE_TAR=OFF"
# UI backend. # UI backend.
"-DLAF_OS_BACKEND=skia" "-DLAF_BACKEND=skia"
"-DLAF_WITH_EXAMPLES=OFF" "-DLAF_WITH_EXAMPLES=OFF"
"-DSKIA_DIR=${skia-aseprite}" "-DSKIA_DIR=${skia-aseprite}"
"-DSKIA_LIBRARY_DIR=${skia-aseprite}/lib" "-DSKIA_LIBRARY_DIR=${skia-aseprite}/lib"

40
pkgs/by-name/as/aseprite/shared-fmt.patch
View File

@ -1,6 +1,8 @@
--- a/CMakeLists.txt 2022-01-08 00:37:08.165330523 +0100 diff --git a/CMakeLists.txt b/CMakeLists.txt
+++ b/CMakeLists.txt 2022-01-08 00:52:41.163585173 +0100 index b1bd0189b..3fb7abffb 100644
@@ -54,6 +54,7 @@ --- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,7 @@ enable_testing()
option(USE_SHARED_CMARK "Use your installed copy of cmark" off) option(USE_SHARED_CMARK "Use your installed copy of cmark" off)
option(USE_SHARED_CURL "Use your installed copy of curl" off) option(USE_SHARED_CURL "Use your installed copy of curl" off)
@ -8,7 +10,7 @@
option(USE_SHARED_GIFLIB "Use your installed copy of giflib" 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_JPEGLIB "Use your installed copy of jpeglib" off)
option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
@@ -165,6 +165,7 @@ @@ -185,6 +186,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/bin")
set(SOURCE_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data) set(SOURCE_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
set(CMARK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmark) set(CMARK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmark)
set(CURL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/curl) set(CURL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/curl)
@ -16,10 +18,11 @@
set(GIFLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/giflib) set(GIFLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/giflib)
set(LIBJPEG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jpeg) set(LIBJPEG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jpeg)
set(LIBPNG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libpng) set(LIBPNG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libpng)
@@ -204,6 +205,15 @@ @@ -225,6 +227,16 @@ if(NOT USE_SHARED_CURL)
set(CURL_STATICLIB ON BOOL) set(CURL_STATICLIB ON BOOL)
endif() endif()
+# fmt
+if(USE_SHARED_FMT) +if(USE_SHARED_FMT)
+ find_package(FMT REQUIRED) + find_package(FMT REQUIRED)
+ set(FMT_LIBRARIES fmt::fmt) + set(FMT_LIBRARIES fmt::fmt)
@ -32,10 +35,12 @@
# zlib # zlib
if(USE_SHARED_ZLIB) if(USE_SHARED_ZLIB)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
--- a/src/app/CMakeLists.txt 2022-01-08 00:37:07.378671200 +0100 diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt 2022-01-08 00:53:13.669969512 +0100 index 9c67c0268..b19a3e412 100644
@@ -741,7 +741,7 @@ target_link_libraries(app-lib --- a/src/app/CMakeLists.txt
${HARFBUZZ_LIBRARIES} +++ b/src/app/CMakeLists.txt
@@ -754,7 +754,7 @@ target_link_libraries(app-lib
${ZLIB_LIBRARIES}
json11 json11
archive_static archive_static
- fmt - fmt
@ -43,10 +48,11 @@
tinyexpr tinyexpr
qoi) qoi)
if(ENABLE_PSD) diff --git a/src/dio/CMakeLists.txt b/src/dio/CMakeLists.txt
--- a/src/dio/CMakeLists.txt 2022-01-08 00:41:50.712726972 +0100 index 55cb24de5..b253dca0b 100644
+++ b/src/dio/CMakeLists.txt 2022-01-08 00:53:39.936408022 +0100 --- a/src/dio/CMakeLists.txt
@@ -10,7 +10,7 @@ +++ b/src/dio/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
target_link_libraries(dio-lib target_link_libraries(dio-lib
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
@ -55,9 +61,11 @@
flic-lib flic-lib
laf-base laf-base
fixmath-lib fixmath-lib
--- a/third_party/CMakeLists.txt 2022-01-08 00:37:08.165330523 +0100 diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt 2022-01-08 00:54:30.455969136 +0100 index 9d09a98c8..1973b134b 100644
@@ -106,7 +106,10 @@ --- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -117,7 +117,10 @@ if(NOT USE_SHARED_HARFBUZZ AND NOT LAF_BACKEND STREQUAL "skia")
endif() endif()
add_subdirectory(simpleini) add_subdirectory(simpleini)

32
pkgs/by-name/as/aseprite/shared-libwebp.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index af077f6..fed17ff 100644 index 87aed2f28f9c..498472ec2a60 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) @@ -76,6 +76,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
option(USE_SHARED_FREETYPE "Use shared FreeType library" off) option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
@ -10,7 +10,7 @@ index af077f6..fed17ff 100644
option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
option(ENABLE_NEWS "Enable the news in Home tab" on) option(ENABLE_NEWS "Enable the news in Home tab" on)
@@ -328,14 +351,17 @@ add_subdirectory(laf) @@ -380,7 +381,20 @@ add_subdirectory(laf)
# libwebp # libwebp
if(ENABLE_WEBP) if(ENABLE_WEBP)
# Use libwebp from Skia # Use libwebp from Skia
@ -21,27 +21,27 @@ index af077f6..fed17ff 100644
+ find_library(WEBPMUX_LIBRARY NAMES webpmux) + find_library(WEBPMUX_LIBRARY NAMES webpmux)
+ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) + set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY})
+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) + find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
+ else() + find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
+ if(WEBP_LIBRARIES)
+ set(WEBP_FOUND ON)
+ else()
+ set(WEBP_FOUND OFF)
+ endif()
+ elseif(LAF_BACKEND STREQUAL "skia")
find_library(WEBP_LIBRARIES webp find_library(WEBP_LIBRARIES webp
NAMES libwebp # required for Windows NAMES libwebp # required for Windows
PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src")
- else()
- set(WEBP_LIBRARIES webp webpdemux libwebpmux)
- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
endif()
include_directories(${WEBP_INCLUDE_DIR})
endif()
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 4839d4097c..e8c3e83cbc 100644 index 1973b134b9f8..f15dba5a7968 100644
--- a/third_party/CMakeLists.txt --- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt
@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) @@ -33,7 +33,7 @@ if(NOT USE_SHARED_GIFLIB)
add_subdirectory(giflib) add_subdirectory(giflib)
endif() endif()
-if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia") -if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia")
+if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP) +if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" 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) set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
endif() set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")