summaryrefslogtreecommitdiff
path: root/dev-games/clanlib
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-games/clanlib
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-games/clanlib')
-rw-r--r--dev-games/clanlib/Manifest18
-rw-r--r--dev-games/clanlib/clanlib-2.3.7-r1.ebuild6
-rw-r--r--dev-games/clanlib/clanlib-4.0.0.ebuild7
-rw-r--r--dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch2
-rw-r--r--dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch15
-rw-r--r--dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch4
-rw-r--r--dev-games/clanlib/files/clanlib-0.8.1-llvm.patch8
-rw-r--r--dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch5
-rw-r--r--dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch2
-rw-r--r--dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch8
10 files changed, 30 insertions, 45 deletions
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index b32d270ed708..cf18803b85b5 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,20 +1,20 @@
-AUX clanlib-0.8.1-docbuilder.patch 764 BLAKE2B 18821bbc3f6752630e5bb585700f7fe018ffee361fe684ed9bb86e6d030c5ffe73a6f8a6ab8d1f61265a980a8ceebbfcb6c15f6305507ec17c8060e5df0cfb73 SHA512 b6dc912ec15dc533e792245d621a5c649f0d8965426417e671f71f3cb0e0a3b35481fc99450f2493150eb98b04f8891fcd6d23f9ad47089d2de1d19685764db8
+AUX clanlib-0.8.1-docbuilder.patch 637 BLAKE2B 50f6129c45f3df138cf66623c694dcbc40a4f743aced2a12a67251a55b1b85848d4f1528110256b20d9cd71d72a573955f75e0b571e836a1cca5b0ef1a7beb76 SHA512 b2ba0c2aff53a7e1d858cac820e3caff37c1ce1b9dea850565f6283fbc72e08ed416459a188a5ddb267f6afd4635066a3e727234c4ad854db92c65f13fb7f6b7
AUX clanlib-0.8.1-gcc43.patch 613 BLAKE2B 9b8a6506567e150aacde3138b0ff017fe80094bc89c29f7455259d8259408a13674fd5879ac94a1b5a826f781351917b94f1b8033ff8974a2aef30e92fd4ff14 SHA512 c3ab438da1a171998942a492a770c05b15d1963a0fd46621a64db48bcd0fd631096327e7a3c4254be98035ea54aa8a1b44680dd6ba2a46e1f239aad243960515
-AUX clanlib-0.8.1-gcc44.patch 1523 BLAKE2B d2e25975439249a139c7cef3af824e16bf28c138e467fbfd6f91576ed6ed89bdabd656de1a32ff91f6d5630612cb51c63e50016784fe7db9ff8c1f3158d4df7a SHA512 7c3b154affede758a0ac93f5c142144e8a26c65b7c50a443b49633e0c2835fdfab90c6363d4b1997bfb53b0112bc16ca12abc44aacf7af927329e102fc1424b7
-AUX clanlib-0.8.1-gcc47.patch 338 BLAKE2B c49f079043b1d77b3de13d2d4c1f1a8fbc9ddccc61f612940106007b2a594c808e6406e5bd3e9fed62e75608aced3569d4fab08fc629b678e8f8cf8571620402 SHA512 08f9719c97e0bf5fab83e56a881ac7a3edd162b052b5e8fea5878badedbf266b36788f77afd93032f4129ea8e50a83046f5672675e6616cdb29cb6fc5b6c635a
+AUX clanlib-0.8.1-gcc44.patch 872 BLAKE2B 0d7086bc769951c09860459dcae267d6420f73d5e9c54e2b72fc27ec69a90d495cc955e673dd0499db9d409894522397a6b8dd5b1a2fd641ba51bad646c18a0c SHA512 352df0077ea1a31bb3347183672c26695d7eb6c746f2d6b093c952dc580ac92242868002d657b03b926163fca5b2e4df55585878ada2a2afe76510797f14225b
+AUX clanlib-0.8.1-gcc47.patch 261 BLAKE2B be606aa95e870d13db792749900c0e038e4bbfa3b4c804fa95f7f58cde3f0b422cf2b66533378f850edd9e8580039cba268b42cf532126393ba33bd0117ba1b7 SHA512 ddb40224609e57fa441e31e4cd1f4df9dfd5709ebd061535f9f7290513f1d6c0812a8ba98b698bd1c680a7de925fd2a7e22852afcb3a23b31250515fd541e8d7
AUX clanlib-0.8.1-gcc6.patch 530 BLAKE2B f076e15e0061aad13da8f608ed966f7929a2e71a00f0dd10822d42fcd28af33350494ad4273f80cba7d29dc51b96215c9483638239a8ce7910994a174f1b4932 SHA512 94a49f2aed8487fb03b97219802fd4b525b1de304d1dd3fcc9f7ccc392d5385438005c8198e3db8ec666f4fc875860159fbac94e5d90626c8aaf8730d3831f72
AUX clanlib-0.8.1-libpng15.patch 381 BLAKE2B 4f928698bd0121d6a1c4475b4aa58ae00a1146004f3273440fc257cc324d9ab26841247e0241ad2b6016162692136906131d5dc5f3730aab3b52783a95ba154c SHA512 2b54b5c5094de33582292fa84572fb826668f48cf6e6f82c4fa978db888fbc2ea379a08951e2084ab6eb1d3f2007d19aa00940d2760fa5bee973f6181a0ba804
-AUX clanlib-0.8.1-llvm.patch 4757 BLAKE2B 202620971918ca0e1b89c11994fcf8f2b20d64ce6d4a91ff2775ce3e497b38b0d50cd2015fad92b19459c6093610b94d89d1cf6280271d46c1bf53c7dc5ea8c8 SHA512 31364f8ff89242adba096e2aa87dca3d6434d3c670262a211078e8bb33d06efcd842f4ff9db97c3369ed5f6ff1a75463e04a63edf42ac7d3c06bb5f449a5d7b8
-AUX clanlib-0.8.1-ndebug.patch 793 BLAKE2B ed6fa14d47a30c8aab53456e90e652d004519fae04c7cfe78be36924448e6c2daf7ed999f3a529b8a7fa68e1f0b6192cdba65f499dca6c3a761aa8b8453d138e SHA512 c2ad3ef0a7f3281ba7e862460217eae536332ecc67e7d3ec5dcc883615d0e9eeb9b4b1def7bc745c1a7cb816070571f1930774c8913f3d45a5292ae6bbdf17a7
+AUX clanlib-0.8.1-llvm.patch 4301 BLAKE2B c1472ca77f985da747c84e20ebc60b401f7d3178e96cbfb0d81adf5039ce1c8917743dcdc2d35e613243d59c9b8a5bdf1ebba3f76108c738d9b21b34348f06f5 SHA512 277901f40ee7bc16327378f5895382b7249c0d0f0c0084605357966b7f4a665dcf1147dd95b65753ba33f126f58027364289f9540bf0711b20fc4887d0016e6a
+AUX clanlib-0.8.1-ndebug.patch 553 BLAKE2B 3ad0629f0598a3d9191dafb596aece7aa5f40db99bc959e13bcd4bdd9082483988fca49d3ebd22812eef1502d7bd5eb2b831707ee4f5f2abe7270ef9f1b94a11 SHA512 dcda9fdf32861c05b37ed71194d7ca595fe07c85e754016324fce9fcf668cb4042d071c68c4019234faac4a116ae4877d457374fc11fc74be148e132fdee7cce
AUX clanlib-2.3.7-autotools.patch 1458 BLAKE2B ecf797fa09893422b94364ac0df8156b3e2c3b2164530cd845201ad266977426b692860efce1b2cf6f6dee0cb098c6e28e8c3e203567c81713f63fc6099c30a9 SHA512 170580de7780e638e3a1788eb2bfcfe58f64d5f5695cbbd550ddc5bf59933303dea7970191792adefc8b1408647d4e3c816c30aaf253a9ceb139f9300b9e5807
AUX clanlib-2.3.7-doc.patch 434 BLAKE2B e17cedc12f9b840231dae739edb933a6c8dffaac7feb53e4d4ce2639603e6ce03e716476bfa3b75f964aa1799676f18f19dfc09f3fa918d40b66519878f78904 SHA512 993edfcf9955bf89c6458933b1db9b4cdf6b3935f856c71aa82c3f9ad0f9a2d3704657fa8bd6f6760262a0f8d0669998f7c1ab426ecee7c57954f5674a24f8e4
-AUX clanlib-2.3.7-freetype_pkgconfig.patch 1063 BLAKE2B b42fd1ab157843a2de9276cb96c8abc7e98806239e36771ec680c5c6c7398477c06a7d323c14cf7a08d98c1ec15ebaae89bc7ab4573b0df67b44724cdf65c26f SHA512 b403fceb6e55a11b28ccb40386706e3b30c7062a1b0fefb67ebefd1f36f977b36a449a594367e372a31c4d997171c7ca05a82170791f068edbf7a6cd67ad2593
+AUX clanlib-2.3.7-freetype_pkgconfig.patch 1069 BLAKE2B 48fe4d540a9dd5cce20efcea7802b45b13d8e56831abcf1f1d9aef9aa747dc40e4209a1a37f061b4162459619e8174fbba18963c3c3acb4b0457642c1a9a6142 SHA512 db151e1b5a07f01890ec0a164a3a82217f5a0f47fa6c15f566991965feedae50b69e99d801f04d1ca7583a6192e1d0f4766d66a0cbcca6278c03713ae7837233
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
+AUX clanlib-4.0.0-freetype_pkgconfig.patch 1101 BLAKE2B 07d6ad6d64998fced66fd3954a9e402f2d9a46d761b31e064806e7ffe8d0e4a2d62707fbad4a17920acba0332618b018387db815fb53424a9e13eb721fb8bfb6 SHA512 07760b7cb52e3a467498ddecf014cec1c8252524389bd25adc923a8704f70a2f5907b121bc299273ddfbe79eb124dfca23af8c023f546b5936e66310498a8587
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-r1.ebuild 2252 BLAKE2B 5d04c8d1291f961c1567ae34cb9f148fe6993cc6a4c1694b3beaa454082248276eb0eda6edecfdddd704a57e98b0395cc49b38011c0fa71ea5f1fcfea1feb75b SHA512 380c236592632dcdd1b8743390678b72fa3420f0cfb92c001645fe73fc8ba5cee4fbb3437e69c81241a88181a2587d0813fbaee01b0439ea01bb694d63d8fb4b
-EBUILD clanlib-2.3.7-r1.ebuild 2123 BLAKE2B 2641ee84fc7400f8c9227f849179746101e0cb8751fba9d92f2b1a4cb0d042e06363b0af1d8bfca821367d37007b4279656ceddcf5f0ae12b04118c266f03ac4 SHA512 1ba8e97e83bd0e5029d27a0be7157e2479edf0f7d985ce55539ba5770128598b74e29deb0583e2cf3c76471c9850fbe11b5498a6bd6dbb987f84817779d896c9
-EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
+EBUILD clanlib-2.3.7-r1.ebuild 2149 BLAKE2B 5fb4ed60cb8ef0e0d10c4d3048bb05573019afce36129e09e680ae017604a78b950f80e6e8bbe95542a136099f059d272a3971eb18b7c74e99bbe03226eeef71 SHA512 abbbd82e4474b76c6bb3fb957f59599ac916276959ae30c42a5c53471aa67f51b76c80f5cb443fe29358f91c66197cce39ddca4ca7880fd5a9f27a7a67b34b0c
+EBUILD clanlib-4.0.0.ebuild 1604 BLAKE2B d7caae80e28aa0f4d40b34b5407282230c621a494d0bffe1739886dfd0e24966d1a5d73ac6a3bf64a8fcd3bc40ca60c936c2c81e1ddbd107d961e957e2c380eb SHA512 b73e467cea5bea574e53a74b125b96da408944ef2006ef3a31a044780ccbcd3d754362fdc138d7d153210b7722beb87ba0a9dceaf78c383d0ed383639f024b67
MISC metadata.xml 3096 BLAKE2B 2424f96e26408b05e8cc272dabf45ea1b865207364eee064fdf7132f6293629e69864779011d5cac55a42671ca0adae6f34e09209b636d2ad224f413de4c5ee5 SHA512 bb84df024ebfc5f59ef035537b8f2d19c3b7e7cf2b9c832fed8a973062807a95671bdbd2ce76529d8d424d664c9b37ad79e0839248d6099f8ba237f0d49cb76a
diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
index b0eac87e66dc..de31fc373c2b 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
@@ -3,10 +3,10 @@
EAPI=7
-inherit autotools flag-o-matic
+inherit autotools toolchain-funcs
MY_P=ClanLib-${PV}
-DESCRIPTION="multi-platform game development library"
+DESCRIPTION="Multi-platform game development library"
HOMEPAGE="http://www.clanlib.org/"
SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
S="${WORKDIR}"/${MY_P}
@@ -83,6 +83,8 @@ src_configure() {
|| use mikmod \
|| myeconfargs+=( --disable-clanSound )
+ tc-export PKG_CONFIG
+
econf "${myeconfargs[@]}"
}
diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild b/dev-games/clanlib/clanlib-4.0.0.ebuild
index cc7115a38348..26eea39ba088 100644
--- a/dev-games/clanlib/clanlib-4.0.0.ebuild
+++ b/dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -1,9 +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 autotools
+inherit autotools toolchain-funcs
MY_PN=ClanLib
@@ -60,6 +60,9 @@ src_configure() {
$(use_enable ipv6 getaddr)
$(use_enable static-libs static)
)
+
+ tc-export PKG_CONFIG
+
econf "${myeconfargs[@]}"
}
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch b/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch
index 18752b9e0fbd..f5a35763c48d 100644
--- a/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch
+++ b/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch
@@ -1,5 +1,3 @@
-diff --git a/Documentation/Utilities/webbuilder.pl.in b/Documentation/Utilities/webbuilder.pl.in
-index ea9de63..c000432 100644
--- a/Documentation/Utilities/webbuilder.pl.in
+++ b/Documentation/Utilities/webbuilder.pl.in
@@ -68,11 +68,7 @@ sub convert
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
index ddf5a170b027..0851074bddcb 100644
--- a/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
@@ -1,6 +1,5 @@
-diff -Naur ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp
---- ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp 2009-08-01 18:15:44.000000000 +0200
-+++ ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp 2009-08-01 18:08:55.000000000 +0200
+--- a/Sources/GL/canvas_opengl.cpp
++++ b/Sources/GL/canvas_opengl.cpp
@@ -48,6 +48,7 @@
#include "graphic_context_opengl.h"
#include "surface_target_opengl.h"
@@ -9,9 +8,8 @@ diff -Naur ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp ClanLib-0.8.1/Sources/
/////////////////////////////////////////////////////////////////////////////
// CL_Canvas_OpenGL construction:
-diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp
---- ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp 2009-08-01 18:17:25.000000000 +0200
-+++ ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp 2009-08-01 18:11:23.000000000 +0200
+--- a/Sources/GL/GLX/input_device_linuxevent.cpp
++++ b/Sources/GL/GLX/input_device_linuxevent.cpp
@@ -35,6 +35,7 @@
#include <iostream>
#include <errno.h>
@@ -20,9 +18,8 @@ diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp ClanLib-
#include "API/Core/System/error.h"
#include "API/Core/System/clanstring.h"
-diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_xinput.cpp ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp
---- ClanLib-0.8.1-old/Sources/GL/GLX/input_device_xinput.cpp 2009-08-01 18:17:41.000000000 +0200
-+++ ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp 2009-08-01 18:12:56.000000000 +0200
+--- a/Sources/GL/GLX/input_device_xinput.cpp
++++ b/Sources/GL/GLX/input_device_xinput.cpp
@@ -29,6 +29,7 @@
#include <iostream>
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch
index 19ebab6fd07d..db9b90ff9d23 100644
--- a/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch
@@ -1,5 +1,5 @@
---- ./Sources/Core/IOData/Generic/inputsource_file.cpp.orig 2012-12-30 01:49:01.698950614 +0400
-+++ ./Sources/Core/IOData/Generic/inputsource_file.cpp 2012-12-30 01:49:27.714977456 +0400
+--- a/Sources/Core/IOData/Generic/inputsource_file.cpp
++++ b/Sources/Core/IOData/Generic/inputsource_file.cpp
@@ -32,6 +32,7 @@
#ifdef WIN32
#include <direct.h>
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch b/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch
index b1455149a321..63f9a1415423 100644
--- a/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch
+++ b/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch
@@ -1,5 +1,3 @@
-diff --git a/Sources/Display/graphic_context.cpp b/Sources/Display/graphic_context.cpp
-index 42545ea..52220e2 100644
--- a/Sources/Display/graphic_context.cpp
+++ b/Sources/Display/graphic_context.cpp
@@ -237,18 +237,18 @@ void CL_GraphicContext::fill_triangle(
@@ -33,8 +31,6 @@ index 42545ea..52220e2 100644
params.count = 1;
params.vertices = vertice_array;
-diff --git a/Sources/GL/graphic_context_opengl.cpp b/Sources/GL/graphic_context_opengl.cpp
-index 78bc87d..68da072 100644
--- a/Sources/GL/graphic_context_opengl.cpp
+++ b/Sources/GL/graphic_context_opengl.cpp
@@ -355,8 +355,8 @@ void CL_GraphicContext_OpenGL::draw_quad(const CL_Quad &quad, const CL_Color &co
@@ -59,8 +55,6 @@ index 78bc87d..68da072 100644
int tx[4] = { quad.x1, quad.x2, quad.x3, quad.x4 };
int ty[4] = { quad.y1, quad.y2, quad.y3, quad.y4 };
-diff --git a/Sources/SDL/graphic_context_sdl.cpp b/Sources/SDL/graphic_context_sdl.cpp
-index 8093e03..c15b399 100644
--- a/Sources/SDL/graphic_context_sdl.cpp
+++ b/Sources/SDL/graphic_context_sdl.cpp
@@ -410,7 +410,7 @@ void CL_GraphicContext_SDL::update_cliprect()
@@ -72,8 +66,6 @@ index 8093e03..c15b399 100644
SDL_SetClipRect(SDL_GetVideoSurface(),&crect);
}
}
-diff --git a/Sources/SDL/surface_sdl.cpp b/Sources/SDL/surface_sdl.cpp
-index ff6e36f..532db84 100644
--- a/Sources/SDL/surface_sdl.cpp
+++ b/Sources/SDL/surface_sdl.cpp
@@ -259,13 +259,13 @@ void CL_Surface_SDL::draw(
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch b/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
index 4a9a4a08582b..b9a891e99a7a 100644
--- a/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
+++ b/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
@@ -8,9 +8,8 @@ rather than a debug version is built (-DNDEBUG).
This patch adds the missing declaration, thus make the
file compile with or without -DNDEBUG.
-diff -Naur clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp
---- a/Sources/Core/System/Unix/init_linux.cpp 2003-09-19 10:33:02.000000000 +0000
-+++ b/Sources/Core/System/Unix/init_linux.cpp 2007-10-26 13:36:39.000000000 +0000
+--- a/Sources/Core/System/Unix/init_linux.cpp
++++ b/Sources/Core/System/Unix/init_linux.cpp
@@ -52,6 +52,7 @@
_begin_time = (long) tv.tv_sec*(long) 1000+(long) tv.tv_usec/(long) 1000;
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
index d10a3b0085ad..cadb3b90b530 100644
--- a/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
+++ b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
@@ -7,7 +7,7 @@ https://bugs.gentoo.org/764902
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`])
++ 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)
diff --git a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
index 34759a8d89d9..1dbb11d07c1d 100644
--- a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
+++ b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
@@ -5,12 +5,6 @@ Subject: [PATCH] Use pkg-config to find freetype.
As of freetype-2.9.1 the freetype-config file no longer gets installed
by default.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6b9def916..c97e959f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,7 +307,7 @@ echo ""
@@ -18,7 +12,7 @@ index 6b9def916..c97e959f7 100644
echo "Checking for clanDisplay stuff"
echo "=============================="
- CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/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/Unix/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`])
++ CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/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, has_linux_joystick=yes)