commit: 0098ec8fad775917aeaeddc0fa4d2f7f2ad992e7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 27 01:37:14 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 27 02:57:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0098ec8f
media-libs/cogl: fix build with slibtool (Closing the NEEDED bug too which I filed in the past as I can't reproduce right now. Possibly fixed by this.) Thanks-to: orbea <orbea <AT> riseup.net> Closes: https://bugs.gentoo.org/778041 Closes: https://bugs.gentoo.org/739644 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/cogl/cogl-1.22.8.ebuild | 8 ++++++++ media-libs/cogl/files/cogl-1.22.8-slibtool.patch | 26 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild index 9396a6fa5d4..c2fb848a363 100644 --- a/media-libs/cogl/cogl-1.22.8.ebuild +++ b/media-libs/cogl/cogl-1.22.8.ebuild @@ -3,6 +3,10 @@ EAPI=6 +# Temporarily needed for slibtool patch +# It's upstreamed so should be able to drop in future +# bug #778041 +GNOME2_EAUTORECONF="yes" inherit gnome2 multilib DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" @@ -57,6 +61,10 @@ DEPEND="${COMMON_DEPEND} # For some reason GL3 conformance test all fails again... RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch +) + src_prepare() { # Do not build examples sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ diff --git a/media-libs/cogl/files/cogl-1.22.8-slibtool.patch b/media-libs/cogl/files/cogl-1.22.8-slibtool.patch new file mode 100644 index 00000000000..631ba13c563 --- /dev/null +++ b/media-libs/cogl/files/cogl-1.22.8-slibtool.patch @@ -0,0 +1,26 @@ +https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/35 +https://bugs.gentoo.org/778041 + +From 2bd3cbed45d633fb15625d58e6b7cb8721b0ba98 Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Thu, 25 Mar 2021 07:17:20 -0700 +Subject: [PATCH] cogl-gles2: Fix undefined references. + +--- + cogl-gles2/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am +index 72ec1eae..1328444e 100644 +--- a/cogl-gles2/Makefile.am ++++ b/cogl-gles2/Makefile.am +@@ -17,6 +17,7 @@ endif + AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) + + libcogl_gles2_la_SOURCES = cogl-gles2-api.c ++libcogl_gles2_la_LIBADD = $(top_builddir)/cogl/libcogl.la + libcogl_gles2_la_LDFLAGS = \ + -no-undefined \ + -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ +-- +GitLab
