diff --git a/media-libs/harfbuzz/harfbuzz-1.9.0.recipe b/media-libs/harfbuzz/harfbuzz-1.9.0.recipe deleted file mode 100644 index 7d62e0b8a..000000000 --- a/media-libs/harfbuzz/harfbuzz-1.9.0.recipe +++ /dev/null @@ -1,139 +0,0 @@ -SUMMARY="An OpenType text shaping engine" -DESCRIPTION="HarfBuzz is an OpenType text shaping engine. It is used to \ -layout complex text such as the Indic and Arabic alphabets." -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" -COPYRIGHT="2004-2018 Behdad Esfahbod - 2000-2005 Owen Taylor - 2013, 2015-2017 Khaled Hosny - 2010,2011,2012 Google, Inc. - 2012 Mozilla Foundation - 2011 Codethink Limited - 2008,2010 Nokia Corporation and/or its subsidiary(-ies) - 2009 Keith Stribley - 2009 Martin Hosken and SIL International - 2007 Chris Wilson - 2005 David Turner - 2004,2007,2008,2009,2010 Red Hat, Inc. - 1998-2004 David Turner and Werner Lemberg" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2" -CHECKSUM_SHA256="11eca62bf0ac549b8d6be55f4e130946399939cdfe7a562fdaee711190248b00" -PATCHES="harfbuzz-$portVersion.patchset" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -if [ "$targetArchitecture" != x86_gcc2 ]; then - commandSuffix=$secondaryArchSuffix - commandBinDir=$binDir -else - commandSuffix= - commandBinDir=$prefix/bin -fi - -libVersion="0.10900.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - cmd:hb_ot_shape_closure$commandSuffix - cmd:hb_shape$commandSuffix - cmd:hb_subset$commandSuffix - lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat - lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat - lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libgraphite2$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9 - devel:libharfbuzz$secondaryArchSuffix = $libVersionCompat - devel:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat - devel:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - harfbuzz$secondaryArchSuffix == $portVersion base - devel:libglib_2.0$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libintl$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:grep - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:python - cmd:ragel$secondaryArchSuffix - cmd:sed - cmd:which - " - -defineDebugInfoPackage harfbuzz$secondaryArchSuffix \ - "$commandBinDir"/hb-ot-shape-closure \ - "$commandBinDir"/hb-shape \ - "$commandBinDir"/hb-subset \ - "$libDir"/libharfbuzz.so.$libVersion \ - "$libDir"/libharfbuzz-icu.so.$libVersion \ - "$libDir"/libharfbuzz-subset.so.$libVersion - -BUILD() -{ - autoreconf -fi - runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \ - --with-graphite2=yes --with-icu - make $jobArgs -} - -INSTALL() -{ - make install - - # remove libtool library files - rm $libDir/libharfbuzz*.la - - prepareInstalledDevelLibs \ - libharfbuzz \ - libharfbuzz-icu \ - libharfbuzz-subset \ - - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir \ - $dataDir -} - -TEST() -{ - make check -} diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3.recipe b/media-libs/harfbuzz/harfbuzz-2.1.3.recipe deleted file mode 100644 index 19e541c7b..000000000 --- a/media-libs/harfbuzz/harfbuzz-2.1.3.recipe +++ /dev/null @@ -1,139 +0,0 @@ -SUMMARY="An OpenType text shaping engine" -DESCRIPTION="HarfBuzz is an OpenType text shaping engine. It is used to \ -layout complex text such as the Indic and Arabic alphabets." -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" -COPYRIGHT="2004-2018 Behdad Esfahbod - 2000-2005 Owen Taylor - 2013, 2015-2017 Khaled Hosny - 2010,2011,2012 Google, Inc. - 2012 Mozilla Foundation - 2011 Codethink Limited - 2008,2010 Nokia Corporation and/or its subsidiary(-ies) - 2009 Keith Stribley - 2009 Martin Hosken and SIL International - 2007 Chris Wilson - 2005 David Turner - 2004,2007,2008,2009,2010 Red Hat, Inc. - 1998-2004 David Turner and Werner Lemberg" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2" -CHECKSUM_SHA256="613264460bb6814c3894e3953225c5357402915853a652d40b4230ce5faf0bee" -PATCHES="harfbuzz-$portVersion.patchset" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -libVersion="0.20103.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - cmd:hb_ot_shape_closure$commandSuffix - cmd:hb_shape$commandSuffix - cmd:hb_subset$commandSuffix - lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat - lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat - lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libgraphite2$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9 - devel:libharfbuzz$secondaryArchSuffix = $libVersionCompat - devel:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat - devel:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - harfbuzz$secondaryArchSuffix == $portVersion base - devel:libglib_2.0$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libintl$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:grep - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:python - cmd:ragel$secondaryArchSuffix - cmd:sed - cmd:which - " - -defineDebugInfoPackage harfbuzz$secondaryArchSuffix \ - "$commandBinDir"/hb-ot-shape-closure \ - "$commandBinDir"/hb-shape \ - "$commandBinDir"/hb-subset \ - "$libDir"/libharfbuzz.so.$libVersion \ - "$libDir"/libharfbuzz-icu.so.$libVersion \ - "$libDir"/libharfbuzz-subset.so.$libVersion - -BUILD() -{ - autoreconf -fi - runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \ - --with-graphite2=yes --with-icu - make $jobArgs -} - -INSTALL() -{ - make install - - # remove libtool library files - rm -f "$libDir"/libharfbuzz*.la - - prepareInstalledDevelLibs \ - libharfbuzz \ - libharfbuzz-icu \ - libharfbuzz-subset \ - - fixPkgconfig - - # devel package - packageEntries devel \ - "$dataDir" \ - "$developDir" \ - "$libDir"/cmake -} - -TEST() -{ - make check -} diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.recipe b/media-libs/harfbuzz/harfbuzz-2.7.4.recipe index 986677af5..415965ec1 100644 --- a/media-libs/harfbuzz/harfbuzz-2.7.4.recipe +++ b/media-libs/harfbuzz/harfbuzz-2.7.4.recipe @@ -16,7 +16,7 @@ COPYRIGHT="2004-2018 Behdad Esfahbod 2004,2007,2008,2009,2010 Red Hat, Inc. 1998-2004 David Turner and Werner Lemberg" LICENSE="MIT" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz" CHECKSUM_SHA256="6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7" PATCHES="harfbuzz-$portVersion.patchset" @@ -36,9 +36,6 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - cmd:hb_ot_shape_closure$commandSuffix - cmd:hb_shape$commandSuffix - cmd:hb_subset$commandSuffix lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat @@ -47,7 +44,6 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix lib:libgraphite2$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix >= 66 @@ -65,7 +61,6 @@ PROVIDES_devel=" REQUIRES_devel=" harfbuzz$secondaryArchSuffix == $portVersion base devel:libfreetype$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix " @@ -73,7 +68,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix >= 66 @@ -91,16 +85,13 @@ BUILD_PREREQUIRES=" cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python + cmd:python3 cmd:ragel$secondaryArchSuffix cmd:sed cmd:which " defineDebugInfoPackage harfbuzz$secondaryArchSuffix \ - "$commandBinDir"/hb-ot-shape-closure \ - "$commandBinDir"/hb-shape \ - "$commandBinDir"/hb-subset \ "$libDir"/libharfbuzz.so.$libVersion \ "$libDir"/libharfbuzz-icu.so.$libVersion \ "$libDir"/libharfbuzz-subset.so.$libVersion @@ -109,7 +100,7 @@ BUILD() { autoreconf -fi runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \ - --with-graphite2=yes --with-icu + --with-graphite2=yes --with-icu --without-glib make $jobArgs }