summaryrefslogtreecommitdiff
path: root/dev-games/clanlib
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
commitabaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
treeeca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-games/clanlib
parent24fd814c326e282c4321965c31f341dad77e270d (diff)
gentoo resync : 22.01.2021
Diffstat (limited to 'dev-games/clanlib')
-rw-r--r--dev-games/clanlib/Manifest3
-rw-r--r--dev-games/clanlib/clanlib-2.3.7.ebuild3
-rw-r--r--dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch13
3 files changed, 17 insertions, 2 deletions
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 86022c126177..f8aedd84f04b 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -6,12 +6,13 @@ AUX clanlib-0.8.1-libpng15.patch 377 BLAKE2B 50b99f4104ad4a5e71c5356a073f2dd561e
AUX clanlib-0.8.1-ndebug.patch 866 BLAKE2B db4f813d62220d283f1d4d43eef69ec40697855c387d444759eabb00a0cdd1cf8913662c6df81da6cd83e3de8a1cf8ebebb29ab212c702f7e58e8391b5fdcb51 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419
AUX clanlib-2.3.7-autotools.patch 1602 BLAKE2B 054f64c02211799e964ab4b05700375fce18eec039144fc310e111607ee86df1954a815bb96e37eede3fc72ce2bc99961ff2e70c1306406ebf26a3329acd18b6 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa
AUX clanlib-2.3.7-doc.patch 506 BLAKE2B 0ea958bd60b2b005919caaaabdf7643c1e3b3cfd62b168dae4370826b328111d6d0bb86a708f19c04fc6778b7db76f86ebb130d48cf96d47e8b5be67040f5f24 SHA512 df75223e466799bde70b07e8ea6f3724792dcd5fe96e417dad47b27d44a3d87b6b7157035f388a48ecce9985473a9e1d84a24de1c8f58247eb952fce457ceccb
+AUX clanlib-2.3.7-freetype_pkgconfig.patch 1087 BLAKE2B 4dd1c76687b18bf2df704b13cc43052fdf84442b2eebde5cb49f46b313c2d9f5fadc1d589f1d4c4ea4d2041592c70fd5d77d33b8169826f05aaea5985b90fff8 SHA512 797fdf7d2d7612b5568583b852ab7d7c808e1cd97a8018ed94df209fccaac1b7cba36aac3ecd8903f863aca3b996dbcd8e3a55177af15931da999998dd7de259
AUX clanlib-4.0.0-fix-build-system.patch 622 BLAKE2B 4dd50ea87fb7dc2dccf2f5db5b1e00941ead76313b847b6e6e574b85f8a9ac0b884fbd5b5548125e886f1a405efc1087c978317e9a935c0f0e1ac0dae2da1e76 SHA512 bda813264f552eff8cc7cea45ec4ea29517a8590066c4b435942e97ea7d68e8d2f21bebf83141b04f1fcc84e936bb3a7ad354b644184dd56b746ab3bfeff9e19
AUX clanlib-4.0.0-freetype_pkgconfig.patch 1243 BLAKE2B 1ffe267b206dd5f17a30883e8b7602b37f12da0477f02d767db74fbb755befac07d0fbf697d212d59ac5786bd6955c03a4834f3aad885ccffa3b6830fd1bd1c9 SHA512 b6cc46f4e339d7f415c96baf7c7f9e24968d6e5961d438566e1bb111042f3aad3d434e8e6dd02128444db19259f3d81cb373a21513df0eb2d9d87975c49fc87d
DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
EBUILD clanlib-0.8.1.ebuild 2043 BLAKE2B 216259750a2c4f1f9b55ddbcbe74ab26b59c38ac6fed64db2ade0cdde2efec8778bd3a7348a6528bd2ac84a92dca1856ebbfffefa55ed4a3967f8fb92aa0481b SHA512 b21de7ec8024ebe0c07db99f783abc98dc1b6bfb5a137745d45c10591fa4466a5922571098d453a05c87d3faf8e755613c3815ec4210320290a83f2d7c908e3d
-EBUILD clanlib-2.3.7.ebuild 2150 BLAKE2B f20d5f06c5ef8adb1f68bde558cc9f114f678f14ebf7397565e37aaf26d9734f822fa874bd877de092aed352ed34fac9865f81db39d56e8427a845770a2db823 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57
+EBUILD clanlib-2.3.7.ebuild 2200 BLAKE2B daed6241575bc1b5324a10c980f6035b79e56c620c7affb1c1bc9e47b67e44f699bcfbf64436a231882a74a91734622a13c4143ec6fdb231afab39370a896795 SHA512 8df5c094f60c825f6c22fbb923fb4e88c35a8a5a076c7426e72c9bffdb62da9dc11f3268d450aed727c0c5ef13ecdd35d01c33e4ee2b5e10c0801edc8c436ca1
EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
MISC metadata.xml 3096 BLAKE2B a800d15375b63fd801b1941937815e34197ff8c598f7d6f539a0bb50205e182434506ccf44a9677527a9edd4c9470d3b7d344830d21d7c20386a1998f123fdf8 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd
diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild
index 994ee11d94ce..08584b0cf5d6 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -46,6 +46,7 @@ S=${WORKDIR}/${MY_P}
PATCHES=(
"${FILESDIR}"/${P}-autotools.patch
"${FILESDIR}"/${P}-doc.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
)
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..47a1c89b2405
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/764902
+
+--- ClanLib-2.3.7/configure.ac
++++ ClanLib-2.3.7/configure.ac
+@@ -342,7 +342,7 @@
+ echo "=============================="
+ CLANLIB_CHECK_LIB(png, [`cat $srcdir/Setup/Tests/png.cpp`], clanDisplay, [ *** Cannot find png (See http://www.libpng.org ) (Try libpng12-dev or better) ], [-lz -lpng])
+ CLANLIB_CHECK_LIB(jpeg, [`cat $srcdir/Setup/Tests/jpeg.cpp`], clanDisplay, [ *** Cannot find jpeg (See http://www.ijg.org ) (Try libjpeg62-dev or better) ], [ -ljpeg])
+- CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net ) (Try libfreetype6-dev or better) ], [`freetype-config --libs` ], [ `freetype-config --cflags`])
++ CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net ) (Try libfreetype6-dev or better) ], [`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`])
+
+ dnl Optional linux/joystick.h
+ AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)