diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-libs/libg15render/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-libs/libg15render/files')
-rw-r--r-- | dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch | 25 | ||||
-rw-r--r-- | dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch | 59 |
2 files changed, 84 insertions, 0 deletions
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch new file mode 100644 index 000000000000..781c9b6bfcaf --- /dev/null +++ b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch @@ -0,0 +1,25 @@ +From 2900f3f8a90915f59a25c8b3fb27912492e7b044 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Sat, 14 May 2022 18:20:24 +0200 +Subject: [PATCH] Makefile.am: Make docdir selectable + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 2fdacd7..cf00f1c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ libg15render_la_LDFLAGS = -version-info 3:0 + include_HEADERS= libg15render.h + EXTRA_DIST = debian libg15render.3 + man3_MANS = $(top_srcdir)/libg15render.3 +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) ++docdir = @docdir@ + doc_DATA = AUTHORS ChangeLog COPYING NEWS README + ACLOCAL_AMFLAGS = -I m4 + +-- +2.36.1 + diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch new file mode 100644 index 000000000000..54a8fd4c07d3 --- /dev/null +++ b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch @@ -0,0 +1,59 @@ +diff --git a/configure.ac b/configure.ac +index 97338f3..a64f64c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,19 +13,41 @@ AC_PROG_CC + LT_INIT + + # Checks for --enable args +-AC_MSG_CHECKING(whether to enable FreeType2 support) +-AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support], +- if [[[ "$enableval" = "yes" ]]]; then +- AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) +- CFLAGS="$CFLAGS `freetype-config --cflags`" +- FTLIB="-lfreetype" +- ttf_support="yes" +- else +- ttf_support="no" +- fi, +- ttf_support="no" +-) +-AC_MSG_RESULT($ttf_support) ++AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],,[enable_ttf=no]) ++AS_IF([test "x$enable_ttf" != "xno"], [ ++ m4_ifdef([PKG_PROG_PKG_CONFIG], [ ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES(FREETYPE, freetype2, ++ [ ++ AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) ++ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" ++ FTLIB="$FREETYPE_LIBS" ++ ], [ ++ AS_IF([test "x$enable_ttf" = "xyes"], [ ++ AC_MSG_ERROR([Cannot find freetype2]) ++ ]) ++ ]) ++ ], [ ++ AC_MSG_CHECKING(whether to enable FreeType2 support) ++ AC_PATH_PROG([FTCONFIG], [freetype-config]) ++ AS_IF([test -n "$FTCONFIG" ], [ ++ CFLAGS="$CFLAGS `$FTCONFIG --cflags`" ++ FTLIB="-lfreetype" ++ AC_DEFINE(TTF_SUPPORT, [1]) ++ AC_MSG_RESULT([yes]) ++ ], [ ++ AS_IF([test "x$enable_ttf" = "xyes"], [ ++ AC_MSG_ERROR([Cannot find freetype-config]) ++ ], [ ++ AC_DEFINE(TTF_SUPPORT, [0]) ++ ]) ++ ]) ++ AC_MSG_RESULT([no]) ++ ] ++ ) ++], [ ++ AC_MSG_RESULT(No Freetype is being used) ++]) + + # Checks for libraries. + AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"])) |