diff --git a/packages/opentoonz/.SRCINFO b/packages/opentoonz/.SRCINFO index e01f4849b2..fb01c3681b 100644 --- a/packages/opentoonz/.SRCINFO +++ b/packages/opentoonz/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = opentoonz gives = opentoonz - pkgver = 1.7.1 + pkgver = 1.7.1.1 pkgdesc = An open-source full-featured 2D animation creation software arch = any depends = qtchooser @@ -30,7 +30,6 @@ pkgbase = opentoonz makedepends = libfreetype6-dev makedepends = libjson-c-dev makedepends = qtwayland5 - makedepends = libmypaint-dev makedepends = libopencv-dev makedepends = libturbojpeg-dev makedepends = libmypaint-dev @@ -39,7 +38,7 @@ pkgbase = opentoonz makedepends = libgles2-mesa-dev makedepends = libglib2.0-dev makedepends = liblzma-dev - makedepends = cmake + makedepends = cmake>=3.10 makedepends = build-essential makedepends = git breaks = opentoonz-git @@ -49,7 +48,7 @@ pkgbase = opentoonz breaks = opentoonz-bin maintainer = echometerain repology = project: opentoonz - source = @opentoonz~1.7.1::https://github.com/opentoonz/opentoonz/archive/refs/tags/v1.7.1.tar.gz - sha256sums = d0daf60d06510efe15d0db3f9eed0162499ed58061504dca27892c2b9ea5f22d + source = @opentoonz~1.7.1.1::https://github.com/opentoonz/opentoonz/archive/refs/tags/v1.7.1.1.tar.gz + sha256sums = 94f5251043e3fe00758b9e00ab935b8dc719784214a521f32ff6d4465af0c4c2 pkgname = opentoonz diff --git a/packages/opentoonz/opentoonz.pacscript b/packages/opentoonz/opentoonz.pacscript index f9f5d1e23b..e6ab3636ad 100644 --- a/packages/opentoonz/opentoonz.pacscript +++ b/packages/opentoonz/opentoonz.pacscript @@ -1,11 +1,11 @@ pkgname="opentoonz" arch=("any") -pkgver="1.7.1" +pkgver="1.7.1.1" source=("@${pkgname}~${pkgver}::https://github.com/opentoonz/opentoonz/archive/refs/tags/v${pkgver}.tar.gz") -makedepends=("libboost-all-dev" "qtbase5-dev" "libqt5svg5-dev" "qtscript5-dev" "qttools5-dev" "libqt5opengl5-dev" "qtmultimedia5-dev" "libqt5serialport5-dev" "libsuperlu-dev" "liblz4-dev" "libusb-1.0-0-dev" "liblzo2-dev" "libpng-dev" "libjpeg-dev" "libglew-dev" "freeglut3-dev" "libfreetype6-dev" "libjson-c-dev" "qtwayland5" "libmypaint-dev" "libopencv-dev" "libturbojpeg-dev" "libmypaint-dev" "libopenblas-dev" "libegl1-mesa-dev" "libgles2-mesa-dev" "libglib2.0-dev" "liblzma-dev" "cmake" "build-essential" "git") +makedepends=("libboost-all-dev" "qtbase5-dev" "libqt5svg5-dev" "qtscript5-dev" "qttools5-dev" "libqt5opengl5-dev" "qtmultimedia5-dev" "libqt5serialport5-dev" "libsuperlu-dev" "liblz4-dev" "libusb-1.0-0-dev" "liblzo2-dev" "libpng-dev" "libjpeg-dev" "libglew-dev" "freeglut3-dev" "libfreetype6-dev" "libjson-c-dev" "qtwayland5" "libopencv-dev" "libturbojpeg-dev" "libmypaint-dev" "libopenblas-dev" "libegl1-mesa-dev" "libgles2-mesa-dev" "libglib2.0-dev" "liblzma-dev" "cmake>=3.10" "build-essential" "git") depends=("qtchooser" "qt5-qmake" "qtbase5-dev-tools" "qttools5-dev-tools" "libqt5multimedia5-plugins" "qtwayland5" "libgsl-dev" "pkg-config") pkgdesc="An open-source full-featured 2D animation creation software" -sha256sums=("d0daf60d06510efe15d0db3f9eed0162499ed58061504dca27892c2b9ea5f22d") +sha256sums=("94f5251043e3fe00758b9e00ab935b8dc719784214a521f32ff6d4465af0c4c2") maintainer=("echometerain ") gives="opentoonz" breaks=("${pkgname}-git" "${pkgname}-deb" "${pkgname}-app" "${pkgname}-deb" "${pkgname}-bin") @@ -14,51 +14,33 @@ repology=("project: opentoonz") prepare() { cd "${pkgname}~${pkgver}" - mkdir -p "/home/${LOGNAME}/.config/OpenToonz" - cp -r "./stuff" "/home/${LOGNAME}/.config/OpenToonz/" - chown -R "${LOGNAME}" "/home/${LOGNAME}/.config/OpenToonz/" - - cd "toonz" || return - mkdir build - cd "../" || return + cd thirdparty/tiff-4.0.3 + autoreconf -fiv } build() { - cd "${pkgname}~${pkgver}" - - cd "thirdparty/tiff-4.0.3" || return + pushd "${pkgname}~${pkgver}/thirdparty/tiff-4.0.3" ./configure --with-pic --disable-jbig make -j"${NCPU}" - cd "../../" || return - - cd "toonz/build" || return - cmake "../sources" - make -j"${NCPU}" - cd "../../" || return - + popd + + local cmake_options=( + -B build + -S "${pkgname}/toonz/sources" + -G Ninja + -D CMAKE_INSTALL_PREFIX=/usr + -D CMAKE_SKIP_RPATH=YES + -D WITH_TRANSLATION=OFF + -D CMAKE_POLICY_VERSION_MINIMUM=3.5 + -D CMAKE_C_STANDARD=17 + -D WITH_SYSTEM_LZO=ON + ) + + cmake "${cmake_options[@]}" + cmake --build build -j"${NCPU}" } package() { - cd "${pkgname}~${pkgver}" - - cd "toonz/build" || return - mkdir -p "${pkgdir}/usr/share/pixmaps/" - mkdir -p "${pkgdir}/usr/share/applications/" - make install DESTDIR="${pkgdir}" - cd "../../" || return - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - chmod +x "${pkgdir}/opt/${pkgname}/bin/opentoonz" - - install -Dm755 "toonz/sources/xdg-data/io.github.OpenToonz.desktop" "${pkgdir}/usr/share/applications/" - install -Dm644 "toonz/sources/xdg-data/io.github.OpenToonz.png" "${pkgdir}/usr/share/pixmaps/" - - printf '#!/bin/sh\nsh /opt/opentoonz/bin/opentoonz' | tee /usr/bin/opentoonz > /dev/null - chmod +x "/usr/bin/opentoonz" -} - -post_remove() { - ask "Do you want to remove your opentoonz config?" N - if [[ ${answer} -eq 1 ]]; then - rm -rf "/home/${LOGNAME}/.config/OpenToonz/" - fi + DESTDIR="${pkgdir}" cmake --install build + install -vDm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgname}~${pkgver}/LICENSE.txt" } diff --git a/srclist b/srclist index ddf3b8f38b..7a51a076de 100644 --- a/srclist +++ b/srclist @@ -10999,7 +10999,7 @@ pkgname = opentabletdriver-deb --- pkgbase = opentoonz gives = opentoonz - pkgver = 1.7.1 + pkgver = 1.7.1.1 pkgdesc = An open-source full-featured 2D animation creation software arch = any depends = qtchooser @@ -11029,7 +11029,6 @@ pkgbase = opentoonz makedepends = libfreetype6-dev makedepends = libjson-c-dev makedepends = qtwayland5 - makedepends = libmypaint-dev makedepends = libopencv-dev makedepends = libturbojpeg-dev makedepends = libmypaint-dev @@ -11038,7 +11037,7 @@ pkgbase = opentoonz makedepends = libgles2-mesa-dev makedepends = libglib2.0-dev makedepends = liblzma-dev - makedepends = cmake + makedepends = cmake>=3.10 makedepends = build-essential makedepends = git breaks = opentoonz-git @@ -11048,8 +11047,8 @@ pkgbase = opentoonz breaks = opentoonz-bin maintainer = echometerain repology = project: opentoonz - source = @opentoonz~1.7.1::https://github.com/opentoonz/opentoonz/archive/refs/tags/v1.7.1.tar.gz - sha256sums = d0daf60d06510efe15d0db3f9eed0162499ed58061504dca27892c2b9ea5f22d + source = @opentoonz~1.7.1.1::https://github.com/opentoonz/opentoonz/archive/refs/tags/v1.7.1.1.tar.gz + sha256sums = 94f5251043e3fe00758b9e00ab935b8dc719784214a521f32ff6d4465af0c4c2 pkgname = opentoonz ---