gentoo auto-resync : 15:07:2022 - 13:42:19

3 files changed, 73 insertions, 0 deletions

diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index ab4b3558d514..905ae7f1c3ba 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,4 +1,6 @@
 AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f
+AUX giblib-1.2.4-use-pkg-config-imlib2.patch 656 BLAKE2B 01bfa778adc8f2a80c750ccc82455ac1548c123789855ad1f1b1b62e0d91f03330fc6228078300566b411f3b3e814a462241c6deab627ed25475dc2352ec216a SHA512 bdf26ce8aec00b5d84b4903602d1be6322f86c9658b02756ea623c24d824d41e7843f4bf618496eed5a04d816f2dd27545ae54dabdbde5f7f3fb2a4ed7272bbd
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 EBUILD giblib-1.2.4-r1.ebuild 821 BLAKE2B b3ddd1f969e3725f62abb1e115787a28a9d3f21fc659c76045dfbbeb029dd76703b2692ba64d56d57dd7068479ca9fe945b7f4dfcf82fcb2b0678ef931fd637d SHA512 8d997f409cb9952d19c4825a265e2ee9ab4ed1e8131318ea049f578646c04168b181a6bede4bb99d996dbd9a26a421180991fb329646b3c8af22247868f58ce4
+EBUILD giblib-1.2.4-r2.ebuild 864 BLAKE2B 38c267f504b605ce0dfa5b5c93c37fe9f6c1b920bdee4e7c19a8de85e6bdbf4f2bdd6a62f0f9aab538d81551fd3b8d2b567fecd2c86521389264fbdb33f2776e SHA512 36a86b2551549faa99538f68abea0420d7cf0283844cef65ad7cd93bffb84c8950e958e5d52fa529350b96e2e1cd8becaf1c4f31a6560f1a42dc2f88a0543504
 MISC metadata.xml 586 BLAKE2B 3574a174fb7d107863fab7ec9fed0568f2bf0a6e5304a284c5a45f6b49cf632004b3547369693fbde44032ce2ec7e0c9ae5f054637fe35bfb640866b6bca0da9 SHA512 7cc17400b2ab02f3660683c7d4c6d3d3e948bc67579e2618186b0e19284fa6b282e6b25c891a3b45d484cddfaf3cba688c294a69278e8789b8e95d5f19c76df9
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
+}