diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
| commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
| tree | 4d26462d027b14926335894749d2e01d982234d0 /media-libs/cogl | |
| parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) | |
gentoo resync : 27.03.2021
Diffstat (limited to 'media-libs/cogl')
| -rw-r--r-- | media-libs/cogl/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/cogl/cogl-1.22.8.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/cogl/files/cogl-1.22.8-slibtool.patch | 26 |
3 files changed, 36 insertions, 1 deletions
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest index f78ba3f74819..9f9ff0fac890 100644 --- a/media-libs/cogl/Manifest +++ b/media-libs/cogl/Manifest @@ -1,3 +1,4 @@ +AUX cogl-1.22.8-slibtool.patch 835 BLAKE2B d0bc0215d785be2b8fbae5afc23b50dc79adc77bb4a1c8e8dcef0104febfad397ddab94f9afe811b9765cd9c829bab4d5282ae95e5f32aaea3ec4e6c2649a651 SHA512 a0478481712f2481f08bcdd2c0feb87c2c1a45fe0e0e37aa00bdeed54ca5376d0dbeafe8b21d9ea28bb326025ccfaefa956683b779cf19f2bfc8524f7b962c97 DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f -EBUILD cogl-1.22.8.ebuild 3271 BLAKE2B 9ed4d3eabfd8e6a738d0c0c7a951e36a9928b212a01afefa8956e6ed574b4c5c7477e04a4cf31687c122ffb86f11298ef54465af3a3a7a666fb309c03fd53cb9 SHA512 aabab891acd06dda2f9b2df053dfd01d7063ae8173ce1830013e8a9049dacdd8f6e9aeae7ac0ebd221a288e37e7960b18e64d66b6ad523cbaf0b6f55108d5f22 +EBUILD cogl-1.22.8.ebuild 3452 BLAKE2B d40276aec062d7c25014ccf7c8905afb4751f206e5d314b03efd03b2582240f574d4115e39074d3ed3ae754df45d727088dc8e2b4654d5c947ffe9cff6d035c0 SHA512 e9c3d8eebc20f0e980bd44065e62c85d41fbd54debd90b27ad221b78f5ba852a267aecbf4deb3992e909ccd9da1803ba8ac5ec6adab361dd668908b84181adda MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44 diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild index 9396a6fa5d46..c2fb848a363e 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 000000000000..631ba13c5630 --- /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 <orbea@riseup.net> +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 |