summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2016-07-12 13:24:18 +0200
committerJan Alexander Steffens (heftig)2016-07-12 13:37:19 +0200
commit81b6945d4a11aff2bf074a3cbd6d81c85d136941 (patch)
treec3f086f7a08e07fc268b35bd27e1ad13105cfaaa
parent958e294e8a75b189f31e348c9f60942a8f3f25bc (diff)
downloadaur-81b6945d4a11aff2bf074a3cbd6d81c85d136941.tar.gz
Sync with extra—build docs and demos
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD61
-rw-r--r--freetype2.install4
3 files changed, 53 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6dae5bb299d..8eed1c9046f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Jul 5 19:23:11 UTC 2016
+# Tue Jul 12 11:36:23 UTC 2016
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6.4+p0+gd80fe69
+ pkgver = 2.6.4+p12+g605946a
pkgrel = 1
epoch = 1
url = http://www.freetype.org/
@@ -10,20 +10,24 @@ pkgbase = freetype2-git
arch = i686
arch = x86_64
license = GPL
+ makedepends = libx11
makedepends = git
+ makedepends = python2
depends = zlib
depends = bzip2
depends = sh
depends = libpng
depends = harfbuzz
provides = libfreetype.so
- provides = freetype2=2.6.4+p0+gd80fe69
+ provides = freetype2=2.6.4+p12+g605946a
conflicts = freetype2
source = git://git.sv.gnu.org/freetype/freetype2.git
+ source = git://git.sv.gnu.org/freetype/freetype2-demos.git
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-subpixel-rendering.patch
source = 0003-Make-subpixel-hinting-mode-configurable.patch
sha1sums = SKIP
+ sha1sums = SKIP
sha1sums = 045b1b6a56151ab46a8300e6fd09f24294258e97
sha1sums = afd6f9504516fa02e57890dde820f488e0df36bb
sha1sums = 2a1d6e734001e196c7a7790c78165d9b9fe49f7f
diff --git a/PKGBUILD b/PKGBUILD
index b97b44eac5e..afc9dc4bc2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=freetype2-git
epoch=1
-pkgver=2.6.4+p0+gd80fe69
+pkgver=2.6.4+p12+g605946a
pkgrel=1
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
@@ -12,20 +12,42 @@ 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=('git')
+makedepends=('libx11' 'git' 'python2')
provides=('libfreetype.so' "freetype2=$pkgver")
conflicts=('freetype2')
install=freetype2.install
source=(git://git.sv.gnu.org/freetype/freetype2.git
+ git://git.sv.gnu.org/freetype/freetype2-demos.git
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
0003-Make-subpixel-hinting-mode-configurable.patch)
sha1sums=('SKIP'
+ 'SKIP'
'045b1b6a56151ab46a8300e6fd09f24294258e97'
'afd6f9504516fa02e57890dde820f488e0df36bb'
'2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+prepare() {
+ mkdir path
+ ln -s /usr/bin/python2 path/python
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+
+ # Provide a way to set the default subpixel hinting mode
+ # at runtime, without depending on the application to do so.
+ patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch
+
+ ./autogen.sh
+
+ cd ../freetype2-demos
+
+ # Suppress RPATH
+ sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
pkgver() {
local _tag _count
@@ -36,30 +58,35 @@ pkgver() {
echo ${_tag//-/.}+p$_count+g$(git rev-parse --short HEAD)
}
-prepare() {
- cd "${srcdir}/freetype2"
- patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
- patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
-
- # Provide a way to set the default subpixel hinting mode
- # at runtime, without depending on the application to do so.
- patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.patch"
-
- ./autogen.sh
-}
-
build() {
- cd "${srcdir}/freetype2"
+ cd freetype2
./configure --prefix=/usr --disable-static
make
+
+ # Build docs
+ PATH="$srcdir/path:$PATH" make refdoc
+
+ # Build demos
+ cd ../freetype2-demos
+ make
}
check() {
- cd "${srcdir}/freetype2"
+ cd freetype2
make -k check
}
package() {
- cd "${srcdir}/freetype2"
+ cd freetype2
make DESTDIR="${pkgdir}" install
+
+ # Package docs
+ install -dm755 "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+
+ # Package demos
+ cd ../freetype2-demos
+ for _i in bin/{f,t}t*; do
+ libtool --mode=install install $_i "$pkgdir/usr/bin/"
+ done
}
diff --git a/freetype2.install b/freetype2.install
index 0da8742752f..42c697d2af6 100644
--- a/freetype2.install
+++ b/freetype2.install
@@ -9,9 +9,9 @@ post_upgrade() {
your environment, for example /etc/environment or ~/.pam_environment .
Available settings:
- FT2_SUBPIXEL_HINTING=0 # Classic mode
+ FT2_SUBPIXEL_HINTING=0 # Classic mode (default in 2.6)
FT2_SUBPIXEL_HINTING=1 # Infinality mode
- FT2_SUBPIXEL_HINTING=2 # Default mode
+ FT2_SUBPIXEL_HINTING=2 # Minimal mode (default in 2.7)
MSG
fi
}