diff options
| author | Ørjan Malde <red@foxi.me> | 2021-07-17 13:30:15 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2021-07-17 13:30:15 +0200 |
| commit | 7f332cd6ce09a09422dac353d1571eca0f98b43d (patch) | |
| tree | 98f65fb500001c8dc555cac0370c3665e7225421 /patches | |
| parent | 09da6e9649deb7b9fc043eea3e50a7b9db6a8ba1 (diff) | |
| download | midipix_build-7f332cd6ce09a09422dac353d1571eca0f98b43d.tar.bz2 midipix_build-7f332cd6ce09a09422dac353d1571eca0f98b43d.tar.xz | |
groups/251.native_packages_lib.group: sdl1_ttf: fix building w/ newer freetype2
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/sdl1_ttf-2.0.11_pre.local.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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 |