diff options
Diffstat (limited to 'media-libs/sdl2-ttf')
| -rw-r--r-- | media-libs/sdl2-ttf/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch | 46 | ||||
| -rw-r--r-- | media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild | 38 | ||||
| -rw-r--r-- | media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild | 30 |
4 files changed, 69 insertions, 50 deletions
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest index a629400cce32..2e359b7380ad 100644 --- a/media-libs/sdl2-ttf/Manifest +++ b/media-libs/sdl2-ttf/Manifest @@ -1,5 +1,4 @@ -DIST SDL2_ttf-2.0.13.tar.gz 4152978 BLAKE2B c28758d73835c681077fff91cf53e7e4ff39928a4ab8d140351c7e2ecb6b14db0014c536cf18870589109088ba976a839359e8cf213439638493325c09d9080a SHA512 24f7d77c7d46be3c8236d6edde42f40c97c778e2fdb5d7923f1ec473ce19039c382843afe6de79f04c014d3f854cdf912cdfe1e0cf803a2fd246fd4c65360c6b +AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099 -EBUILD sdl2-ttf-2.0.13.ebuild 930 BLAKE2B 8a66bbca52cf47cbdaebb0ae661493110dfa13beee7a9ab9c16f35b8cefe5f3f33a7956f2a541cff814c7479eaecba436d5af994a8a8694b61ff670482099a14 SHA512 8b98fab9d0a5f46ed9903c009efaf3255e969f53dbe95441577e3a000d6db94fbedc284b559c790c86b88951087f67974aa7220d6393ebb05e3aed51f22a789f -EBUILD sdl2-ttf-2.0.14.ebuild 872 BLAKE2B 247b9df40c84cf07f9458baa7da36b018a48accd8138c585a917046c1cc9ffefdf81e0206a84cb50d31381795df9da5c2b5e0179d7a5421641364974fc5be5c0 SHA512 91e113483fca8550b520a763cbc8e93e02487a3b025aac5176259100b2920f0a3e64c5f7b103dc38944ee4ed46be462dd4d836d178be9bf6cebae05299d3b28d +EBUILD sdl2-ttf-2.0.14.ebuild 1080 BLAKE2B 47f9c2df080d3a805de029a87f92979dfd78b5d4f848a5f19ac18831e3dfd057d8df7d50160fee026a268efd350295256a501031797a7d56216bd673c6f005e6 SHA512 5e4079f1d806bb67e971e2a715dbd6217cdc42877d3bf7cbf2aa56d8dcf28d8aae243d7df90a94c3a4f6f226d952c3e3d121788188bc33bcc2221e4e10d9ebd8 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7 diff --git a/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch new file mode 100644 index 000000000000..02b06356190e --- /dev/null +++ b/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/654758 + +--- SDL_ttf-2.0.11/configure.in ++++ SDL_ttf-2.0.11/configure.in +@@ -64,6 +64,7 @@ + ;; + esac + ++PKG_PROG_PKG_CONFIG + + dnl Check for iconv (character conversion library; see iconv.m4) + dnl This isn't available on many systems +@@ -94,6 +95,17 @@ + dnl + dnl Get the cflags and libraries from the freetype-config script + dnl ++PKG_CHECK_MODULES( ++ FREETYPE2, ++ freetype2, ++ [ ++ ft_found=yes ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LIBS="$LIBS $FREETYPE2_LIBS" ++ ], ++ ft_found=no ++) ++ + AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is + installed (optional)], + freetype_prefix="$withval", freetype_prefix="") +@@ -101,6 +113,7 @@ + where FREETYPE is installed (optional)], + freetype_exec_prefix="$withval", freetype_exec_prefix="") + ++if test "x$ft_found" != "xyes" ; then + if test x$freetype_exec_prefix != x ; then + freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" + if test x${FREETYPE_CONFIG+set} != xset ; then +@@ -123,6 +136,7 @@ + CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" + LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" + fi ++fi + + dnl Check for SDL + SDL_VERSION=1.2.4 diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild deleted file mode 100644 index 9553bc5b3e80..000000000000 --- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib-minimal - -MY_P=SDL2_ttf-${PV} -DESCRIPTION="library that allows you to use TrueType fonts in SDL applications" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/" -SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs X" - -RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) - >=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}]" -DEPEND=${RDEPEND} - -S=${WORKDIR}/${MY_P} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ - $(use_with X x) -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - dodoc {CHANGES,README}.txt - prune_libtool_files -} diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild index 85642e257dee..2e741425b72d 100644 --- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild +++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils multilib-minimal +EAPI=6 +inherit autotools multilib-minimal -MY_P=SDL2_ttf-${PV} +MY_P="SDL2_ttf-${PV}" DESCRIPTION="library that allows you to use TrueType fonts in SDL applications" HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/" SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz" @@ -18,17 +18,29 @@ RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) >=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}] >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}]" -DEPEND=${RDEPEND} +DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/sdl-ttf-2.0.11-freetype_pkgconfig.patch" +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ + local myeconfargs=( + $(use_enable static-libs static) $(use_with X x) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install_all() { dodoc {CHANGES,README}.txt - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } |