Add stdbool patch. Thanks to JoseJX (Joseph Jezak) for the patch.

Package-Manager: portage-2.2.0_alpha32/cvs/Linux x86_64

4 files changed, 46 insertions, 7 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 1fd3c9f537f8..13d72fe0d54b 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.45 2011/04/05 17:41:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.46 2011/05/10 15:03:32 scarabeus Exp $
+
+  10 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> openjpeg-1.4-r1.ebuild,
+  +files/openjpeg-1.4-cmake-stdbool.patch:
+  Add stdbool patch. Thanks to JoseJX (Joseph Jezak) for the patch.
 
   05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> openjpeg-1.4-r1.ebuild,
   +files/openjpeg-1.4-libpng15.patch:
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index d3f32f0f02c4..dc9838f47c32 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -8,6 +8,7 @@ AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0
 AUX openjpeg-1.3-darwin.patch 1176 RMD160 b05ce81dfecfa41f15a4f70041a3fa04c70926cb SHA1 49b47307bc11334010c23082ccedc56fd8ba085d SHA256 f23683a40a73745ab1a1914ff75f4bd6da3aaccaeef088cf8c8a9ac6f6673a62
 AUX openjpeg-1.3-freebsd.patch 672 RMD160 b368524439bd11d3c68bc6e2b4aa129c08e7dd5a SHA1 8d51276c8d1ade2a7fe8ff76937d87c69daa7e51 SHA256 ea7113fbe3cdc2bc3d9199b266824be74f3556025a512c0cd2435797aa385809
 AUX openjpeg-1.3-r3-codec-Makefile 520 RMD160 c531f8b8d7bbd3b24606e52ad1d3cb32c485e08e SHA1 91fa1601c45549a4b6a4f7953339033afdc91a7f SHA256 4e9e389ad7cc05d41df63f0e4cb4a6fc5d107a02933dae14a40a5f788d9460cf
+AUX openjpeg-1.4-cmake-stdbool.patch 1317 RMD160 fca6d38a19d66701808414c30abfd7dff0ad0024 SHA1 8f3964e8b0d6700bfcde3389730667d6e9e0203c SHA256 8e3d68216d392ad2529c00aeca9c30189911e52b44a02b159109b72bccd9a469
 AUX openjpeg-1.4-libpng15.patch 524 RMD160 1f7828677ce4dee97a42a5d412341624ceee3790 SHA1 2f168a0ecfefcec5bc7b0bd59f9064fdd104b266 SHA256 12ed8c1108fc0592f6d007db08c8c374725ef36f52c3cd76f2b378b2ffbae25a
 AUX openjpeg-1.4-linking.patch 595 RMD160 6177609274bd222c2a73c4f56db0b234306c5b20 SHA1 41fbd01354e004f2333a8f4cc74ee5847e9340f8 SHA256 cc79c403d8c9530fe753c5f9cf58d4ab8f95935cf88e02edfe31c98f445b3d0a
 AUX openjpeg-1.4-pkgconfig.patch 1573 RMD160 9de432a117e36ca80c493a50708053010f39b374 SHA1 f755e6aa220c0f107c13a46398aafe60b7189b01 SHA256 f026fc520583943dc5b079d3838fe61d230862cd7e7622a0dd3720427b5de594
@@ -16,13 +17,13 @@ DIST openjpeg_v1_4_sources_r697.tgz 2365447 RMD160 c0d88c4a312651bac17d50bd6917e
 EBUILD openjpeg-1.3-r2.ebuild 1377 RMD160 fdcd0f029eb7a6928b0466422a4f4a164cafb0ba SHA1 31fa28b2a3bab59a12c8051901a6efd05c4d6a51 SHA256 71c074f8d020d6cb61db8a8c0fc31ccf891c991d72ec8f30aa1009df46128be4
 EBUILD openjpeg-1.3-r3.ebuild 1611 RMD160 9e9441319088983dfe7c5d68598c199940c22bdb SHA1 db31174ea977d7b0cbc747a4e1de07da952b7a15 SHA256 7eaea3ee9cb6c7fb436f67b41a0d6c7760aba6cef185ad7faf14b10ee93babdf
 EBUILD openjpeg-1.3.ebuild 1219 RMD160 5e7b3d3a7c6d589caf0817ba98400960e99b7afa SHA1 f31d8abaa4b7c6904da50d345ec61d5ebe5c44e7 SHA256 579e8185a32741b71355f8aa86252f714eee7fcc89f0640eb0a65f8fb7ecf080
-EBUILD openjpeg-1.4-r1.ebuild 1372 RMD160 e1c401af397ecee8b177494a0f246ca07860d195 SHA1 c99f206608e55f2d3f502cfe1aaf8c1f3ea13843 SHA256 a32f28284d81192bee5740143896fc879e130ea02dda28ada1856515960386ea
-MISC ChangeLog 6469 RMD160 bc8f5200d4b49763d8ea0dad91179ae58b548b26 SHA1 83ff25a0c737dcc14ba383d3f36c2d914df94b56 SHA256 7c09b528d9471202e82bd20f060ab7d82bbcfc6d549b04bee23e2bf2a7099f41
+EBUILD openjpeg-1.4-r1.ebuild 1412 RMD160 7365a0bfc2d7cd1532cf1263f2b4fae28a411c56 SHA1 51bb80c94e6565290b2eec80be31903dda271aa0 SHA256 2229176ac1c5e04f2ada7cea5ca7ac5183b62e81346968b40aa1d0f871338e05
+MISC ChangeLog 6660 RMD160 b5d9bd5e6e144b3f757a05c1b9be5a33a82a06d7 SHA1 5e4819f903d9e3877ab839348f2c026fe42bf313 SHA256 d97a205d3bb586d64ce1b8c57a4f8f516647b670b43b1827223b8f1a4400d1da
 MISC metadata.xml 257 RMD160 80c1eb9046b53f99e237da460c933b844ccc7b63 SHA1 84398d153001807fcb12f140046c03c71f81afb3 SHA256 f59744ea0de26f01b0beefb513cb99989c8d295b37b738fbc7814a43ccfb9e59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2bU8EACgkQHB6c3gNBRYeVQQCdEPlgGY9ozSVu6yGy8QEeUqEC
-+bgAn2uihWMf6+/y1QEEb/WmT1UDArtL
-=Tbdl
+iEYEARECAAYFAk3JU84ACgkQHB6c3gNBRYfIFwCdEw6f3W+QzgnxOlin4xK/45Fu
+w5YAn0LzHGqRoz2AKGtstNKSmx8bUToY
+=0BVY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/files/openjpeg-1.4-cmake-stdbool.patch b/media-libs/openjpeg/files/openjpeg-1.4-cmake-stdbool.patch
new file mode 100644
index 000000000000..b1d874e074e7
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.4-cmake-stdbool.patch
@@ -0,0 +1,33 @@
+diff -Naur openjpeg_v1_4_sources_r697/libopenjpeg/openjpeg.h openjpeg_v1_4_sources_r697-patched/libopenjpeg/openjpeg.h
+--- openjpeg_v1_4_sources_r697/libopenjpeg/openjpeg.h	2011-01-02 13:14:45.000000000 -0500
++++ openjpeg_v1_4_sources_r697-patched/libopenjpeg/openjpeg.h	2011-05-10 01:35:25.000000000 -0400
+@@ -60,7 +60,7 @@
+ #endif /* !OPJ_STATIC || !_WIN32 */
+ 
+ #ifndef __cplusplus
+-#if defined(HAVE_STDBOOL_H)
++#if @HAVE_STDBOOL_H@
+ /*
+ The C language implementation does correctly provide the standard header
+ file "stdbool.h".
+diff -Naur openjpeg_v1_4_sources_r697/CMakeLists.txt openjpeg_v1_4_sources_r697-patched/CMakeLists.txt
+--- openjpeg_v1_4_sources_r697/CMakeLists.txt	2011-01-02 13:14:45.000000000 -0500
++++ openjpeg_v1_4_sources_r697-patched/CMakeLists.txt	2011-05-10 01:35:25.000000000 -0400
+@@ -296,6 +296,7 @@
+   FIND_FILE(HAVE_UNISTD_H unistd.h)
+   SET(HAS_UNISTD_H 1)
+ ENDIF()
++check_include_file(stdbool.h HAVE_STDBOOL_H)
+ #
+ # Does the system have png library installed ?
+ #
+@@ -364,4 +365,8 @@
+   "${OPENJPEG_BINARY_DIR}/opj_config.h"
+   @ONLY 
+ )
+-
++#
++# fix openjpeg.h
++FILE(READ "${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.h" ojh)
++STRING(REGEX REPLACE "\@HAVE_STDBOOL_H\@" "${HAVE_STDBOOL_H}" ojhfixed "${ojh}" )
++FILE(WRITE "${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.h" "${ojhfixed}" )
diff --git a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild b/media-libs/openjpeg/openjpeg-1.4-r1.ebuild
index 6c15e7447ef5..37ffb414498b 100644
--- a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.2 2011/04/05 17:41:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.3 2011/05/10 15:03:32 scarabeus Exp $
 
 EAPI=4
 
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-libpng15.patch"
 	"${FILESDIR}/${P}-linking.patch"
 	"${FILESDIR}/${P}-pkgconfig.patch"
+	"${FILESDIR}/${P}-cmake-stdbool.patch"
 )
 
 src_prepare() {