Skip to content
Snippets Groups Projects
Commit 9f713829 authored by Adam J. Stewart's avatar Adam J. Stewart Committed by becker33
Browse files

Add missing bzip2 dependency to freetype (#2536)

* Add freetype dependency on bzip2

* Switch package with an install method for the docs
parent 66986506
No related branches found
No related tags found
No related merge requests found
...@@ -2028,8 +2028,8 @@ The last element of a package is its ``install()`` method. This is ...@@ -2028,8 +2028,8 @@ The last element of a package is its ``install()`` method. This is
where the real work of installation happens, and it's the main part of where the real work of installation happens, and it's the main part of
the package you'll need to customize for each piece of software. the package you'll need to customize for each piece of software.
.. literalinclude:: ../../../var/spack/repos/builtin/packages/libpng/package.py .. literalinclude:: ../../../var/spack/repos/builtin/packages/mpfr/package.py
:pyobject: Libpng.install :pyobject: Mpfr.install
:linenos: :linenos:
``install`` takes a ``spec``: a description of how the package should ``install`` takes a ``spec``: a description of how the package should
......
...@@ -25,17 +25,20 @@ ...@@ -25,17 +25,20 @@
from spack import * from spack import *
class Freetype(Package): class Freetype(AutotoolsPackage):
"""Font package""" """FreeType is a freely available software library to render fonts.
homepage = "http://http://www.freetype.org" It is written in C, designed to be small, efficient, highly customizable,
url = "http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz" and portable while capable of producing high-quality output (glyph images)
of most vector and bitmap font formats."""
homepage = "https://www.freetype.org/index.html"
url = "http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.gz"
version('2.7', '337139e5c7c5bd645fe130608e0fa8b5')
version('2.5.3', 'cafe9f210e45360279c730d27bf071e9') version('2.5.3', 'cafe9f210e45360279c730d27bf071e9')
depends_on('libpng') depends_on('libpng')
depends_on('bzip2')
def install(self, spec, prefix): def configure_args(self):
configure("--prefix=%s" % prefix, "--with-harfbuzz=no") return ['--with-harfbuzz=no']
make()
make("install")
...@@ -25,23 +25,18 @@ ...@@ -25,23 +25,18 @@
from spack import * from spack import *
class Libpng(Package): class Libpng(AutotoolsPackage):
"""libpng graphics file format""" """libpng is the official PNG reference library."""
homepage = "http://www.libpng.org/pub/png/libpng.html" homepage = "http://www.libpng.org/pub/png/libpng.html"
url = "http://download.sourceforge.net/libpng/libpng-1.6.16.tar.gz" url = "http://download.sourceforge.net/libpng/libpng-1.6.26.tar.gz"
version('1.6.26', '236cd975520fc1f34cc0b8f0e615f7a0')
version('1.6.24', '65213080dd30a9b16193d9b83adc1ee9') version('1.6.24', '65213080dd30a9b16193d9b83adc1ee9')
version('1.6.16', '1a4ad377919ab15b54f6cb6a3ae2622d')
version('1.6.15', '829a256f3de9307731d4f52dc071916d') # Security vulnerabilities have been discovered in 1.6.19 an older
version('1.6.14', '2101b3de1d5f348925990f9aa8405660')
version('1.5.26', '3ca98347a5541a2dad55cd6d07ee60a9') # Required for qt@3
version('1.4.19', '89bcbc4fc8b31f4a403906cf4f662330')
version('1.2.56', '9508fc59d10a1ffadd9aae35116c19ee') version('1.2.56', '9508fc59d10a1ffadd9aae35116c19ee')
depends_on('zlib@1.0.4:') # 1.2.5 or later recommended depends_on('zlib@1.0.4:') # 1.2.5 or later recommended
def install(self, spec, prefix):
configure("--prefix=%s" % prefix)
make()
make("check")
make("install")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment