Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gimp3: Use Luajit in aarch64 now that it's available #18886

Merged
merged 1 commit into from Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions mingw-w64-gimp3/0003-lua-aarch64-instead.patch

This file was deleted.

20 changes: 3 additions & 17 deletions mingw-w64-gimp3/PKGBUILD
Expand Up @@ -4,7 +4,7 @@ _realname=gimp3
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.99.16
pkgrel=5
pkgrel=6
pkgdesc="GNU Image Manipulation Program (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang32' 'clang64' 'clangarm64')
Expand Down Expand Up @@ -40,8 +40,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-aalib"
"${MINGW_PACKAGE_PREFIX}-libspiro"
"${MINGW_PACKAGE_PREFIX}-libwebp"
"${MINGW_PACKAGE_PREFIX}-libwmf"
$([[ ${MSYSTEM_CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-luajit")
$([[ ${MSYSTEM_CARCH} == aarch64 ]] && echo "${MINGW_PACKAGE_PREFIX}-lua51")
"${MINGW_PACKAGE_PREFIX}-luajit"
"${MINGW_PACKAGE_PREFIX}-lua51-lgi"
"${MINGW_PACKAGE_PREFIX}-maxflow"
"${MINGW_PACKAGE_PREFIX}-mypaint-brushes"
Expand All @@ -59,16 +58,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
source=("https://download.gimp.org/pub/gimp/v2.99/gimp-${pkgver}.tar.xz"
0001-clang-rc-files-fix.patch
0002-skip-test-env.patch
0003-lua-aarch64-instead.patch
lua.interp
luajit.interp
gimp-script-fu-interpreter.interp
)
sha256sums=('6b4496edee447339f923276755247eadb64ec40d8aec241d06b62d1a6eb6508d'
'54b3abc136b78fd2ae9b7d2acd202fb91bf3b6c248b131f1629ca50ef2493fbe'
'511a2a969d1ff3254b4f2453cdfbc3a86a60e2379adf9f6ed5735454a45ef6ee'
'53981288a25e0dfc0555fee48ccb4589cba2fcf00a0fad57f2a3b31e724ba24a'
'1f3ddde21613be29e83c39ec3fa420073c522e746455997529ada707b7d33eed'
'ee8fd9e26675c7c2e477f280f3aad20cfa66d0a2da0cbceb7b2448f4bb8f8d37'
'49d7ac87f2f437e89bb43e9be749c206d4c51bd9245133ffb1071aad4592ffb0')

Expand All @@ -85,11 +80,6 @@ prepare() {
apply_patch_with_msg \
0001-clang-rc-files-fix.patch \
0002-skip-test-env.patch

if [[ $MSYSTEM_CARCH == aarch64 ]]; then
apply_patch_with_msg \
0003-lua-aarch64-instead.patch
fi
}

build() {
Expand Down Expand Up @@ -133,11 +123,7 @@ package() {
install -Dm644 "${srcdir}"/gimp-script-fu-interpreter.interp "${pkgdir}${MINGW_PREFIX}"/lib/gimp/2.99/interpreters/gimp-script-fu-interpreter.interp

# Create the Lua scripts interpreter path (Only created by the installer in Windows)
if [[ $MSYSTEM_CARCH == aarch64 ]]; then
install -Dm644 "${srcdir}"/lua.interp "${pkgdir}${MINGW_PREFIX}"/lib/gimp/2.99/interpreters/lua.interp
else
install -Dm644 "${srcdir}"/luajit.interp "${pkgdir}${MINGW_PREFIX}"/lib/gimp/2.99/interpreters/lua.interp
fi
install -Dm644 "${srcdir}"/luajit.interp "${pkgdir}${MINGW_PREFIX}"/lib/gimp/2.99/interpreters/lua.interp

rm -f "${pkgdir}${MINGW_PREFIX}/lib/gimp/2.99/modules/*.dll.a"

Expand Down
5 changes: 0 additions & 5 deletions mingw-w64-gimp3/lua.interp

This file was deleted.