diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-libs/sge | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-libs/sge')
| -rw-r--r-- | media-libs/sge/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/sge/files/sge-030809-freetype_pkgconfig.patch | 10 | ||||
| -rw-r--r-- | media-libs/sge/sge-030809.ebuild | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest index afe9a6bba455..71c3b1390893 100644 --- a/media-libs/sge/Manifest +++ b/media-libs/sge/Manifest @@ -1,7 +1,7 @@ AUX sge-030809-build.patch 3874 BLAKE2B a01040b011494cdada26c22c163b7f478a59f762bb736370e0ca695ac02248e97ec640b30fb67592a51fd1229d5c8360525a74e9cb3fd8eeac2fcdc466b4cb58 SHA512 d685efed24604339013099deca3846bf1b5547a7518eeecdc36d36cee41a914f9f8d10d0880fbfe7f936ff3538396eff22bded91be553315bf57c6c126cca6a8 AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91775af03e6d37e324b879176c838487b9537fa1aed9582258285ee80921a834a7b911df80b9ee06049cf435 SHA512 adf9018c09c8e2581d1693cee28224b65c605f95a8df333ab9f50fe14668b501d1e3ce39b91b43216f67f1d107c167b77be8aa28a9025b95ec8ea025e9d6a43e AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a -AUX sge-030809-freetype_pkgconfig.patch 708 BLAKE2B afbbf5b8e6bc7c3404d822464b3b99056bb12c639f61b52285f41acc460d6f6f8826b1511f6147b7a2ece90f28512c9fce8e8695f9d84ae68b4f8b00108a0ef0 SHA512 cd17e10e43ebccca33b876203417aae4fd40d8c0cfda616ee29620cefe4c028fcaccb55adb61902755b8704110291105bb4fd7985a70261065d0bc4ded4c9581 +AUX sge-030809-freetype_pkgconfig.patch 701 BLAKE2B 036fbfbfdf76f8460b0b82d9abbf29c1ae0e20d7d779fa21925be9def41ebb9cc6d34a2b050b7b4b3b843ef3a4589e65636dc43d42699d2bee084d41598dd22e SHA512 9925452ea57a581869c7bd0d27af1bcb440a4e5a6fdd93084ca1c7cefecb9d78d2805a11d2b725fcedaeaf4e9f84f0efa093aee018b59ec34e7c00bf80f73b77 DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb -EBUILD sge-030809.ebuild 1315 BLAKE2B d6c88b708608c60471486e36e8801f6b6a30051b80329ce9c1c9520fca056704f5d96c4520948236f5842b1aa0b2efcb3a25a7190c84f5967c5330c71e6362c2 SHA512 35bbbe4607507d23ae23a0b36ff0367919404dfcf1997d5800d10fdb82d33887f7ce0f1cb826f77c72dfe5cd5076d8ceddf5ed218dae43b6a1bd7e2ecc1072c8 +EBUILD sge-030809.ebuild 1315 BLAKE2B 1927382db509ba4d0c39bf9856c2d613c3b465bdbb79e7682f7b0575adcc425c4178a6ddd0c3c68dd623a9247f3a4113201695c70d0c713d8e7bf42febcf42e4 SHA512 f09f1973d8e2df0cdf4a0928a5b8b91533b0f25286f04bb4addf783fb3da828bed86bbbec9a2bf89d43478156b0ffdd49317610b200eeec52dfa1a6cce023381 MISC metadata.xml 331 BLAKE2B 0d4e5d5cb7ea39a3404a3b0708d61022a77962c30767cfd801f923749bb5ad2211d6d4ed26e9ada97dbb045cf16542e774b2327bd7d0505df33b3a4333733570 SHA512 65e4d002bc5d040804fd5b43a1b33e89cc8404d1048fea0459a55dc9aca010135ac0944d57282ebf09ccc5d7d8125728a963d08c45837aca4fc92565a77a8ae6 diff --git a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch index ceb478f3d828..738f4e2aeaa8 100644 --- a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch +++ b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch @@ -1,7 +1,7 @@ https://bugs.gentoo.org/655798 ---- sge030809/Makefile.conf -+++ sge030809/Makefile.conf +--- a/Makefile.conf ++++ b/Makefile.conf @@ -35,16 +35,16 @@ SGE_LIBS =$(shell sdl-config --libs) -lstdc++ @@ -9,7 +9,7 @@ https://bugs.gentoo.org/655798 -# Is freetype-config available? -HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) +# Is freetype available? -+HAVE_FT =$(shell if pkg-config --exists freetype2 ; then echo "y"; else echo "n"; fi;) ++HAVE_FT =$(shell if ${PKG_CONFIG} --exists freetype2 ; then echo "y"; else echo "n"; fi;) ifeq ($(HAVE_FT),n) USE_FT = n endif @@ -18,8 +18,8 @@ https://bugs.gentoo.org/655798 USE_FT = y - SGE_LIBS +=$(shell freetype-config --libs) - FT_CFLAGS =$(shell freetype-config --cflags) -+ SGE_LIBS +=$(shell pkg-config --libs freetype2) -+ FT_CFLAGS =$(shell pkg-config --cflags freetype2) ++ SGE_LIBS +=$(shell ${PKG_CONFIG} --libs freetype2) ++ FT_CFLAGS =$(shell ${PKG_CONFIG} --cflags freetype2) endif diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild index b3eb1819a16f..a84e9aa3238f 100644 --- a/media-libs/sge/sge-030809.ebuild +++ b/media-libs/sge/sge-030809.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib toolchain-funcs + +inherit toolchain-funcs MY_P="sge${PV}" DESCRIPTION="Graphics extensions library for SDL" @@ -38,7 +39,7 @@ src_prepare() { -e '/^CXX=/d' \ -e '/^AR=/d' \ Makefile.conf || die - tc-export CC CXX AR + tc-export CC CXX AR PKG_CONFIG # make sure the header gets regenerated everytime rm -f sge_config.h } |