diff options
| -rw-r--r-- | groups/251.native_packages_lib.group | 1 | ||||
| -rw-r--r-- | patches/sdl1_ttf-2.0.11_pre.local.patch | 46 | ||||
| -rw-r--r-- | vars/sdl1_ttf.vars | 9 |
3 files changed, 56 insertions, 0 deletions
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 50c3aefa..52c3d79a 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -338,6 +338,7 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")"; : ${PKG_SDL1_TTF_URL:=https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PKG_SDL1_TTF_VERSION}.tar.gz}; : ${PKG_SDL1_TTF_CONFIGURE_ARGS_EXTRA:="--with-freetype-prefix=${PREFIX_NATIVE} --without-x"}; : ${PKG_SDL1_TTF_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"}; +: ${PKG_SDL1_TTF_IN_TREE:=1}; : ${PKG_SDL2_DEPENDS:="w32api w32lib"}; : ${PKG_SDL2_SHA256SUM:=349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863}; : ${PKG_SDL2_VERSION:=2.0.12}; diff --git a/patches/sdl1_ttf-2.0.11_pre.local.patch b/patches/sdl1_ttf-2.0.11_pre.local.patch new file mode 100644 index 00000000..02b06356 --- /dev/null +++ b/patches/sdl1_ttf-2.0.11_pre.local.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/vars/sdl1_ttf.vars b/vars/sdl1_ttf.vars new file mode 100644 index 00000000..9da3b8c7 --- /dev/null +++ b/vars/sdl1_ttf.vars @@ -0,0 +1,9 @@ +# +# set +o errexit -o noglob -o nounset is assumed. +# + +pkg_sdl1_ttf_configure_autotools_pre() { + "${PKG_BASE_DIR}/${PKG_SUBDIR}/autogen.sh"; +}; + +# vim:filetype=sh textwidth=0 |