Merge pull request #4966 from ebfe/freetype

freetype, cairo, fontconfig: drop ultimate buildoption
This commit is contained in:
Andrea Brancaleoni 2016-10-21 09:57:16 +02:00 committed by GitHub
commit eb7cb5f26c
3 changed files with 2 additions and 69 deletions

View File

@ -17,26 +17,12 @@ hostmakedepends="automake libtool pkg-config"
makedepends="libpng-devel fontconfig-devel pixman-devel libXrender-devel libglib-devel
$(vopt_if opengl MesaLib-devel) $(vopt_if gles2 MesaLib-devel)"
if [ ${build_option_ultimate} ]; then
_ultimate_version="2016-04-23"
_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
checksum+=" 9ea0e2455980be7c2ff649c1deb07838e9be64f4fad939716e0050fd5897b057"
post_extract() {
msg_normal "Applying ultimate patchset"
for P in ${_ultimate_wrksrc}/${pkgname}/*.patch; do
patch -p1 < $P
done
}
fi
pre_configure() {
autoreconf -fi
}
# Package build options
build_options="gles2 opengl ultimate"
desc_option_ultimate="Enable ultimate patchset"
build_options="gles2 opengl"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) build_options_default+=" opengl";;

View File

@ -14,38 +14,11 @@ license="MIT"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/$pkgname-$version.tar.bz2"
checksum=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
build_options="ultimate"
desc_option_ultimate="Enable ultimate patchset"
if [ ${build_option_ultimate} ]; then
_ultimate_version="2016-04-23"
_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
hostmakedepends+=" python-lxml gperf automake libtool"
distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
checksum+=" 9ea0e2455980be7c2ff649c1deb07838e9be64f4fad939716e0050fd5897b057"
post_extract() {
msg_normal "Applying ultimate patchset"
cp -r ${_ultimate_wrksrc}/conf.d.infinality ${wrksrc}
for P in ${_ultimate_wrksrc}/${pkgname}_patches/*.patch; do
patch -p1 < $P
done
}
pre_configure() {
autoreconf -fi
}
fi
post_install() {
if [ "$CROSS_BUILD" ]; then
sed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
fi
if [ ${build_option_ultimate} ]; then
vmkdir etc/fonts/conf.avail.infinality
for dir in combi free ms; do
vcopy ${_ultimate_wrksrc}/${pkgname}_patches/${dir} etc/fonts/conf.avail.infinality
done
vbin ${_ultimate_wrksrc}/${pkgname}_patches/fc-presets
fi
vlicense COPYING
}
fontconfig-devel_package() {
@ -57,10 +30,5 @@ fontconfig-devel_package() {
vmove usr/lib/*.so
vmove usr/share/man/man3
vmove usr/share/doc
if [ ${build_option_ultimate} ]; then
vmkdir usr/share/doc/fontconfig/fonts-settings
vcopy ${_ultimate_wrksrc}/fontconfig_patches/fonts-settings/*.conf usr/share/doc/fontconfig/fonts-settings
vcopy ${_ultimate_wrksrc}/doc/fontconfig-infinality-ultimate/* usr/share/doc/fontconfig
fi
}
}

View File

@ -12,27 +12,6 @@ license="GPL-2"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48
build_options="ultimate"
desc_option_ultimate="Enable ultimate patchset"
if [ "${build_option_ultimate}" ]; then
_ultimate_version="2016-04-23"
_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
checksum+=" 9ea0e2455980be7c2ff649c1deb07838e9be64f4fad939716e0050fd5897b057"
conf_files="/etc/profile.d/infinality-settings.sh"
post_extract() {
msg_normal "Applying ultimate patchset\n"
for P in ${_ultimate_wrksrc}/${pkgname}/*.patch; do
patch -p1 < $P
done
}
post_install() {
vmkdir etc/profile.d
vinstall ${_ultimate_wrksrc}/${pkgname}/infinality-settings.sh 644 etc/profile.d
}
fi
freetype-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"