diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-libs/libmng/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-libs/libmng/files')
| -rw-r--r-- | media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch | 39 | ||||
| -rw-r--r-- | media-libs/libmng/files/libmng-2.0.2-stdio.patch | 14 |
2 files changed, 53 insertions, 0 deletions
diff --git a/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch new file mode 100644 index 000000000000..adb12c2d4a7f --- /dev/null +++ b/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/520906 + +This kludge is unnecessary with jpeg-9a and is in fact breaking the build... + +libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function) +libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function) +libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function) + +...because jmorecfg.h of jpeg-9a has this: + +#ifndef HAVE_BOOLEAN +#if defined FALSE || defined TRUE || defined QGLOBAL_H +/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */ +typedef int boolean; +#ifndef FALSE /* in case these macros already exist */ +#define FALSE 0 /* values of boolean */ +#endif +#ifndef TRUE +#define TRUE 1 +#endif +#else +typedef enum { FALSE = 0, TRUE = 1 } boolean; +#endif +#endif + +--- libmng_types.h ++++ libmng_types.h +@@ -199,11 +199,6 @@ + #undef FAR /* possibly defined by zlib or lcms */ + #endif + #define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */ +-/* There has been a change in jpeg-9 : */ +-#ifndef _WIN32 +-#define HAVE_BOOLEAN +-typedef int boolean; +-#endif + #include <stdio.h> + #include <jpeglib.h> + #endif /* MNG_INCLUDE_IJG6B */ diff --git a/media-libs/libmng/files/libmng-2.0.2-stdio.patch b/media-libs/libmng/files/libmng-2.0.2-stdio.patch new file mode 100644 index 000000000000..0a906d4c2f35 --- /dev/null +++ b/media-libs/libmng/files/libmng-2.0.2-stdio.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/499480 + +Patch is from ArchLinux git libmng-2.0.2-3 + +--- libmng_types.h ++++ libmng_types.h +@@ -204,6 +204,7 @@ + #define HAVE_BOOLEAN + typedef int boolean; + #endif ++#include <stdio.h> + #include <jpeglib.h> + #endif /* MNG_INCLUDE_IJG6B */ + |