summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-07-15 08:04:14 +0100
committerSam James <sam@gentoo.org>2022-07-15 08:05:32 +0100
commitf2b2b14c48244024574d1b25ba14ff7664c902af (patch)
tree8f2bf3d3c143737f229c7709dcce7247f7ecc84f /media-libs/giblib
parentsys-fs/btrfs-progs: fix MissingInherits (udev) (diff)
downloadgentoo-f2b2b14c48244024574d1b25ba14ff7664c902af.tar.gz
gentoo-f2b2b14c48244024574d1b25ba14ff7664c902af.tar.bz2
gentoo-f2b2b14c48244024574d1b25ba14ff7664c902af.zip
media-libs/giblib: fix build w/ newer imlib2 (pkg-config)
Closes: https://bugs.gentoo.org/828879 Thanks-to: Abbaad <abbaad@case.edu> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/giblib')
-rw-r--r--media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch29
-rw-r--r--media-libs/giblib/giblib-1.2.4-r2.ebuild42
2 files changed, 71 insertions, 0 deletions
diff --git a/media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch b/media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch
new file mode 100644
index 000000000000..9b0cc163a593
--- /dev/null
+++ b/media-libs/giblib/files/giblib-1.2.4-use-pkg-config-imlib2.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/828879
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,20 +16,12 @@ AM_SANITY_CHECK
+ AM_MAINTAINER_MODE
+ AM_WITH_DMALLOC
+
+-AC_PATH_GENERIC(imlib2, 1.0.0, [
+- AC_SUBST(IMLIB_LIBS)
+- AC_SUBST(IMLIB_CFLAGS) ],
+- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+-
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CFLAGS)
+-
+-LIBS="$LIBS -lm"
+-CFLAGS="$CFLAGS -Wall"
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
++
++AC_CHECK_LIB([m],[cos])
+
++CFLAGS="$CFLAGS -Wall"
+
+ AC_OUTPUT([
+ Makefile
diff --git a/media-libs/giblib/giblib-1.2.4-r2.ebuild b/media-libs/giblib/giblib-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..c19ab3fa4421
--- /dev/null
+++ b/media-libs/giblib/giblib-1.2.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A graphics library built on top of imlib2"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/"
+SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ media-libs/freetype
+ media-libs/imlib2:=[X]
+ x11-libs/libX11
+ x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-fix-build-system.patch
+ "${FILESDIR}"/${PN}-1.2.4-use-pkg-config-imlib2.patch
+)
+
+src_prepare() {
+ default
+
+ rm configure.in || die
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+}