From 51876ecb1c165a5827bc2ea3618f49e1c37a43b2 Mon Sep 17 00:00:00 2001 From: Ross Clark <6961242+rossclarkartist@users.noreply.github.com> Date: Tue, 5 Jul 2022 16:11:57 +0100 Subject: [PATCH] :+1: BUMP: Bump to latest upstream version - Bump to Synfig version 1.5.1 - Add information to top of file - Add new libraries to the "depends" and "makedepends" arrays - Update "provides", "conflicts" and "replaces" as package name has been renamed to match upstream - Remove reference to CHANGELOG.md as is no longer available - Remove Archiv8 documentation until content and format has been settled - Update "sha256sums" array to "sha512sums" - Update "sha512sums" array - Update "prepare()", "build()" and "package()" functions with code from original AUR package - Reformat PKGBUILD - Regenerate .SRCINFO file - Remove uneeded synfig-studio.install file On branch main - Changes to be committed: - modified: .SRCINFO - modified: PKGBUILD - deleted: synfig-studio.install --- .SRCINFO | 53 ++++++-------- PKGBUILD | 162 +++++++++++++++++++++++------------------- synfig-studio.install | 11 --- 3 files changed, 111 insertions(+), 115 deletions(-) delete mode 100644 synfig-studio.install diff --git a/.SRCINFO b/.SRCINFO index 6b441c9..eafbbfe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,40 +1,29 @@ -pkgbase = synfigstudio +pkgbase = synfig-studio pkgdesc = Open-source 2D Animation Software. Core package providing a GUI to Synfig core - pkgver = 1.3.14 + pkgver = 1.5.1 pkgrel = 1 url = https://www.synfig.org/ - changelog = CHANGELOG.md arch = x86_64 license = GPL2 - makedepends = git + makedepends = openexr + makedepends = imagemagick + makedepends = xorg-fonts-100dpi + makedepends = xorg-fonts-75dpi + makedepends = xorg-fonts-misc + makedepends = xorg-fonts-type1 makedepends = intltool - depends = etl=1.3.14 + makedepends = etl=1.5.1 depends = gtkmm3 - depends = synfig=1.3.14 - conflicts = etl - replaces = etl - source = synfig-v1.3.14.tar.gz::/~https://github.com/synfig/synfig/archive/v1.3.14.tar.gz - source = CC-BY-SA-V4.md - source = CHANGELOG.md - source = CODE-OF-CONDUCT.md - source = CONTRIBUTE.md - source = DEVELOPER-CERTIFICATE-OF-ORIGIN.md - source = INSTALL.md - source = ISSUES.md - source = LICENSE.md - source = MIT.md - source = README.md - sha256sums = f2872c0c1cea9c60f4ddcb36439963b33b3d5cba790d7a800c2923fd0b4ef1cb - sha256sums = b92d2feed74cb73994f5b76ec511abafa12ed5b681db844191c4e32939948aaf - sha256sums = a6bbded8c6e93eab74d8e738b24620f2ac968b9774729fe5ee12f032b706e913 - sha256sums = 8177592fe733e9183ee400ed6c396793f0e188844f2dd775caceb0fde3503443 - sha256sums = e0d506d4f50dfdc61722487ede4a7aaadabb608f3df2c55ef97f99bb388a6431 - sha256sums = f70a73f588fbcf85ee4ae8b002d8a0a1a0efcfb73043a4eeb394b851547fbd53 - sha256sums = c760b51b1dd883c78a5fb9df32698fbe44b37fe165d9a6661da262d3af938d36 - sha256sums = 25ddb2d1c3726b9adb624cf24f3a5e64a6e8d7392ebaf9f4d1e49c62bccf17dc - sha256sums = c0d587af5ba492d3bc18b71b823c9a7b8cf721a004c31fad5efaba28b10461b1 - sha256sums = a92793ddaca37fe7da780d10613604b52969368f5fbec3c67eb20edb988b4f49 - sha256sums = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - -pkgname = synfigstudio + depends = synfig-core=1.5.1 + depends = sdl_image + provides = synfigstudio + conflicts = synfigstudio + conflicts = synfigstudio-dev + conflicts = synfigstudio-git + replaces = synfigstudio + replaces = synfigstudio-dev + replaces = synfigstudio-git + source = synfig-1.5.1.tar.gz::/~https://github.com/synfig/synfig/archive/v1.5.1.tar.gz + sha512sums = 0c1dd53a445f037bcdb742d7c17d1d3a2039e80d3e49f5cd67119fb9792d96b47154874d5be42d36443b0d09c61b7864dfe33ebd5f3998783c54eb3cc936d11b +pkgname = synfig-studio diff --git a/PKGBUILD b/PKGBUILD index d00df94..33dbd69 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,62 +1,84 @@ -# Maintainer: Ross Clark -# Contributor: Ross Clark +#!/bin/bash +# Based on original packaging by Popolon , Piernov , Sergej Pupykin and Franco Iacomella + +# Disable various shellcheck rules that produce false positives in this file. +# Repository rules should be added to the .shellcheckrc file located in the +# repository root directory, see /~https://github.com/koalaman/shellcheck/wiki +# and https://archiv8.github.io for further information. +# shellcheck disable=SC2034,SC2154 +# [ToDo]: Add files: User documentation +# [ToDo]: Add files: Tooling +# [FixMe]: Namcap warnings and errors + +# Maintainer: Ross Clark +# Contributor: Ross Clark #_langname="" _relname="synfig" _partname="studio" #_cvsname="" - # pkgbase= pkgname="${_relname}-${_partname}" -pkgver=1.3.14 +pkgver=1.5.1 pkgrel=1 # epoch= pkgdesc="Open-source 2D Animation Software. Core package providing a GUI to Synfig core" -arch=("x86_64") +arch=( + "x86_64" +) url="https://www.synfig.org/" -license=("GPL2") +license=( + "GPL2" +) # groups=() -depends=("synfig-etl=${pkgver}" "gtkmm3" "synfig-core=${pkgver}") +depends=( + "python" + "gtkmm3" + "synfig-core>=${pkgver}" + "sdl_image" + +) # optdepends=() -makedepends=("git" "intltool") +makedepends=( + "openexr" + "imagemagick" + "xorg-fonts-100dpi" + "xorg-fonts-75dpi" + "xorg-fonts-misc" + "xorg-fonts-type1" + "intltool" + "etl>=${pkgver}" +) # checkdepends=() -# provides=() -conflicts=("synfigstudio") -replaces=("synfigstudio") +provides=( + "synfigstudio" +) +conflicts=( + "synfigstudio" + "synfigstudio-dev" + "synfigstudio-git" +) +replaces=( + "synfigstudio" + "synfigstudio-dev" + "synfigstudio-git" +) # backup=() # options=() # install= -changelog="CHANGELOG.md" +# changelog= source=( -"${_relname}-v${pkgver}.tar.gz::/~https://github.com/${_relname}/${_relname}/archive/v${pkgver}.tar.gz" -"CC-BY-SA-V4.md" -"CHANGELOG.md" -"CODE-OF-CONDUCT.md" -"CONTRIBUTE.md" -"DEVELOPER-CERTIFICATE-OF-ORIGIN.md" -"INSTALL.md" -"ISSUES.md" -"LICENSE.md" -"MIT.md" -"README.md" + "${_relname}-${pkgver}.tar.gz::/~https://github.com/${_relname}/${_relname}/archive/v${pkgver}.tar.gz" ) # noextract=() # validpgpkeys=() -sha256sums=('f2872c0c1cea9c60f4ddcb36439963b33b3d5cba790d7a800c2923fd0b4ef1cb' - 'b92d2feed74cb73994f5b76ec511abafa12ed5b681db844191c4e32939948aaf' - 'a6bbded8c6e93eab74d8e738b24620f2ac968b9774729fe5ee12f032b706e913' - '8177592fe733e9183ee400ed6c396793f0e188844f2dd775caceb0fde3503443' - 'e0d506d4f50dfdc61722487ede4a7aaadabb608f3df2c55ef97f99bb388a6431' - 'f70a73f588fbcf85ee4ae8b002d8a0a1a0efcfb73043a4eeb394b851547fbd53' - 'c760b51b1dd883c78a5fb9df32698fbe44b37fe165d9a6661da262d3af938d36' - '25ddb2d1c3726b9adb624cf24f3a5e64a6e8d7392ebaf9f4d1e49c62bccf17dc' - 'c0d587af5ba492d3bc18b71b823c9a7b8cf721a004c31fad5efaba28b10461b1' - 'a92793ddaca37fe7da780d10613604b52969368f5fbec3c67eb20edb988b4f49' - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855') +sha512sums=( + "0c1dd53a445f037bcdb742d7c17d1d3a2039e80d3e49f5cd67119fb9792d96b47154874d5be42d36443b0d09c61b7864dfe33ebd5f3998783c54eb3cc936d11b" +) -prepare () { +prepare() { # Change to the Synfig ETL directory cd "${srcdir}/${_relname}-${pkgver}/${pkgname}" @@ -66,50 +88,46 @@ prepare () { # Run configure script ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/synfig \ - --enable-jack \ - --disable-update-mimedb + --prefix=/usr \ + --sysconfdir=/etc/synfig \ + --enable-jack \ + --disable-update-mimedb } build() { - - # Change to the Synfig ETL directory - cd "${srcdir}/${_relname}-${pkgver}/${pkgname}" - - # Run make - make + cd "$srcdir"/synfig-$pkgver/synfig-studio + export PKG_CONFIG_PATH=/usr/lib/ffmpeg0.10/pkgconfig:/usr/lib/imagemagick6/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg0.10" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS -std=gnu++11" + [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } + intltoolize --force + [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv + # sed -i 's#Gtk::IconSize::IconSize#Gtk::IconSize#' src/gui/dialogs/dialog_color.cpp + # please pay attention to your number of cores and ram amount for avoid oom errors + # this number its fine for and amd fx 8350 with 16gb ram + # you need 2gb per core for avoid surprises, OR dont do anything while it compiles + make -j8 } # check() {} package() { - # Change to the Synfig ETL directory - cd "${srcdir}/${_relname}-${pkgver}/${pkgname}" - - # Install the Synfig ETL library - make DESTDIR="${pkgdir}" install - - # Install the Synfig ETL documentation - install -Dm 644 "${srcdir}/${_relname}-${pkgver}/${pkgname}/NEWS" "${pkgdir}/usr/share/doc/${pkgname}/NEWS" - install -Dm 644 "${srcdir}/${_relname}-${pkgver}/${pkgname}/NEWS" "${pkgdir}/usr/share/doc/${pkgname}/README" - - # Install the Synfig ETL license - install -Dm 644 "${srcdir}/${_relname}-${pkgver}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # Create the Archiv8 Documentation folder - install -dvm 755 "${pkgdir}/usr/share/doc/${pkgname}/packaging/" - - # Install the Archiv8 Documentation - install -Dm 644 "${srcdir}/CC-BY-SA-V4.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/CC-BY-SA-V4.md" - install -Dm 644 "${srcdir}/CHANGELOG.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/CHANGELOG.md" - install -Dm 644 "${srcdir}/CODE-OF-CONDUCT.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/CODE-OF-CONDUCT.md" - install -Dm 644 "${srcdir}/CONTRIBUTE.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/CONTRIBUTE.md" - install -Dm 644 "${srcdir}/DEVELOPER-CERTIFICATE-OF-ORIGIN.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/DEVELOPER-CERTIFICATE-OF-ORIGIN.md" - install -Dm 644 "${srcdir}/INSTALL.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/INSTALL.md" - install -Dm 644 "${srcdir}/ISSUES.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/ISSUES.md" - install -Dm 644 "${srcdir}/LICENSE.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/LICENSE.md" - install -Dm 644 "${srcdir}/MIT.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/MIT.md" - install -Dm 644 "${srcdir}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/packaging/README.md" + cd "$srcdir"/synfig-$pkgver/synfig-studio + make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/share/pixmaps/synfigstudio/*.mng + install -Dm644 -t "$pkgdir"/usr/share/pixmaps/synfigstudio/ images/*.png + rm -f "$pkgdir"/usr/share/mime/XMLnamespaces + rm -f "$pkgdir"/usr/share/mime/aliases + rm -f "$pkgdir"/usr/share/mime/generic-icons + rm -f "$pkgdir"/usr/share/mime/globs + rm -f "$pkgdir"/usr/share/mime/globs2 + rm -f "$pkgdir"/usr/share/mime/icons + rm -f "$pkgdir"/usr/share/mime/magic + rm -f "$pkgdir"/usr/share/mime/mime.cache + rm -f "$pkgdir"/usr/share/mime/subclasses + rm -f "$pkgdir"/usr/share/mime/treemagic + rm -f "$pkgdir"/usr/share/mime/types + rm -f "$pkgdir"/usr/share/mime/version } diff --git a/synfig-studio.install b/synfig-studio.install deleted file mode 100644 index 46d2681..0000000 --- a/synfig-studio.install +++ /dev/null @@ -1,11 +0,0 @@ -# pre_install() {} - -# post_install() {} - -# pre_upgrade() {} - -# post_upgrade() {} - -# pre_remove() {} - -# post_remove() {}