diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-26 02:00:48 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-26 02:00:48 +0000 |
commit | 403335d7014372971e9e9267493a808d08bab48e (patch) | |
tree | ffd28ddc69e6fe6543b018a00c9fad058bdda027 /media-libs/netpbm | |
parent | 7f0b7329b3aa78ea82792fdf68ab48415fe4cc35 (diff) |
gentoo auto-resync : 26:11:2024 - 02:00:48
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r-- | media-libs/netpbm/Manifest | 8 | ||||
-rw-r--r-- | media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch | 245 | ||||
-rw-r--r-- | media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch | 14 | ||||
-rw-r--r-- | media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch | 241 | ||||
-rw-r--r-- | media-libs/netpbm/netpbm-11.2.11-r1.ebuild | 267 | ||||
-rw-r--r-- | media-libs/netpbm/netpbm-11.8.2.ebuild (renamed from media-libs/netpbm/netpbm-11.8.1-r1.ebuild) | 2 |
6 files changed, 759 insertions, 18 deletions
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 94c40c1aee11..d908a51b4924 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -2,13 +2,15 @@ AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb78 AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de +AUX netpbm-11.2.11-fix-C23.patch 8937 BLAKE2B 7cfa15d6df66cdd4b24ae4874721acccf455b2b23fb2cd27aa1184a28d73e4d08eabc4d06f81a41d6eccaec2abe6683d2a7b4e05a143634cc64d84b2f83810b4 SHA512 c39dac81014fe235185e1ae884db6c0571c1dec744e108b1701b685ef4ba58d3c373b7223ae6b8f79b79e44bd162caa8f55ad3119fc40f7027914c919ddab354 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68 AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb AUX netpbm-11.7.2-lto.patch 2699 BLAKE2B 51da4abfa35da594597eb1091f8f3ade875491d428231215f91ff3d637826db6310f2c8f7bf59cb62d025cde170dc247fadedd90dedc5049f68f61d02adbfc0e SHA512 809d1b86d436534219936959037e5c4c17761b4c0e464eb968fdc961f68d5a3d2a60974f52e330fa49b8933aa1bfc486515e019b2bc0d15bbc525b9c4f852eb2 -AUX netpbm-11.8.1-fix-C23.patch 254 BLAKE2B 09c5385c80634990452030bc78f826b11e02d33bc2aba30c4ea0d822e776d6cdec00086fe64a863f9e324c017b0f02d8fa95a34933e2d639ac7f0ebfd7b4945b SHA512 e511958a4cd7ef63f53ddde2e6414b143f767d1e2a36a70ef953693a35aea3f13cb9749800927ce7c34029814872690779b0d2d2cbed72bf543c01bbee2863bf +AUX netpbm-11.8.2-fix-C23.patch 8158 BLAKE2B e8e170768b1237d45fec73323d45e550c78525d424223dbe8be301a93704d9356e34859bdb729ee472055255be2e55db45dc80794330c93d88a2608fad55fc44 SHA512 7f7b6971154f0fd7de439ee9fb4e634e43c091ab998f919248df601cfab4edcc5869aaef29997a3dabe0b7fabcfd2d3c366397bbd9d432e49915b18f3110437e DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b -DIST netpbm-11.8.1.tar.xz 3804004 BLAKE2B ed107d258a85c720de178a3e6488ad1b435135ec50227bb1e4ce9f3665a882a382c3a3e858e49055f88ee9bba6026b390291ad211a82299d03f41addaf93e7f9 SHA512 e4b1e8d7468fcd0233e50861e890669c788f95924edb6b6256f93b53d2ab16b7fd2c2099ca238b409fba7c764e51d54a9fbdbb22bb3bb1acf8296afdb807bd4f +DIST netpbm-11.8.2.tar.xz 3804800 BLAKE2B 9b5bb460c2fbe73495cbb304ea0e1a2a4406838cbb4d0769d2b8147f9ee6156d93852ad36a5ea57a7437b9a1a3cc9f102271163bc4d6bbd004c42c7f81be2318 SHA512 b048b242891cbe56851b3da342de1717e1ab435a327b4eeebb83023e2e7ae57ae66a232df344b4d2b0fb12bc6abcf13d9cec392f19ff06951023ee4c002f9f17 +EBUILD netpbm-11.2.11-r1.ebuild 7195 BLAKE2B 348cd2b6b2b314a6a148dff591373235e3418ba73079fcc221b54cb3c332c0eea3530bc779cdc40c502d20c46f1d73bf656162c4a1d13f5a3b9b8f71ea95ee94 SHA512 617b8cf4c0835a8a3ba5040c40ea5f67550185df54c214d26da687f651d9a3f1b61d409528282ef882010da5938bb2a6cec64897ffe2388711e0613daec86493 EBUILD netpbm-11.2.11.ebuild 7143 BLAKE2B bd8f69323411bddb85369e36b71da318c608639fd5fd3c4fcb5b4955913f488ad3639419ace4ec4cb0e03ac37551ec24134873a2710c31462225e46a47c4d5fd SHA512 1f9bdf04b95e57811e48b31c827ef3fa3c2234c63efd47ef37415900f71e6891f43c230f05a7a62716614662a30765c38ca39c8e621ccd1bff04bd35f30b0f71 -EBUILD netpbm-11.8.1-r1.ebuild 6982 BLAKE2B 675a317ba642fa765bc72cedfc182ea2e762f1f16c9b09be872bfabf153c673f125a79fdbf1be73c3328b9a026270426c450964aa2b1767b4305d97bce212d77 SHA512 ee3cab4f276c6fac1c92fd916c4923a77c61b4274f9bbb5cf8e244ee86725fb24e9d8947dff7684c4a4de03d5c6e65328f302ed6747e9b2618013d3bb90d390a +EBUILD netpbm-11.8.2.ebuild 6982 BLAKE2B d714317350614a99edcae927edc381a0b6b72e232b5ab9352348c9773790d86bb97196244f65bc5d82d3147dcd7a5b8cdbd4249dfae19aaccc4173ebc1acd7ac SHA512 c8863a65259b46bf5e379127ee2290259b79fa07da5d8b19a425e92543f9e718b8118f94de8ca7ac52c10bb0dfb8b4170a6fd76c7d8e355d3744e3cc2a788b8f EBUILD netpbm-9999.ebuild 6353 BLAKE2B 262f73572750cd90d0f8b7b631233c9b0dd9f7871b55b0284ade4c054cc43fd6390ea5fd7efdd7dab33598f21e221e7caa72b4f92ec46d343fb62948b1fd5e88 SHA512 2e7e4a3b03a85552e401cca78f5815a0bc80bf91e83346f6db29da4aec1a66d729174a28f43eec17c30f64a8ca7cdd117d8f0f831eddc47df9d70514f4d94402 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80 diff --git a/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch new file mode 100644 index 000000000000..8f4d82994564 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch @@ -0,0 +1,245 @@ +https://sourceforge.net/p/netpbm/code/4969/ +https://bugs.gentoo.org/943971 + +Backport files/netpbm-11.8.2-fix-C23.patch to 11.2.11 + +--- a/buildtools/libopt.c ++++ b/buildtools/libopt.c +@@ -85,18 +85,11 @@ + # define SHLIBPREFIXLIST "lib" + #endif + ++#include <stdbool.h> + #include <string.h> + #include <stdlib.h> + #include <stdio.h> + +-typedef unsigned char bool; +-#ifndef TRUE +-#define TRUE (1) +-#endif +-#ifndef FALSE +-#define FALSE (0) +-#endif +- + #ifdef DLLVERSTR + static const char * dllverstr = DLLVERSTR; + #else +@@ -105,9 +98,9 @@ static const char * dllverstr = ""; + + bool const explicit = + #ifdef EXPLICIT +-TRUE ++true + #else +-FALSE ++false + #endif + ; + +@@ -131,17 +124,17 @@ parse_prefixlist(const char * const prefixlist, + there is guaranteed always to be one null string at the end of the + array. + +- In case of error, return *errorP == TRUE and don't allocate any +- storage. Otherwise, return *errorP = FALSE. ++ In case of error, return *errorP == true and don't allocate any ++ storage. Otherwise, return *errorP = false. + -----------------------------------------------------------------------------*/ + char * prlist; + + prlist = strdup(prefixlist); + if (prlist == NULL) +- *errorP = TRUE; ++ *errorP = true; + else { +- if (strlen(prlist) <= 0) +- *errorP = TRUE; ++ if (strlen(prlist) <= 0) ++ *errorP = true; + else { + /* NOTE: Mac OS X, at least, does not have strtok_r(). + 2001.09.24 +@@ -155,18 +148,18 @@ parse_prefixlist(const char * const prefixlist, + } + num_tokens = 0; + token = strtok(prlist, " "); +- *errorP = FALSE; /* initial value */ ++ *errorP = false; /* initial value */ + while (token != NULL && num_tokens < MAX_PREFIXES && !*errorP) { + parsed_prefixes[num_tokens] = strdup (token); +- if (parsed_prefixes[num_tokens] == NULL) +- *errorP = TRUE; ++ if (parsed_prefixes[num_tokens] == NULL) ++ *errorP = true; + num_tokens++; + token = strtok(NULL, " "); + } + for (i = num_tokens; i < MAX_PREFIXES + 1 && !*errorP; i++) { + parsed_prefixes[i] = strdup(""); +- if (parsed_prefixes[i] == NULL) +- *errorP = TRUE; ++ if (parsed_prefixes[i] == NULL) ++ *errorP = true; + } + } + if (*errorP) { +@@ -194,7 +187,7 @@ parse_prefix(const char * const filename, + (The prefix always starts at the beginning of the filename). + + Iff we don't find a valid library name prefix, return *prefix_good_p +- == FALSE. ++ == false. + + The list of valid prefixes is compiled in as the blank-delimited + string which is the value of the SHLIBPREFIXLIST macro. +@@ -231,7 +224,7 @@ parse_prefix(const char * const filename, + i = 0; /* start with the first entry in shlibprefixlist[] */ + prefix_length = 0; /* initial value */ + prefix = shlibprefixlist[i]; +- prefix_good = FALSE; /* initial value */ ++ prefix_good = false; /* initial value */ + while ( (*prefix != '\0' ) && !prefix_good ) { + /* stop condition: shlibprefixlist has MAX_PREFIXES+1 entries. + * we only ever put tokens in the 0..MAX_PREFIXES-1 positions. +@@ -242,7 +235,7 @@ parse_prefix(const char * const filename, + */ + prefix_length = strlen(prefix); + if (strncmp(filename, prefix, prefix_length) == 0) { +- prefix_good = TRUE; ++ prefix_good = true; + /* at this point, prefix is pointing to the correct + * entry, and prefix_length has the correct value. + * When we bail out of the while loop because of the +@@ -279,16 +272,16 @@ parse_filename(const char * const filename, + + E.g. for "libxyz.so", return "xyz". + +- return *valid_library_p == TRUE iff 'filename' validly names a library ++ return *valid_library_p == true iff 'filename' validly names a library + that can be expressed in a -l linker option. + +- return *static_p == TRUE iff 'filename' indicates a static library. +- (but undefined if *valid_library_p != TRUE). ++ return *static_p == true iff 'filename' indicates a static library. ++ (but undefined if *valid_library_p != true). + +- return *error_p == TRUE iff some error such as out of memory prevents ++ return *error_p == true iff some error such as out of memory prevents + parsing. + +- Do not allocate any memory if *error_p == TRUE or *valid_library_p == FALSE. ++ Do not allocate any memory if *error_p == true or *valid_library_p == false. + -----------------------------------------------------------------------------*/ + char *lastdot; + /* Pointer to last period in 'filename'. Null if none */ +@@ -305,21 +298,21 @@ parse_filename(const char * const filename, + /* This filename doesn't have any suffix, so we don't understand + it as a library filename. + */ +- *valid_library_p = FALSE; +- *error_p = FALSE; ++ *valid_library_p = false; ++ *error_p = false; + } else { + unsigned int prefix_length; + bool prefix_good; + + if (strcmp(lastdot + 1, "a") == 0) +- *static_p = TRUE; ++ *static_p = true; + else +- *static_p = FALSE; ++ *static_p = false; + + parse_prefix(filename, &prefix_good, &prefix_length, error_p); + if (!*error_p) { + if (!prefix_good) { +- *valid_library_p = FALSE; ++ *valid_library_p = false; + } else { + /* Extract everything between <prefix> and "." as + the library name root. +@@ -328,7 +321,7 @@ parse_filename(const char * const filename, + + libname = strdup(filename + prefix_length); + if (libname == NULL) +- *error_p = TRUE; ++ *error_p = true; + else { + libname[lastdot - filename - prefix_length] = '\0'; + if (strlen(dllverstr) > 0) { +@@ -341,10 +334,10 @@ parse_filename(const char * const filename, + } + } + if (strlen(libname) == 0) { +- *valid_library_p = FALSE; ++ *valid_library_p = false; + strfree(libname); + } else +- *valid_library_p = TRUE; ++ *valid_library_p = true; + } + *libname_p = libname; + } +@@ -377,14 +370,14 @@ parse_filepath(const char * const filepath, + */ + *filename_p = strdup(filepath); + if (*filename_p == NULL) +- *error_p = TRUE; ++ *error_p = true; + else { + directory = strdup(""); + if (directory == NULL) { +- *error_p = TRUE; ++ *error_p = true; + strfree(*filename_p); + } else +- *error_p = FALSE; ++ *error_p = false; + } + } else { + /* Split the string at the slash we just found, into filename and +@@ -392,14 +385,14 @@ parse_filepath(const char * const filepath, + */ + *filename_p = strdup(lastslash+1); + if (*filename_p == NULL) +- *error_p = TRUE; ++ *error_p = true; + else { + directory = strdup(filepath); + if (directory == NULL) { +- *error_p = TRUE; ++ *error_p = true; + strfree(*filename_p); + } else { +- *error_p = FALSE; ++ *error_p = false; + directory[lastslash - filepath] = '\0'; + } + } +@@ -503,12 +496,12 @@ main(int argc, char **argv) { + char outputLine[1024]; + + strcpy(outputLine, ""); /* initial value */ +- runtime = FALSE; /* initial value */ +- error = FALSE; /* no error yet */ ++ runtime = false; /* initial value */ ++ error = false; /* no error yet */ + + for (arg = 1; arg < argc && !error; arg++) { + if (strcmp(argv[arg], "-runtime") == 0) +- runtime = TRUE; ++ runtime = true; + else if (strcmp(argv[arg], "-quiet") == 0) { + /* Doesn't do anything today */ + } else { +@@ -518,7 +511,7 @@ main(int argc, char **argv) { + if (!error) { + if (strlen(outputLine) + strlen(options) + 1 + 1 > + sizeof(outputLine)) +- error = TRUE; ++ error = true; + else { + strcat(outputLine, " "); + strcat(outputLine, options); diff --git a/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch deleted file mode 100644 index a749ec434d31..000000000000 --- a/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/943971 - ---- a/buildtools/libopt.c -+++ b/buildtools/libopt.c -@@ -89,7 +89,9 @@ - #include <stdlib.h> - #include <stdio.h> - -+#if __STDC_VERSION__ < 202311L - typedef unsigned char bool; -+#endif - #ifndef TRUE - #define TRUE (1) - #endif diff --git a/media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch new file mode 100644 index 000000000000..c6aaf0288261 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch @@ -0,0 +1,241 @@ +https://sourceforge.net/p/netpbm/code/4969/ +https://bugs.gentoo.org/943971 + +--- a/buildtools/libopt.c ++++ b/buildtools/libopt.c +@@ -85,18 +85,11 @@ + # define SHLIBPREFIXLIST "lib" + #endif + ++#include <stdbool.h> + #include <string.h> + #include <stdlib.h> + #include <stdio.h> + +-typedef unsigned char bool; +-#ifndef TRUE +-#define TRUE (1) +-#endif +-#ifndef FALSE +-#define FALSE (0) +-#endif +- + #ifdef DLLVERSTR + static const char * dllverstr = DLLVERSTR; + #else +@@ -105,9 +98,9 @@ + + bool const explicit = + #ifdef EXPLICIT +-TRUE ++true + #else +-FALSE ++false + #endif + ; + +@@ -132,17 +125,17 @@ + there is guaranteed always to be one null string at the end of the + array. + +- In case of error, return *errorP == TRUE and don't allocate any +- storage. Otherwise, return *errorP = FALSE. ++ In case of error, return *errorP == true and don't allocate any ++ storage. Otherwise, return *errorP = false. + -----------------------------------------------------------------------------*/ + char * prlist; + + prlist = strdup(prefixlist); + if (prlist == NULL) +- *errorP = TRUE; ++ *errorP = true; + else { + if (strlen(prlist) <= 0) +- *errorP = TRUE; ++ *errorP = true; + else { + /* NOTE: Mac OS X, at least, does not have strtok_r(). + 2001.09.24 +@@ -156,11 +149,11 @@ + } + num_tokens = 0; + token = strtok(prlist, " "); +- *errorP = FALSE; /* initial value */ ++ *errorP = false; /* initial value */ + while (token != NULL && num_tokens < MAX_PREFIXES && !*errorP) { + parsed_prefixes[num_tokens] = strdup (token); + if (parsed_prefixes[num_tokens] == NULL) +- *errorP = TRUE; ++ *errorP = true; + num_tokens++; + token = strtok(NULL, " "); + } +@@ -167,7 +160,7 @@ + for (i = num_tokens; i < MAX_PREFIXES + 1 && !*errorP; i++) { + parsed_prefixes[i] = strdup(""); + if (parsed_prefixes[i] == NULL) +- *errorP = TRUE; ++ *errorP = true; + } + } + if (*errorP) { +@@ -195,7 +188,7 @@ + (The prefix always starts at the beginning of the filename). + + Iff we don't find a valid library name prefix, return *prefix_good_p +- == FALSE. ++ == false. + + The list of valid prefixes is compiled in as the blank-delimited + string which is the value of the SHLIBPREFIXLIST macro. +@@ -232,7 +225,7 @@ + i = 0; /* start with the first entry in shlibprefixlist[] */ + prefix_length = 0; /* initial value */ + prefix = shlibprefixlist[i]; +- prefix_good = FALSE; /* initial value */ ++ prefix_good = false; /* initial value */ + while ( (*prefix != '\0' ) && !prefix_good ) { + /* stop condition: shlibprefixlist has MAX_PREFIXES+1 entries. + * we only ever put tokens in the 0..MAX_PREFIXES-1 positions. +@@ -243,7 +236,7 @@ + */ + prefix_length = strlen(prefix); + if (strncmp(filename, prefix, prefix_length) == 0) { +- prefix_good = TRUE; ++ prefix_good = true; + /* at this point, prefix is pointing to the correct + * entry, and prefix_length has the correct value. + * When we bail out of the while loop because of the +@@ -280,16 +273,16 @@ + + E.g. for "libxyz.so", return "xyz". + +- return *valid_library_p == TRUE iff 'filename' validly names a library ++ return *valid_library_p == true iff 'filename' validly names a library + that can be expressed in a -l linker option. + +- return *static_p == TRUE iff 'filename' indicates a static library. +- (but undefined if *valid_library_p != TRUE). ++ return *static_p == true iff 'filename' indicates a static library. ++ (but undefined if *valid_library_p != true). + +- return *error_p == TRUE iff some error such as out of memory prevents ++ return *error_p == true iff some error such as out of memory prevents + parsing. + +- Do not allocate any memory if *error_p == TRUE or *valid_library_p == FALSE. ++ Do not allocate any memory if *error_p == true or *valid_library_p == false. + -----------------------------------------------------------------------------*/ + char *lastdot; + /* Pointer to last period in 'filename'. Null if none */ +@@ -306,21 +299,21 @@ + /* This filename doesn't have any suffix, so we don't understand + it as a library filename. + */ +- *valid_library_p = FALSE; +- *error_p = FALSE; ++ *valid_library_p = false; ++ *error_p = false; + } else { + unsigned int prefix_length; + bool prefix_good; + + if (strcmp(lastdot + 1, "a") == 0) +- *static_p = TRUE; ++ *static_p = true; + else +- *static_p = FALSE; ++ *static_p = false; + + parse_prefix(filename, &prefix_good, &prefix_length, error_p); + if (!*error_p) { + if (!prefix_good) { +- *valid_library_p = FALSE; ++ *valid_library_p = false; + } else { + /* Extract everything between <prefix> and "." as + the library name root. +@@ -329,7 +322,7 @@ + + libname = strdup(filename + prefix_length); + if (libname == NULL) +- *error_p = TRUE; ++ *error_p = true; + else { + libname[lastdot - filename - prefix_length] = '\0'; + if (strlen(dllverstr) > 0) { +@@ -342,10 +335,10 @@ + } + } + if (strlen(libname) == 0) { +- *valid_library_p = FALSE; ++ *valid_library_p = false; + strfree(libname); + } else +- *valid_library_p = TRUE; ++ *valid_library_p = true; + } + *libname_p = libname; + } +@@ -378,14 +371,14 @@ + */ + *filename_p = strdup(filepath); + if (*filename_p == NULL) +- *error_p = TRUE; ++ *error_p = true; + else { + directory = strdup(""); + if (directory == NULL) { +- *error_p = TRUE; ++ *error_p = true; + strfree(*filename_p); + } else +- *error_p = FALSE; ++ *error_p = false; + } + } else { + /* Split the string at the slash we just found, into filename and +@@ -393,14 +386,14 @@ + */ + *filename_p = strdup(lastslash+1); + if (*filename_p == NULL) +- *error_p = TRUE; ++ *error_p = true; + else { + directory = strdup(filepath); + if (directory == NULL) { +- *error_p = TRUE; ++ *error_p = true; + strfree(*filename_p); + } else { +- *error_p = FALSE; ++ *error_p = false; + directory[lastslash - filepath] = '\0'; + } + } +@@ -504,12 +497,12 @@ + char outputLine[1024]; + + strcpy(outputLine, ""); /* initial value */ +- runtime = FALSE; /* initial value */ +- error = FALSE; /* no error yet */ ++ runtime = false; /* initial value */ ++ error = false; /* no error yet */ + + for (arg = 1; arg < argc && !error; arg++) { + if (strcmp(argv[arg], "-runtime") == 0) +- runtime = TRUE; ++ runtime = true; + else if (strcmp(argv[arg], "-quiet") == 0) { + /* Doesn't do anything today */ + } else { +@@ -519,7 +512,7 @@ + if (!error) { + if (strlen(outputLine) + strlen(options) + 1 + 1 > + sizeof(outputLine)) +- error = TRUE; ++ error = true; + else { + strcat(outputLine, " "); + strcat(outputLine, options); diff --git a/media-libs/netpbm/netpbm-11.2.11-r1.ebuild b/media-libs/netpbm/netpbm-11.2.11-r1.ebuild new file mode 100644 index 000000000000..2dda088e9c41 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.2.11-r1.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +# Upstream has 3 flavors of netpbm: super stable, stable and advanced. +# They only provide a tarball for super stable, but super stable is a bit lagging. +# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" +# and the advanced branch of their svn (currently versions 11.8.yy) on SLOT "0/advanced". +# The stable branch is stabilized according to usual Gentoo rules, while the +# advanced branch will not be stabilized. +# A detailed explanation is here https://netpbm.sourceforge.net/release.html + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" + +LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" +SLOT="0/stable" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" + +# app-text/ghostscript-gpl is really needed for postscript +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch + "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch + "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch + "${FILESDIR}"/netpbm-11.7.2-lto.patch + "${FILESDIR}"/netpbm-11.2.11-fix-C23.patch +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # fix typo in a test + sed -i \ + -e 's:^o#! /bin/sh:#! /bin/sh:' \ + test/stdin-ppm3.test || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed -i \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + converter/other/Makefile generator/Makefile || die + sed -i -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + test/Test-Order || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + sed -i \ + '2iexit 80' \ + test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # the new postscript test needs +x + chmod +x test/lps-roundtrip.test || die + + # Do not test png if not built + if ! use png ; then + sed -i -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + + sed -i -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + test/legacy-names.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/legacy-names.ok || die + sed -i \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + test/Test-Order || die + fi + + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl + # ppmpat-random is broken on musl + # bug #907295 + if use elibc_musl; then + sed \ + -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ + -e 's:ppmpat-random.*::' \ + -i test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY Netpbm.programming USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/netpbm/netpbm-11.8.1-r1.ebuild b/media-libs/netpbm/netpbm-11.8.2.ebuild index 3626f909bb88..98f2becc519a 100644 --- a/media-libs/netpbm/netpbm-11.8.1-r1.ebuild +++ b/media-libs/netpbm/netpbm-11.8.2.ebuild @@ -59,7 +59,7 @@ PATCHES=( "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch "${FILESDIR}"/netpbm-11.7.2-lto.patch - "${FILESDIR}"/netpbm-11.8.1-fix-C23.patch + "${FILESDIR}"/netpbm-11.8.2-fix-C23.patch ) netpbm_libtype() { |