* [gentoo-commits] proj/x11:multilib commit in: media-libs/freetype/files/, media-libs/fontconfig/files/, media-libs/freetype/, ...
@ 2013-01-21 22:37 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2013-01-21 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 0f609420fa3ff378d473efe290832405f2f99774
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 22:34:40 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 22:34:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0f609420
Include fontconfig & freetype to get a complete set of emul- repls.
Please note that these packages were migrated roughly.
---
.../emul-linux-x86-xlibs-20121202-r1.ebuild | 2 +
.../files/fontconfig-2.3.2-docbook.patch | 15 +++
.../files/fontconfig-2.7.1-latin-reorder.patch | 50 ++++++++
media-libs/fontconfig/fontconfig-2.9.0-r1.ebuild | 126 ++++++++++++++++++
.../files/freetype-2.3.2-enable-valid.patch | 22 ++++
media-libs/freetype/freetype-2.4.10-r2.ebuild | 133 ++++++++++++++++++++
x11-libs/libXft/libXft-9999-r1.ebuild | 16 +--
7 files changed, 350 insertions(+), 14 deletions(-)
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20121202-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20121202-r1.ebuild
index ee5be41..07a97db 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20121202-r1.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20121202-r1.ebuild
@@ -14,6 +14,8 @@ KEYWORDS="~amd64"
IUSE=""
RDEPEND="
+ >=media-libs/fontconfig-2.9.0-r1[multilib(-)]
+ >=media-libs/freetype-2.4.10-r2[multilib(-)]
>=x11-libs/libICE-9999-r1[multilib(-)]
>=x11-libs/libpciaccess-9999-r1[multilib(-)]
>=x11-libs/libSM-9999-r1[multilib(-)]
diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch
new file mode 100644
index 0000000..6a6c01e
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch
@@ -0,0 +1,15 @@
+--- configure.in.old 2006-03-31 18:31:26.000000000 +0200
++++ configure.in 2006-03-31 18:44:47.000000000 +0200
+@@ -407,7 +407,11 @@
+ # Let people not build/install docs if they don't have docbook
+ #
+
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_ARG_ENABLE(docbook, [ --disable-docbook Don't build documentation],,)
++
++if test x$enable_docbook != xno; then
++ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++fi
+
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+
diff --git a/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch
new file mode 100644
index 0000000..6ecf6cb
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch
@@ -0,0 +1,50 @@
+diff -Naurp fontconfig-2.7.1-orig/conf.d/60-latin.conf fontconfig-2.7.1/conf.d/60-latin.conf
+--- fontconfig-2.7.1-orig/conf.d/60-latin.conf 2009-07-10 11:09:33.000000000 -0600
++++ fontconfig-2.7.1/conf.d/60-latin.conf 2009-08-16 15:25:38.347701112 -0600
+@@ -4,8 +4,8 @@
+ <alias>
+ <family>serif</family>
+ <prefer>
+- <family>Bitstream Vera Serif</family>
+ <family>DejaVu Serif</family>
++ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Luxi Serif</family>
+@@ -16,14 +16,14 @@
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+- <family>Bitstream Vera Sans</family>
+ <family>DejaVu Sans</family>
+- <family>Verdana</family>
+- <family>Arial</family>
+- <family>Albany AMT</family>
++ <family>Bitstream Vera Sans</family>
+ <family>Luxi Sans</family>
+ <family>Nimbus Sans L</family>
++ <family>Arial</family>
++ <family>Albany AMT</family>
+ <family>Helvetica</family>
++ <family>Verdana</family>
+ <family>Lucida Sans Unicode</family>
+ <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+ <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
+@@ -32,14 +32,14 @@
+ <alias>
+ <family>monospace</family>
+ <prefer>
+- <family>Bitstream Vera Sans Mono</family>
+ <family>DejaVu Sans Mono</family>
++ <family>Bitstream Vera Sans Mono</family>
+ <family>Inconsolata</family>
++ <family>Luxi Mono</family>
++ <family>Nimbus Mono L</family>
+ <family>Andale Mono</family>
+ <family>Courier New</family>
+ <family>Cumberland AMT</family>
+- <family>Luxi Mono</family>
+- <family>Nimbus Mono L</family>
+ <family>Courier</family>
+ </prefer>
+ </alias>
diff --git a/media-libs/fontconfig/fontconfig-2.9.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.9.0-r1.ebuild
new file mode 100644
index 0000000..33c948e
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.9.0-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.9.0.ebuild,v 1.2 2012/05/05 08:02:34 jdhore Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+inherit autotools-multilib eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="doc static-libs"
+
+# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+# default and used by every distro. See bug #283191.
+
+RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}]
+ >=dev-libs/expat-1.95.3"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-sgml-utils[jadetex]
+ =app-text/docbook-sgml-dtd-3.1*
+ )"
+PDEPEND="app-admin/eselect-fontconfig
+ virtual/ttf-fonts"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466
+ "${FILESDIR}"/${PN}-2.3.2-docbook.patch # 310157
+)
+
+src_configure() {
+ local myconf
+ if tc-is-cross-compiler; then
+ myconf="--with-arch=${ARCH}"
+ replace-flags -mtune=* -DMTUNE_CENSORED
+ replace-flags -march=* -DMARCH_CENSORED
+ fi
+ autotools-multilib_src_configure \
+ $(use_enable static-libs static) \
+ $(use_enable doc docs) \
+ $(use_enable doc docbook) \
+ --localstatedir=/var \
+ --with-default-fonts=/usr/share/fonts \
+ --with-add-fonts=/usr/local/share/fonts \
+ ${myconf} || die
+}
+
+src_install() {
+ autotools-multilib_src_install
+ # cheap hack
+ autotools-multilib_src_compile -C doc install-man
+
+ #fc-lang directory contains language coverage datafiles
+ #which are needed to test the coverage of fonts.
+ insinto /usr/share/fc-lang
+ doins fc-lang/*.orth
+
+ sub_install() {
+ insinto /etc/fonts
+ doins "${BUILD_DIR}"/fonts.conf
+ }
+ autotools-multilib_foreach_abi sub_install
+
+ dodoc doc/fontconfig-user.{txt,pdf}
+ dodoc AUTHORS ChangeLog README
+
+ if [[ -e ${D}usr/share/doc/fontconfig/ ]]; then
+ mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P}
+ rm -rf "${D}"usr/share/doc/fontconfig
+ fi
+
+ # Changes should be made to /etc/fonts/local.conf, and as we had
+ # too much problems with broken fonts.conf we force update it ...
+ echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+ doenvd "${T}"/37fontconfig
+
+ # As of fontconfig 2.7, everything sticks their noses in here.
+ dodir /etc/sandbox.d
+ echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig
+}
+
+pkg_preinst() {
+ # Bug #193476
+ # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+ # config files. If we install as-is, we'll blow away user settings.
+ ebegin "Syncing fontconfig configuration to system"
+ if [[ -e ${ROOT}/etc/fonts/conf.d ]]; then
+ for file in "${ROOT}"/etc/fonts/conf.avail/*; do
+ f=${file##*/}
+ if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then
+ [[ -f ${D}etc/fonts/conf.avail/${f} ]] \
+ && ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null
+ else
+ [[ -f ${D}etc/fonts/conf.avail/${f} ]] \
+ && rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null
+ fi
+ done
+ fi
+ eend $?
+}
+
+pkg_postinst() {
+ einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/"
+ find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete
+
+ echo
+ ewarn "Please make fontconfig configuration changes using \`eselect fontconfig\`"
+ ewarn "Any changes made to /etc/fonts/fonts.conf will be overwritten."
+ ewarn
+ ewarn "If you need to reset your configuration to upstream defaults, delete"
+ ewarn "the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+ echo
+
+ if [[ ${ROOT} = / ]]; then
+ ebegin "Creating global font cache"
+ /usr/bin/fc-cache -srf
+ eend $?
+ fi
+}
diff --git a/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch b/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch
new file mode 100644
index 0000000..44f3bf6
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch
@@ -0,0 +1,22 @@
+Enables gxvalid and otvalid modules for use with ftvalid.
+
+--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
+@@ -110,7 +110,7 @@
+ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -124,7 +124,7 @@
+
+ # OpenType table validation. Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
diff --git a/media-libs/freetype/freetype-2.4.10-r2.ebuild b/media-libs/freetype/freetype-2.4.10-r2.ebuild
new file mode 100644
index 0000000..1d9cc16
--- /dev/null
+++ b/media-libs/freetype/freetype-2.4.10-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.10-r1.ebuild,v 1.2 2012/07/30 05:35:32 yngwin Exp $
+
+EAPI=5
+
+inherit autotools-multilib eutils flag-o-matic libtool multilib
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+ utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 )
+ doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )
+ infinality? ( http://dev.gentoo.org/~yngwin/distfiles/${P}-infinality-patches.tar.xz )"
+
+LICENSE="FTL GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X auto-hinter bindist bzip2 debug doc fontforge infinality static-libs utils"
+
+DEPEND="sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXau[${MULTILIB_USEDEP}]
+ x11-libs/libXdmcp[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ infinality? ( media-libs/fontconfig-infinality )"
+
+src_prepare() {
+ enable_option() {
+ sed -i -e "/#define $1/a #define $1" \
+ include/freetype/config/ftoption.h \
+ || die "unable to enable option $1"
+ }
+
+ disable_option() {
+ sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+ include/freetype/config/ftoption.h \
+ || die "unable to disable option $1"
+ }
+
+ if ! use bindist; then
+ # See http://freetype.org/patents.html
+ # ClearType is covered by several Microsoft patents in the US
+ enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ fi
+
+ if use auto-hinter; then
+ disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+ enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
+ fi
+
+ if use debug; then
+ enable_option FT_DEBUG_LEVEL_TRACE
+ enable_option FT_DEBUG_MEMORY
+ fi
+
+ disable_option FT_CONFIG_OPTION_OLD_INTERNALS
+
+ if use infinality; then
+ epatch "${WORKDIR}"/patches/freetype-add-subpixel-hinting-infinality.patch
+ epatch "${WORKDIR}"/patches/freetype-entire-infinality-patchset.patch
+
+ enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
+ fi
+
+ epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+ if use utils; then
+ cd "${WORKDIR}/ft2demos-${PV}"
+ sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die
+ # Disable tests needing X11 when USE="-X". (bug #177597)
+ if ! use X; then
+ sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+ fi
+ fi
+
+ epunt_cxx
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+ # we need non-/bin/sh to run configure
+ [[ -n ${CONFIG_SHELL} ]] && \
+ sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+ "${S}"/builds/unix/configure
+
+ autotools-multilib_src_configure \
+ $(use_enable static-libs static) \
+ $(use_with bzip2)
+}
+
+src_compile() {
+ autotools-multilib_src_compile
+
+ if use utils; then
+ einfo "Building utils"
+ cd "${WORKDIR}/ft2demos-${PV}"
+ # fix for Prefix, bug #339334
+ emake X11_PATH="${EPREFIX}/usr/$(get_libdir)"
+ fi
+}
+
+src_install() {
+ autotools-multilib_src_install
+
+ if use utils; then
+ einfo "Installing utils"
+ rm "${WORKDIR}"/ft2demos-${PV}/bin/README
+ for ft2demo in ../ft2demos-${PV}/bin/*; do
+ ./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+ "${ED}"/usr/bin
+ done
+ fi
+
+ if use fontforge; then
+ # Probably fontforge needs less but this way makes things simplier...
+ einfo "Installing internal headers required for fontforge"
+ find src/truetype include/freetype/internal -name '*.h' | \
+ while read header; do
+ mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+ cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+ done
+ fi
+
+ dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
+
+ use doc && dohtml -r docs/*
+}
diff --git a/x11-libs/libXft/libXft-9999-r1.ebuild b/x11-libs/libXft/libXft-9999-r1.ebuild
index d2dd956..ac26db8 100644
--- a/x11-libs/libXft/libXft-9999-r1.ebuild
+++ b/x11-libs/libXft/libXft-9999-r1.ebuild
@@ -15,20 +15,8 @@ IUSE=""
RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
- media-libs/freetype
- media-libs/fontconfig
+ media-libs/freetype[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
>=x11-proto/xproto-9999-r1
virtual/ttf-fonts"
DEPEND="${RDEPEND}"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- # Hack freetype & fontconfig around till they get multilib
- FONTCONFIG_CFLAGS="$(pkg-config --cflags fontconfig || die)"
- FONTCONFIG_LIBS="$(pkg-config --libs fontconfig || die)"
- FREETYPE_CFLAGS="$(pkg-config --cflags freetype2 || die)"
- FREETYPE_LIBS="$(pkg-config --libs freetype2 || die)"
- )
-
- xorg-2_src_configure
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-21 22:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-21 22:37 [gentoo-commits] proj/x11:multilib commit in: media-libs/freetype/files/, media-libs/fontconfig/files/, media-libs/freetype/, Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox