[arch-commits] Commit in freetype2/trunk (PKGBUILD)

[Andreas Radke]

    Date: Saturday, December 31, 2016 @ 11:21:18
  Author: andyrtr
Revision: 284983

upgpkg: freetype2 2.7.1-1

upstream update 2.7.1 - split out demos FS#50786

Modified:
  freetype2/trunk/PKGBUILD

----------+
 PKGBUILD |   47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-30 14:44:26 UTC (rev 284982)
+++ PKGBUILD	2016-12-31 11:21:18 UTC (rev 284983)
@@ -1,34 +1,29 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-pkgname=freetype2
-pkgver=2.7
-pkgrel=2
-pkgdesc="TrueType font rendering library"
+pkgbase=freetype2
+pkgname=('freetype2' 'freetype2-demos')
+pkgver=2.7.1
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.freetype.org/"
 # adding harfbuzz for improved OpenType features auto-hinting
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-makedepends=('libx11')
-optdepends=('libx11: Some demo programs')
-provides=('libfreetype.so')
-install=freetype2.install
-backup=('etc/profile.d/freetype2.sh')
-source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        http://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
-        http://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+        https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+        https://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
         0001-Enable-table-validation-modules.patch
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
         0005-freetype-2.5.2-more-demos.patch
         freetype2.sh)
-sha1sums=('f251029d5ab542a96dd4531605fe577185077560'
+sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
           'SKIP'
-          '22949e7c809d7d5931331ca54da30e4d195669ea'
+          'd8ce472cd775b8ce50d127689acab59181e72ecf'
           'SKIP'
-          'b7f7633ca0b828ca319afdd09a81b42592685d9c'
+          '2ebe93df13eb45dac8515c5ed0216ef694c33f18'
           'SKIP'
           'b31882ef5e8447e761acee1c4a44c0630cd4d465'
           'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
@@ -69,7 +64,13 @@
   make -k check
 }
 
-package() {
+package_freetype2() {
+  pkgdesc="TrueType font rendering library"
+  depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+  provides=('libfreetype.so')
+  install=freetype2.install
+  backup=('etc/profile.d/freetype2.sh')
+
   cd freetype2
   make DESTDIR="${pkgdir}" install
   install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
@@ -78,9 +79,17 @@
   install -dm755 "${pkgdir}/usr/share/doc"
   cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
 
-  # Package demos
   cd ../ft2demos-${pkgver}
+  mkdir -p $srcdir/ft-demos
   for _i in bin/{f,t}t*; do
-    libtool --mode=install install $_i "$pkgdir/usr/bin/"
+    libtool --mode=install install $_i "$srcdir/ft-demos"
   done
 }
+
+package_freetype2-demos() {
+  pkgdesc="Freetype tools and demos"
+  depends=('freetype2' 'libx11')
+
+  install -dm755 "${pkgdir}/usr/bin"
+  cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
+}