From 244d0b4f420532e090e0572e124d4971dc536867 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Fri, 2 Jan 2015 17:19:10 +0000 Subject: Build with jpeg-9 Bug #520884 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x0145142D --- games-action/openclonk/ChangeLog | 9 +++++-- games-action/openclonk/Manifest | 28 +++++++--------------- .../openclonk/files/openclonk-5.3.3-jpeg9.patch | 20 ++++++++++++++++ .../openclonk/files/openclonk-5.5.1-jpeg9.patch | 20 ++++++++++++++++ games-action/openclonk/openclonk-5.3.3-r1.ebuild | 7 +++--- games-action/openclonk/openclonk-5.5.1.ebuild | 5 ++-- 6 files changed, 63 insertions(+), 26 deletions(-) create mode 100644 games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch create mode 100644 games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch (limited to 'games-action') diff --git a/games-action/openclonk/ChangeLog b/games-action/openclonk/ChangeLog index ca730533b213..85f6a74b36dc 100644 --- a/games-action/openclonk/ChangeLog +++ b/games-action/openclonk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-action/openclonk -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.19 2014/11/25 23:05:01 hasufell Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.20 2015/01/02 17:19:01 tupone Exp $ + + 02 Jan 2015; Tupone Alfredo openclonk-5.3.3-r1.ebuild, + openclonk-5.5.1.ebuild, +files/openclonk-5.3.3-jpeg9.patch, + +files/openclonk-5.5.1-jpeg9.patch: + Build with jpeg-9 Bug #520884 by flameeyes@gentoo.org 25 Nov 2014; Julian Ospald metadata.xml: drop maintainership diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest index 0fb7a38abb21..2fa0a199e36f 100644 --- a/games-action/openclonk/Manifest +++ b/games-action/openclonk/Manifest @@ -1,34 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX openclonk-5.3.3-jpeg9.patch 672 SHA256 2adabbc3c0985ffdfbd60e782f22fd0b0b752a9c741a410e398f966f0749dc79 SHA512 03538847c2ef262a728b85a83fb052581c850f2a57ff7068e61a6aee0538efb73a6d1963c970585ae2535268306da949fa93a74fe06bd097a5f7cc1f4c0ea7ab WHIRLPOOL 841ac17f6e089e1076c967cc4e765c6054a63c2abc1df5d460091a30a30bb0421b14acc442c4ab08bb6cc266f3f1427c7640963d0458fb1bdb358f564d080b38 AUX openclonk-5.3.3-xrandr-primary-output.patch 1119 SHA256 d312008f038a6aca9281c3de1c45806b5104e0107ed6ba8455a7125cb0784233 SHA512 d075bcb847899508245f074178ae420681099e92711db236aec4fee5b9a64c24a701f84cc71955eeff1b6e2eb18ed39d2ac48ef3ee4bf4aff5d45f99a95d565e WHIRLPOOL 9a129f0c6091949e5eee0eb77362429c4fcb123a3c55c80de0b6f063cca125b06f2d0cfd5a0b29d9b959cd70e58b4339635d4de6ba322fc8655416f9bfdc4376 +AUX openclonk-5.5.1-jpeg9.patch 672 SHA256 389cdd8405635f55219c2c1194acd39e2b8738b2b2b913c51f6ced70d626e4e4 SHA512 b77ead25e74f369118fc75cfbdc4f47e6a23c26ea7da29a1cba8e205ea1552c550e3c565fe3d8c13bbc3537a7bad20ce02ce333362a5d3c38c67e18c772bd93c WHIRLPOOL 5e62d640534a039432c6fa576db3424cff37deb49b0f744e1963dbba3a5eeddf75475b2c3254c5f590890771ac93109ae1c9f355deb68062be98403e8dfb3093 AUX openclonk-5.5.1-paths.patch 2569 SHA256 271a3d42c6393fea5beee7c236ac0d0546f698933556bd6bea8171edad9dbd62 SHA512 1facd9960c926b2a00f4c6e27d9c96b3bc731c4f65004ca85af47697d3d54949ec64c6972cf4e478eedc59b21f5a10b4b6ab61e2e48ea425fea6ab32e61611d0 WHIRLPOOL d333e53948c776aafb5507e49cb22ebf3bb01d40d8545c8c17781ab2af44ff57dbd36e933753b29a1d1076dc8e6b3c38c4d6637300899cef2ea7f926f5c78675 AUX openclonk-5.5.1-tinyxml-shared.patch 650 SHA256 88423d09b8ccafd2f8ad9ef8a1faaab02fef8ff6ff577b071adfd45d1af2c4b7 SHA512 106e3f63eebf55a55af7591da5cfe4278a16a438e97b9288188d735c31efe709bb03f83047d49f109839f7e56cc036d7a479eda513cb8e70dd3cb91006844ade WHIRLPOOL 798902abebd55fd436a560ebd1a405f7bf1c95c1116fb052d8eaf7853bfb73f2cdfd53910a920348e01e2f337cb27fcfebb31ca2093f0e37162d5d0de92310c0 AUX openclonk-wrapper-script.sh 229 SHA256 96fbef61769c0b4950dfde6d35648f9f5b2d9261c4b99687cfc02c24635ed939 SHA512 d31a2ffa6dbb014cfe3761d5a8b52b33f6b658cda317d0f7fc91ad8cc869fd93c486f9808da9ebe03e75255b7b2fedc2ef6c4f6372f1dce0575771ae9471a8a3 WHIRLPOOL 5395e432dab01140abcedcbf49573094bf13269b15fc7a1758a6c00258e1246560c1f50ae658fe27ef2cf579633debb4ed8efcd64d028bc9be2e2fb9603112d0 DIST openclonk-5.3.3.tar.xz 46516448 SHA256 e6352a695ccb1f7905b2e3014b229e25a9660e82f2a96696521862efaa163abe SHA512 2351b2ec8d3931a05c7f8a4c7ca9ef0285535b1a15da0b02de9046139806211ed64fe3b08a56c3d1712aad07e0a6eea0074ff47d9dbaa874605a788f4c3ab100 WHIRLPOOL 6cc87894b2ab03de35c42fcd3e617f82b66ac06ccdb2ad167a67a0d14ad22fecc048d2d3f2504a5c96efe94103830bcf2f0deaa7a535bea66fb115f12aab4e82 DIST openclonk-5.5.1-src.tar.bz2 65383438 SHA256 c038d6dc2ef9a3d7966b18ba6147b9dd136f353dfaa5796455f9917b79255743 SHA512 eb111a1f19e2373e6999850dddafa9a5653694904f470690ef39300e4cc3105f0394637e7dbea0a4cff9d91dd30b04f9037252eb0e8830966696f01f6424b977 WHIRLPOOL 990e90ff0daf9aa9dc4826ff621f0647089a68b5ba7d798a4d6cd5ef5d9ec78a666ae897241a6d556f90110f6739206fb09ebc2bc6c9558df65ee67dba0ea8af DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13 -EBUILD openclonk-5.3.3-r1.ebuild 2387 SHA256 b94bd7a8c29c63d1b4c1fba71516ea118bdfa98861a7f6bd2f5a88756d472727 SHA512 38c685b25652c8112c003ef6e19c5b59b970fa689d538fe4fe553211f8d7adb3934a82edbc62db92370a3c2f7d78879db64be7b529c036ba5ca4517323e26d59 WHIRLPOOL f012b189d59027c8cee7f4cb84ecfd74faf935e8e7fea460fd57897e1dbbb3cc0052de8d2df86cacc4abbe5b9a2a61c48bd2dd2d19f0ccb9bcd20245bde88526 +EBUILD openclonk-5.3.3-r1.ebuild 2420 SHA256 fca4fa351d54597f1b54f50bb42aeb8a3e3419b3f9e42d0a6d6ccaadf598e231 SHA512 0ce0792f66bc12549d07f41f19af3bee4a8c77eeb3cac0965a50947a2ea237865f1949c3e1a308ba919b7f1aea97aa7a7afbf86f5a1c4455b3813b05bc3e176b WHIRLPOOL 38f8688ba711fe1bc1af689ab9d8484b3063ae26ee19680d7d51b87ccddd2210ab14bfddd5b42836cd4227f3a5d5ab07b4f57f6eb871a6b70475cc3730e4ba73 EBUILD openclonk-5.3.3.ebuild 2323 SHA256 7c09d1a5e17bf56608f5583df677b954c4ecaa1836bf93552d52015694b769b9 SHA512 0445e8eaae5622c0ada8e8ca0282cdb9b30541021be8bce429025cdb5443c87678fbfc64b694a96d36ff9833cde0b0a5cf4cba288cc127143d039612628bfd6a WHIRLPOOL 1236da7bfbe7224d61252f128116c31fca748050216834f80d7a90bbdc72feb0670fc69bdaa1f9e1311b06eee5c67ca39ad753051d2aa29ea2cacd087a757235 -EBUILD openclonk-5.5.1.ebuild 2560 SHA256 7b2af462bbbaea40d2007b93de6bc3bdefe42f1b4ab5f0f7adc166696390dc48 SHA512 08c2b353c6c368a4686bc23e96a326f2ec3375f4e67a078cd33c5c561157ab3ea4ef52b669b43e184e840fa6b4577d502991da4a0067c2966d558a9dd7eb3802 WHIRLPOOL 4f8e1e275ca07b24216bb015c1af32b437fabf9362d7caa2ef068b3331772387be2d8b65fadde61ffb0edadead89ae4f5890c978bb807c5f29f1801851c475a5 -MISC ChangeLog 2739 SHA256 84ecc249df1970f9ddaf751187135b401d61d059e6f2c8986e12cc10df0c259d SHA512 a27067716902abeb994901a36e1a2816f5c2582ba37d78bf18466ac2bf7bd10caf5569a51ba18410b2547e1d88f838c617005e914a905b59804fd09146dc8c36 WHIRLPOOL 61fd89cb56efdd422b4e6e51ec4f99392e5cbc0b82a3b348c664235629a143a41a56fe5c71af435da2928090046e71f9164d7cd243e7fad2fb86f855745ba0a5 +EBUILD openclonk-5.5.1.ebuild 2590 SHA256 9a54fd1c39828ad66ddc1e79c2b22631aea031518db4420423d6bfbe67311f64 SHA512 bc354cfb853f582074d4301750bdd8ac336ac9db9b654e6bfbc6851e3f44c303136b4c52e25b5030a6e8296476665418058a69eb3175deec2d4d31b9d5c9fc15 WHIRLPOOL c0c0c338ebb3d801fda78cfaa2a38593dcdceb0f014a837145c13acff75da7f8396de9d8f2e79d1685d93c444ff5a13ebbf329e2eba9770610703ca0f15a2119 +MISC ChangeLog 2971 SHA256 67b8f024b029d7cbe1cb7035f1f1b11d29f4dec32379512569436c3fb284215c SHA512 c24cc5d49fac2917ac3045a8e812046a80663300b3b58857c8a6c89b233dc3d4612600b10b9f0ee99f76b0966176764d9dc86990cbfd3b4ed43f7680484340bd WHIRLPOOL 8d390167fab065376ef93edf3e044d646ec5b4b1c66a517d75f321d5ea39f59a72e4d005fc24d35f3f2fdf8f2b8a08970913b3973e8a745d9838488b002814c3 MISC metadata.xml 934 SHA256 e26486ffd4c1c770d4864dc432b9a9b8d16e2b52186d9b8b8f3b419308e3e77a SHA512 94ea0f91051b8299ec4ce75de61c3f33b73ca410a7c62413ae7e99f152922f893f365a929724faacc7885be7b57dfda670a2cc67c7b2036f8aefe56d5790378f WHIRLPOOL ba91749dd0ca1379f028e770245ac78248cd0ffd0a9307405bb812d479a5ef906f1b0c62ecffff3a8d41ba11a6a88b072de529a394acb3dd199965759defb4ba -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCABmBQJUdQsdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgWvEP/1Yfh6Lrmh8wKSqglJqEKc6t -ZpxdRyyWSxDNraCwMYq3QhbNIQGmepelsXa2klgvd2fcC2C6ZFNh6IS8Bhb4/8OK -QUI/i5f1ItxvB3p+OweaV3hER/30f5QmCm6t5UL3mnGopXiEURFp1mtw2G8MECI7 -5vZnd49OZUmiSJ1i+jRyVwLefY909bgJAW9nsaMvlZFnK5Z2F/7TFWWQOGY8AIzI -E49cMZtsoW9bMTrPUi+9QQzelnCL/9dllFTIRCeVM0tAHMSwYHhlrBPjuJbScoqj -LysxRUOJrRrLgfBiYSGlP68i9Wk2DFCS2pguKdtU0D4Gy7yM3s0/q0c5CBBWH63k -OQMl06q3wgan159VMju6jwrbmi3CedE8/D2caIN25KPQ7GC3I3YPdhIiVdb27dda -xrexCSoFWGdiMWFKaGPegSgU6OO0J3YoQlzrJMbB0ecHJqOjhmk4EZOQ3c7A8Dby -+O1cpr6rKQ2UEbih+dCJRIZCVVc/irltqKpIgTE4suFXkB8TVJkj3e6NpY7iv+m0 -LF/TVrJVBVIvoGML6tRBiSwUqoIa9jUNTvMioQh8i+uRO0oPfiZR9JFdHnNycNvv -krNxWpvD7fkFxOnpfkFoPIfayu8dgfaFi6kyC3oWXiwAOwj3RH1LmRC+gPP//ibt -ojozn5hF7PwAi1q9OLWZ -=2nKv +iEYEAREIAAYFAlSm0woACgkQIY77eQFFFC1fnQCg64vNFvavwCSzvUP1xo2GrUa7 +hWsAn1LTckG7TvTkv8fMEg+ilXay3dbV +=C2Op -----END PGP SIGNATURE----- diff --git a/games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch b/games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch new file mode 100644 index 000000000000..7d0de49892eb --- /dev/null +++ b/games-action/openclonk/files/openclonk-5.3.3-jpeg9.patch @@ -0,0 +1,20 @@ +--- src/graphics/C4SurfaceLoaders.cpp.old 2015-01-02 17:31:30.976182860 +0100 ++++ src/graphics/C4SurfaceLoaders.cpp 2015-01-02 17:31:56.488698202 +0100 +@@ -306,7 +306,7 @@ + // The doc says to give fake end-of-inputs if there is no more data + cinfo->src->next_input_byte = &end_of_input; + cinfo->src->bytes_in_buffer = 1; +- return true; ++ return (boolean)true; + } + static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) + { +@@ -357,7 +357,7 @@ + blub.term_source = jpeg_noop; + + // a missing image is an error +- jpeg_read_header(&cinfo, true); ++ jpeg_read_header(&cinfo, (boolean)true); + + // Let libjpeg convert for us + cinfo.out_color_space = JCS_RGB; diff --git a/games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch b/games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch new file mode 100644 index 000000000000..161258604e6b --- /dev/null +++ b/games-action/openclonk/files/openclonk-5.5.1-jpeg9.patch @@ -0,0 +1,20 @@ +--- src/graphics/C4SurfaceLoaders.cpp.old 2015-01-02 18:01:35.768676874 +0100 ++++ src/graphics/C4SurfaceLoaders.cpp 2015-01-02 18:02:17.705896683 +0100 +@@ -303,7 +303,7 @@ + // The doc says to give fake end-of-inputs if there is no more data + cinfo->src->next_input_byte = &end_of_input; + cinfo->src->bytes_in_buffer = 1; +- return true; ++ return (boolean)true; + } + static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) + { +@@ -354,7 +354,7 @@ + blub.term_source = jpeg_noop; + + // a missing image is an error +- jpeg_read_header(&cinfo, true); ++ jpeg_read_header(&cinfo, (boolean)true); + + // Let libjpeg convert for us + cinfo.out_color_space = JCS_RGB; diff --git a/games-action/openclonk/openclonk-5.3.3-r1.ebuild b/games-action/openclonk/openclonk-5.3.3-r1.ebuild index a1e028695968..a3c424a61a0c 100644 --- a/games-action/openclonk/openclonk-5.3.3-r1.ebuild +++ b/games-action/openclonk/openclonk-5.3.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3-r1.ebuild,v 1.4 2014/07/04 19:29:48 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3-r1.ebuild,v 1.5 2015/01/02 17:19:01 tupone Exp $ EAPI=5 @@ -62,7 +62,8 @@ src_prepare() { -e '/dist_doc_DATA/s#licenses/LGPL.txt ##' \ -i Makefile.am || die - epatch "${FILESDIR}"/${P}-xrandr-primary-output.patch + epatch "${FILESDIR}"/${P}-xrandr-primary-output.patch \ + "${FILESDIR}"/${P}-jpeg9.patch eautoreconf } diff --git a/games-action/openclonk/openclonk-5.5.1.ebuild b/games-action/openclonk/openclonk-5.5.1.ebuild index 7f3bb2f97309..036f88956080 100644 --- a/games-action/openclonk/openclonk-5.5.1.ebuild +++ b/games-action/openclonk/openclonk-5.5.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.5.1.ebuild,v 1.1 2014/10/10 19:18:22 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.5.1.ebuild,v 1.2 2015/01/02 17:19:01 tupone Exp $ # FIXME: does not compile with gtk+3 @@ -56,6 +56,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-tinyxml-shared.patch "${FILESDIR}"/${P}-paths.patch + "${FILESDIR}"/${P}-jpeg9.patch ) S=${WORKDIR}/${PN}-release-${PV}-src -- cgit v1.2.3-65-gdbad