diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libmng/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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 */ + |