diff options
Diffstat (limited to 'media-libs/urt')
-rw-r--r-- | media-libs/urt/Manifest | 11 | ||||
-rw-r--r-- | media-libs/urt/files/gentoo-config | 53 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-compile-updates.patch | 141 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch | 96 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-librle-toolchain.patch | 60 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-make.patch | 75 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-r2-build-fixes.patch | 139 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-rle-fixes.patch | 203 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-solaris.patch | 14 | ||||
-rw-r--r-- | media-libs/urt/files/urt-3.1b-tempfile.patch | 19 | ||||
-rw-r--r-- | media-libs/urt/urt-3.1b-r3.ebuild | 99 |
11 files changed, 0 insertions, 910 deletions
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest index 21364aece6f3..05af18565e7e 100644 --- a/media-libs/urt/Manifest +++ b/media-libs/urt/Manifest @@ -1,16 +1,5 @@ -AUX gentoo-config 989 BLAKE2B cbf31d5d55ba2e104c2e757baac3d6cc097fe19e4950de41d11a5f61de83ce159b1c6b438bb05824eb1dc04d0cee6f7f001b00abf7cf859fd0df30cf25dda132 SHA512 bfd38aeb08f26b158dd1127c33bc858f5e59cda0b3aecf79d2283391018201b35ccac051309662ae11df46241fc30461923e2d542d4fa2580e3dc6f8c8d91f6d -AUX urt-3.1b-compile-updates.patch 3441 BLAKE2B f3c09e7bbd8f19c9ebe949c0f030e017e84f7d4ff73d6c5e160e709d63b95dc05be6a8b8ee4ab75027192ff7c8d1850e8e8599ec2f7efc773b9af691bde01677 SHA512 aec58e4065cafeded2de5adb7c679867f7144bfc501d03a9dd8d9d65f8dcf380360f2365a1a117a933882888c17917b76e2aafe72283a363b7ebe29f1b2d698c -AUX urt-3.1b-implicit-function-declarations.patch 1840 BLAKE2B 00c019eacc36814c0ddf8b709c510538ee2c8829498c37b899b0b107371bb09dc6e098231eab3e3384a825df4a48392d56a5286a74c1a8a409df7eb8f6754070 SHA512 91474bbfa13a9d5249ed8eeafbc3291447f97a39a085cab4b0bccd48658b41bf4e9c534b466a410aa9b91418a7bbc85dcd13a50770313747f8edfe0d00e0e137 -AUX urt-3.1b-librle-toolchain.patch 1491 BLAKE2B 6fcdae4a255cb2ab7ee9dd6a2ad7e5dde6d5b42647029ea892d67e0171c7b299dabe352f0bc920eeb09f617d1840f8c9a7ff0138b9457036853f63f2fb2ac459 SHA512 49dbf6d00e27c1bbd7f25d14427219e55c1c7fb49d209d5c940118113dfb911c57d3ccf8488182e06f9cb34224defe54fc5fa64a1e04f53746e9afd04ce65503 -AUX urt-3.1b-make.patch 2455 BLAKE2B 9709fdbb29f33326f3006d0205cf7885cdf737fb18a9fab0daa98fcf39be3c69de1cb5558416d0b661099511993a1121b53f28ea1a45daff2774f50a3be76afb SHA512 44b4463fb9b63e5a0c9af3f574ff523138117f7e0b5012e4bbd5c7b3119797f812410da7909d22dce914017bc3e704ea830307d63f908b4c508b48fff8d8898a -AUX urt-3.1b-r2-build-fixes.patch 4888 BLAKE2B 0bb2dba64a62429df650652937712a7a51e5839af8565bab393f2d4df9d240e31872aeb7a113af0f85117036dafe600a486d3c7ad3f5debef2f7307c0fb0650a SHA512 698594422160f4f5102f7dd45cab479e981d753d68801862dc90a2c84e174d8bacc08afa650b3a1c54aefd0d73d358830f396cd2a3b682c1bdf3b64bdf922ae3 -AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48dd8a5bf1c879d2000df202beaa134a6d1aad538de4f9333e7c78010f27c55e227e332cef2dd232f84c834527d0c SHA512 b5a05d2ee083ee35105346fd7d0aa9e0f36c98f709abaa40e354adf858480c90793cfebfbd0a6214e832454c446828d50baedbc9767e7bc742209c9e86d0b030 -AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84 -AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f AUX urt-3.2_rc1_p20250101-ar.patch 967 BLAKE2B 659fbfb052eb039e5c098c214491a1ddc74e9e63352aba92c62bb6ab0589c6f45236d0511f9fcfeb71a7123ba9e8d06cc71ba2937067f2b99f1dd6044008d58f SHA512 ccac18ebbe8b70ade62cc1cd9ac2985aeb3695d0b6b7b5863a6b8fdae04bee27bc49da48cc56029cbdeb973fb3d4ecf024c9b4eb9923bdc49851089ab625b8f0 AUX urt-3.2_rc1_p20250101-respect-ldflags.patch 372 BLAKE2B 7d520c7e59f9e8fe9c9e445f32a4a9691b1e96e6579f471838d3c8ae10c5d98d84a0f3e5992ff0d0a91dc5c9f133568f2f88e23ad18316d969bfca4a3fd91cde SHA512 ba3cce51a80a023843bb95fa096ea3230d74363076ff8e38fe5991e6affafe0aaa2d9bffe6de2863a554551810bf0fa07a2f752ceee2c404de14088ac93c56d5 -DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d DIST urt-3.2_rc1_p20250101.tar.gz 1079866 BLAKE2B 519760a11b10d1cad1d2f9ba6b0de3918000ad9a6fa0a3edbf0382d8bdf99248aa12e89aec09bbe134db0138f8eb1326bad06a9c6ad581766b5f45bee3152989 SHA512 347fabddc2ff14f9313d2ed2ad7902b0fdc2108e1cb0d472f4040c2ab42c171360be390833359d813ad03bf4ea94537fe481a1bd5facfd9b72b2178622771e66 -EBUILD urt-3.1b-r3.ebuild 2365 BLAKE2B 9e04a0253611de38a45a5ccc2879c9ef37f949431df1187d9543e0887260e32ff3578557d1ffdea0174932ef1a827e5e727e3d0bbd4731ae7822ffc6c5b682be SHA512 cfeb7898d007d4c9e2f1b5b67432c08af4baf19a18bbe7861b6d7d16af32357c92da223fb9145dee3eda045f07af792edfaf3bf088ccbeb50d88b1f6e2d843b0 EBUILD urt-3.2_rc1_p20250101.ebuild 1957 BLAKE2B 6beec849f978faebe3948e3df0f4d578520a7faf0946e8ec104d11e08b10bae6b31c308b4c2fec500ad8e3137b6a88d6108c4b88af3fee74779c34532c09dfa1 SHA512 b76abf200ddd422f3d51943b053b6ce426724db44234964645803480a27bcc62b42f02da03425f1d1812347e9e03885377cdd04dad66c58f2b571e8611dc5291 MISC metadata.xml 301 BLAKE2B dd6601ae6f8bcdd95c8cdde5da28f782689b737212887167ed671341b6bc09b5c7d36fff3cd1e83089e76645ca1d4a35b245358cce07c832fff8a9e2c6a288d3 SHA512 82b0ef3316b221ed81fe24d67105bd55e2a7d86da73ae441b0d71f15ff297dff77ddc727e135fde511b4639170f1411f4e43286913abb3b1b3e06284fd46fdfc diff --git a/media-libs/urt/files/gentoo-config b/media-libs/urt/files/gentoo-config deleted file mode 100644 index 3ad38b961166..000000000000 --- a/media-libs/urt/files/gentoo-config +++ /dev/null @@ -1,53 +0,0 @@ -#define ABEKASA60 -##define ABEKASA62 bug #455970 -#define ALIAS -##define CGM -#define CUBICOMP -##define DVIRLE -#define GRAYFILES -#define MACPAINT -##define PBMPLUS -##define SUNRASTER -#define TARGA -#define VICAR -#define WASATCH -#define WAVEFRONT - -#define GCC - -#define CONST_DECL -#define NO_MAKE_MAKEFILE -#define USE_TIME_H -#define SYS_V_SETPGRP -#define USE_PROTOTYPES -#define USE_RANDOM -#define USE_STDARG -#define USE_STDLIB_H -#define USE_UNISTD_H -#define USE_STRING_H -#define VOID_STAR -#define USE_XLIBINT_H -#define X_SHARED_MEMORY - -#defpath DEST bin -#defpath MAN_DEST man-dest -#defpath RI include -#defpath RL lib - -ROFF = nroff -ROFFOPT = -man -ROFFPIPE = | lpr - -INCTIFF = -LIBTIFF = -ltiff -INCX11 = -LIBX11 = -lX11 - -# Most people have migrated X11 to /usr/lib, but just in case ... -check_x11=$(shell \ - echo 'int main(){}' > test.c ; \ - if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \ - echo "-L/usr/X11R6/lib" ; \ - fi ; \ - rm -f .urt-x11-test test.c) -LIBX11 += $(call check_x11) diff --git a/media-libs/urt/files/urt-3.1b-compile-updates.patch b/media-libs/urt/files/urt-3.1b-compile-updates.patch deleted file mode 100644 index d33f004fe80f..000000000000 --- a/media-libs/urt/files/urt-3.1b-compile-updates.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- a/get/getx11/XGetHClrs.c -+++ b/get/getx11/XGetHClrs.c -@@ -1,5 +1,4 @@ - #ifndef XLIBINT_H_NOT_AVAILABLE --#include <X11/copyright.h> - - /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ - /* Copyright Massachusetts Institute of Technology 1986 */ ---- a/tools/mallocNd.c -+++ b/tools/mallocNd.c -@@ -67,7 +67,7 @@ - - /* Imports */ - #include <stdio.h> --extern char *malloc(); -+#include <string.h> - - /* Forward declarations */ - char *BuildIndirectionTable(); ---- a/tools/into.c -+++ b/tools/into.c -@@ -40,8 +40,8 @@ - static char buf[MAXPATHLEN+1]; - short forceflg; /* overwrite an unwritable file? */ - --extern int errno; --extern char *sys_errlist[]; -+#include <errno.h> -+#include <string.h> - - void - main(argc, argv) -@@ -103,7 +103,7 @@ - if (ferror(outf)) - { - fprintf(stderr, "into: %s, \"%s\" not modified\n", -- sys_errlist[errno], argv[1]); -+ strerror(errno), argv[1]); - unlink(buf); - exit(1); - } ---- a/cnv/tex/dvirle2.c -+++ b/cnv/tex/dvirle2.c -@@ -55,7 +55,6 @@ - void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks(); - - char *ProgName; --extern int errno; - extern char *optarg; - extern int optind; - ---- a/cnv/wasatchrle.c -+++ b/cnv/wasatchrle.c -@@ -32,7 +32,6 @@ - #include <errno.h> - #include "rle.h" - --extern int errno; - - /* "short" in our world is 16 bits. Beware of swyte-bopping. */ - ---- a/get/getx11/x11_stuff.c -+++ b/get/getx11/x11_stuff.c -@@ -155,7 +155,6 @@ - IPC_CREAT|0777 ); - if ( img->shm_img.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) -@@ -361,7 +360,6 @@ Boolean reallocate; - XDestroyImage( image ); - if ( img->shm_pix.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) ---- a/get/qcr/qcr.h -+++ b/get/qcr/qcr.h -@@ -6,8 +6,6 @@ - #define GREEN 1 - #define BLUE 2 - --extern int errno; -- - /* Command defs for QCR-Z Film Recorder */ - - /* These are for 8 bit Look Up Tables */ ---- a/get/gettaac.c -+++ b/get/gettaac.c -@@ -24,6 +24,7 @@ - * Send bug fixes and improvements to: ksp@maxwell.nde.swri.edu - */ - -+#include <errno.h> - #include <stdio.h> - #include <strings.h> - #include <signal.h> -@@ -459,7 +460,6 @@ char *template; - char nonUnique; - char twiddleUserCompletion; - -- extern int errno; - struct direct *nameEntry; - DIR *dirChan; - struct passwd *pwdEntry; ---- a/tools/clock/rleClock.c -+++ b/tools/clock/rleClock.c -@@ -598,7 +598,7 @@ - { TRUE, "-tf", STRING, "Text area format string", (char *)&FormatString }, - { FALSE, "-Xm", BOOL, "Output the alpha channel on RGB", (char *)&DebugAlpha }, - { FALSE, "-D", BOOL, "Turn on debugging", (char *)&Debug }, -- NULL -+ { FALSE, NULL } - }; - - void ---- a/tools/to8.c -+++ b/tools/to8.c -@@ -175,7 +175,7 @@ - * Give it a background color of black, since the real background - * will be dithered anyway. - */ -- if ( in_hdr.background != NULL ) -+ if ( in_hdr.background != 0 ) - { - out_hdr.bg_color = (int *)malloc( sizeof( int ) ); - RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 ); ---- a/cnv/rletoabA62/rletoabA62.c -+++ b/cnv/rletoabA62/rletoabA62.c -@@ -157,7 +157,7 @@ - exit(1); - } - if (optind < argc) { -- if ((file = open(argv[optind], 0)) == NULL) { -+ if ((file = open(argv[optind], 0)) == -1) { - perror(argv[optind]); - exit(1); - } diff --git a/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch deleted file mode 100644 index 4e0e31e660b1..000000000000 --- a/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch +++ /dev/null @@ -1,96 +0,0 @@ -Fix implicit declaration of functions - ---- a/cnv/rletoabA62/rletoabA62.c -+++ b/cnv/rletoabA62/rletoabA62.c -@@ -42,6 +42,10 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - #ifndef TRUE - #define TRUE 1 ---- a/tools/mallocNd.c -+++ b/tools/mallocNd.c -@@ -67,6 +67,7 @@ - - /* Imports */ - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - - /* Forward declarations */ ---- a/get/getx11/getx11.h -+++ b/get/getx11/getx11.h -@@ -29,6 +29,8 @@ - #include <stdio.h> - #include <math.h> - #include <ctype.h> -+#include <unistd.h> -+#include <X11/Xlibint.h> - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> ---- a/tools/into.c -+++ b/tools/into.c -@@ -27,6 +27,7 @@ - - #include "rle_config.h" - #include <stdio.h> -+#include <unistd.h> - #include <errno.h> - #include <sys/types.h> - #include <sys/param.h> /* for MAXPATHLEN */ ---- a/tools/rlecat.c -+++ b/tools/rlecat.c -@@ -15,6 +15,7 @@ - */ - - #include <stdio.h> -+#include <unistd.h> - #include "rle.h" - #include "rle_raw.h" - ---- a/tools/rleaddcom.c -+++ b/tools/rleaddcom.c -@@ -26,6 +26,7 @@ - */ - - #include <stdio.h> -+#include <unistd.h> - #include "rle.h" - #include <sys/types.h> - #include <sys/param.h> /* for MAXPATHLEN */ ---- a/tools/rlenoise.c -+++ b/tools/rlenoise.c -@@ -20,6 +20,7 @@ - */ - - #include <stdio.h> -+#include <time.h> - #include "rle.h" - - /* Change this according the value on your system. This is a crock. */ ---- a/cnv/rletorla.c -+++ b/cnv/rletorla.c -@@ -29,6 +29,7 @@ - * System includes. - */ - #include <stdio.h> -+#include <unistd.h> - #include "rlb_header.h" - #include "rle.h" - ---- a/cnv/giftorle.c -+++ b/cnv/giftorle.c -@@ -22,6 +22,7 @@ - /* +------------------------------------------------------------------+ */ - - #include <stdio.h> -+#include <unistd.h> - #include "rle.h" - - #ifndef lint diff --git a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch deleted file mode 100644 index 19c492988a1e..000000000000 --- a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/lib/makefile.src -+++ b/lib/makefile.src -@@ -5,10 +5,6 @@ - DEST = - #endif - --#ifndef NO_RANLIB --RANLIB = ranlib --#endif -- - # If nothing else is specified, default is to build the library. - default: buildlib - -@@ -40,8 +36,8 @@ - echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ - cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ - if test x$(RANLIB) != x ; then \ -- echo ranlib $(DEST)/$(LIBNAME) ; \ -- ranlib $(DEST)/$(LIBNAME) ; \ -+ echo $(RANLIB) $(DEST)/$(LIBNAME) ; \ -+ $(RANLIB) $(DEST)/$(LIBNAME) ; \ - else \ - true ; \ - fi ; \ -@@ -49,11 +45,11 @@ - echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ - if test x$(RANLIB) != x ; then \ - cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ -- echo ranlib $(DEST)/debug/$(LIBNAME) ; \ -+ echo $(RANLIB) $(DEST)/debug/$(LIBNAME) ; \ - else \ - true ; \ - fi ; \ -- ranlib $(DEST)/debug/$(LIBNAME) ; \ -+ $(RANLIB) $(DEST)/debug/$(LIBNAME) ; \ - else \ - true ; \ - fi ; \ -@@ -65,13 +61,18 @@ - # Rebuild the library from all the .o files. - buildlib: $(OBJS) - -rm -f $(LIBNAME) -- ar rc $(LIBNAME) -- ar q $(LIBNAME) $(OBJS) -+ $(AR) rc $(LIBNAME) $(OBJS) - #ifndef NO_RANLIB -- ranlib $(LIBNAME) -+ $(RANLIB) $(LIBNAME) - #endif - touch buildlib - -+# Gentoo wants dynamic linking -+buildlibso: $(OBJS) -+ -rm -f $(LIBNAME).so -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=librle-0.0.0.so $(OBJS) -lm -o librle.so -+ touch buildlibso -+ - # Clean up installed stuff and binaries - pristine: clean - -@if test $(DEST)X != X ; then \ diff --git a/media-libs/urt/files/urt-3.1b-make.patch b/media-libs/urt/files/urt-3.1b-make.patch deleted file mode 100644 index d8f6c74cd890..000000000000 --- a/media-libs/urt/files/urt-3.1b-make.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: urt/makefile.src -=================================================================== ---- urt.orig/makefile.src -+++ urt/makefile.src -@@ -17,7 +17,7 @@ all: default - # clean deletes all but source, pristine (below) deletes installed stuff, too - default clean: doit - @for d in $(DIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - # install puts library, binaries and documentation into global location -@@ -29,7 +29,7 @@ MAKE_TARGET = - - install $(MAKE_TARGET) pristine depend:: doit - @for d in $(ALLDIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - -Index: urt/tools/makefile.src -=================================================================== ---- urt.orig/tools/makefile.src -+++ urt/tools/makefile.src -@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o - # rleClock has it's own directory, must be built special - - rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c -- (cd clock ; make) -+ (cd clock ; $(MAKE)) - - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm -Index: urt/makefile.tlr -=================================================================== ---- urt.orig/makefile.tlr -+++ urt/makefile.tlr -@@ -7,7 +7,7 @@ subdirs: - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -46,7 +46,7 @@ install-subdirs: subdirs - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +124,7 @@ clean-pgm: - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ diff --git a/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch deleted file mode 100644 index 0463abec15de..000000000000 --- a/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch +++ /dev/null @@ -1,139 +0,0 @@ -some hosts are more anal about ar usage than others -http://bugs.gentoo.org/107428 - -respect user LDFLAGS -http://bugs.gentoo.org/126872 - ---- a/tools/clock/makefile.src -+++ b/tools/clock/makefile.src -@@ -6,7 +6,7 @@ install: rleClock - mv rleClock ../rleClock.out - - rleClock:rleClock.o font.o -- ${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock -+ ${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm - - font.c:font.src makeFont - chmod +x makeFont ---- a/tools/makefile.src -+++ b/tools/makefile.src -@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h - pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h - $(CC) $(CFLAGS) pyrlib.c -c - pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h -- $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new - mv pyrmask.new pyrmask.out - - fant.out: fant.o mallocNd.o -- $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new - mv fant.new fant.out - - # rlebox and crop use some common code. - rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h - - crop.out: crop.c rle_box.o -- ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new -+ ${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new - mv crop.new crop.out - rlebox.out: rlebox.c rle_box.o -- ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new -+ ${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new - mv rlebox.new rlebox.out - - # rleClock has it's own directory, must be built special -@@ -100,7 +100,7 @@ clean: clean-pgm - .SUFFIXES: - .SUFFIXES: .out .c .o - .c.out: -- $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new -+ $(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new - mv $*.new $@ - - .c.o: ---- a/cnv/makefile.src -+++ b/cnv/makefile.src -@@ -76,13 +76,13 @@ PBMDIR = - # ppmtorle - ppm format to RLE - # rletoppm - RLE to ppm format - pgmtorle.out: pgmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - ppmtorle.out: ppmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - rletoppm.out: rletoppm.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - #endif - -@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c - # iristorle/rletoiris - Convert between RLE and SGI image format. - # - iristorle.out: iristorle.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - rletoiris.out: rletoiris.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - #endif - -@@ -108,10 +108,10 @@ TIFFDIR = - # tifftorle - Convert TIFF images to RLE - # rletotiff - Convert RLE images to TIFF - rletotiff.out: rletotiff.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - tifftorle.out: tifftorle.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - #endif - -@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c - # Will build with the default rule. - # rletorla - RLE to Wavefront RLA - rletorla.out: rletorla.c -- $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new - mv $*.new $@ - #endif WAVEFRONT - -@@ -144,7 +144,7 @@ pristine: pristine-pgm - .SUFFIXES: - .SUFFIXES: .out .c - .c.out: -- $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new - mv $*.new $@ - - # Dependency lines. Make sure to #ifdef them. ---- a/cnv/rletoabA62/makefile.src -+++ b/cnv/rletoabA62/makefile.src -@@ -15,7 +15,7 @@ all : $(PGMS) - # Executables. The .out will be stripped off in the install action. - - rletoabA62.out : rletoabA62.o rle.o -- $(CC) $(CFLAGS) -o rletoabA62.new \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \ - rletoabA62.o rle.o $(LIBS) - mv rletoabA62.new rletoabA62.out - ---- a/cnv/rletogif/makefile.src -+++ b/cnv/rletogif/makefile.src -@@ -15,7 +15,7 @@ all: $(PGMS) - # The executable. The ".out" will be stripped off in the install action. - - rletogif.out: ${OBJ} -- ${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new -+ ${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new - mv rletogif.new rletogif.out - - # Incremental install, copies executable to DEST dir. diff --git a/media-libs/urt/files/urt-3.1b-rle-fixes.patch b/media-libs/urt/files/urt-3.1b-rle-fixes.patch deleted file mode 100644 index b892f0acdeee..000000000000 --- a/media-libs/urt/files/urt-3.1b-rle-fixes.patch +++ /dev/null @@ -1,203 +0,0 @@ -Fixes taken from netpbm - ---- a/lib/rle_global.c -+++ b/lib/rle_global.c -@@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = { - 8, /* cmaplen (log2 of length of color map) */ - NULL, /* pointer to color map */ - NULL, /* pointer to comment strings */ -- stdout, /* output file */ -+ NULL, /* output file -- must be set dynamically */ - { 7 }, /* RGB channels only */ - 0L, /* Can't free name and file fields. */ - "Urt", /* Default "program name". */ ---- a/lib/rle_hdr.c -+++ b/lib/rle_hdr.c -@@ -269,6 +273,9 @@ - { - rle_hdr *ret_hdr; - -+ rle_dflt_hdr.rle_file = stdout; -+ /* The rest of rle_dflt_hdr is set by the loader's data initialization */ -+ - if ( the_hdr == &rle_dflt_hdr ) - return the_hdr; - ---- a/lib/dither.c -+++ b/lib/dither.c -@@ -38,10 +38,10 @@ void make_square(); - #endif - - static int magic4x4[4][4] = { -- 0, 14, 3, 13, -- 11, 5, 8, 6, -- 12, 2, 15, 1, -- 7, 9, 4, 10 -+{ 0, 14, 3, 13}, -+{ 11, 5, 8, 6}, -+{ 12, 2, 15, 1}, -+{ 7, 9, 4, 10} - }; - - /* basic dithering macro */ ---- a/lib/rle_open_f.c -+++ b/lib/rle_open_f.c -@@ -9,7 +9,11 @@ - */ - - #include "rle_config.h" -+#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ -+ - #include <stdio.h> -+#include <unistd.h> -+#include <fcntl.h> - - #ifndef NO_OPEN_PIPES - /* Need to have a SIGCLD signal catcher. */ -@@ -260,7 +260,6 @@ - int pipefd[2]; - int i; - char *argv[4]; -- extern int errno; - - /* Check args. */ - if ( *mode != 'r' && *mode != 'w' ) ---- a/lib/rle_getcom.c -+++ b/lib/rle_getcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } ---- a/lib/scanargs.c -+++ b/lib/scanargs.c -@@ -128,10 +130,10 @@ - va_list argl; - { - -- register check; /* check counter to be sure all argvs -+ int check; /* check counter to be sure all argvs - are processed */ - register CONST_DECL char *cp; -- register cnt; -+ int cnt; - int optarg = 0; /* where optional args start */ - int nopt = 0; - char tmpflg, /* temp flag */ -@@ -375,11 +377,12 @@ - if ( optarg > 0 ) /* end optional args? */ - { - /* Eat the arg, too, if necessary */ -- if ( list_cnt == 0 ) -+ if ( list_cnt == 0 ) { - if ( typchr == 's' ) - (void)va_arg( argl, char * ); - else - (void)va_arg( argl, ptr ); -+ } - break; - } - else -@@ -567,7 +570,7 @@ - * Do conversion for n and N types - */ - tmpflg = typchr; -- if (typchr == 'n' || typchr == 'N' ) -+ if (typchr == 'n' || typchr == 'N' ) { - if (*argp != '0') - tmpflg = 'd'; - else if (*(argp+1) == 'x' || -@@ -578,6 +581,7 @@ - } - else - tmpflg = 'o'; -+ } - if (typchr == 'N') - tmpflg = toupper( tmpflg ); - ---- a/lib/inv_cmap.c -+++ b/lib/inv_cmap.c -@@ -42,7 +42,7 @@ - static long cbinc, cginc, crinc; - static unsigned long *gdp, *rdp, *cdp; - static unsigned char *grgbp, *rrgbp, *crgbp; --static gstride, rstride; -+static long gstride, rstride; - static long x, xsqr, colormax; - static int cindex; - #ifdef INSTRUMENT_IT ---- a/lib/rle_getrow.c -+++ b/lib/rle_getrow.c -@@ -351,7 +351,7 @@ - bzero( (char *)scanline[-1] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1 ); - for ( nc = 0; nc < the_hdr->ncolors; nc++ ) -- if ( RLE_BIT( *the_hdr, nc ) ) -+ if ( RLE_BIT( *the_hdr, nc ) ) { - /* Unless bg color given explicitly, use 0. */ - if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 ) - bzero( (char *)scanline[nc] + the_hdr->xmin, -@@ -360,6 +360,7 @@ - bfill( (char *)scanline[nc] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1, - the_hdr->bg_color[nc] ); -+ } - } - - /* If skipping, then just return */ -@@ -367,7 +368,7 @@ - { - the_hdr->priv.get.vert_skip--; - the_hdr->priv.get.scan_y++; -- if ( the_hdr->priv.get.vert_skip > 0 ) -+ if ( the_hdr->priv.get.vert_skip > 0 ) { - if ( the_hdr->priv.get.scan_y >= the_hdr->ymax ) - { - int y = the_hdr->priv.get.scan_y; -@@ -377,6 +378,7 @@ - } - else - return the_hdr->priv.get.scan_y; -+ } - } - - /* If EOF has been encountered, return also */ -@@ -457,11 +459,12 @@ - else - nc = DATUM(inst); - nc++; -- if ( debug_f ) -+ if ( debug_f ) { - if ( RLE_BIT( *the_hdr, channel ) ) - fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc ); - else - fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc); -+ } - if ( RLE_BIT( *the_hdr, channel ) ) - { - /* Don't fill past end of scanline! */ ---- a/lib/rle_putcom.c -+++ b/lib/rle_putcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } diff --git a/media-libs/urt/files/urt-3.1b-solaris.patch b/media-libs/urt/files/urt-3.1b-solaris.patch deleted file mode 100644 index 739b937d8903..000000000000 --- a/media-libs/urt/files/urt-3.1b-solaris.patch +++ /dev/null @@ -1,14 +0,0 @@ -usage of errno requires errno.h - -Fabian Groffen <grobian@gentoo.org> - ---- a/get/getx11/x11_stuff.c -+++ b/get/getx11/x11_stuff.c -@@ -42,6 +42,7 @@ - #ifdef X_SHARED_MEMORY - #include <sys/errno.h> - #endif -+#include <errno.h> - - #include "circle.bitmap" - #include "circle_mask.bitmap" diff --git a/media-libs/urt/files/urt-3.1b-tempfile.patch b/media-libs/urt/files/urt-3.1b-tempfile.patch deleted file mode 100644 index 8be2793ed71c..000000000000 --- a/media-libs/urt/files/urt-3.1b-tempfile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tools/rlecat.c -+++ b/tools/rlecat.c -@@ -110,8 +110,14 @@ - nflag = 0; /* Not really repeating! */ - else - { -- mktemp( temp ); /* Make a temporary file name */ -- tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); -+ /* we dont have to use rle_open_f() because all it does in -+ * this case is run fopen() ... we're creating a file so all -+ * the checks for opening an existing file aren't needed */ -+ int fd = mkstemp(temp); -+ if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) { -+ perror("Unable to open tempfile"); -+ exit(-1); -+ } - } - } - diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild deleted file mode 100644 index bdf0851dc3cf..000000000000 --- a/media-libs/urt/urt-3.1b-r3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images" -HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/" -SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z" -S="${WORKDIR}" - -LICENSE="URT gif? ( free-noncomm )" -SLOT="0/3.1b-r2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -IUSE="gif postscript static-libs tiff tools X" - -RDEPEND=" - X? ( x11-libs/libXext ) - gif? ( media-libs/giflib ) - postscript? ( app-text/ghostscript-gpl ) - tiff? ( media-libs/tiff:= ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${P}-rle-fixes.patch - "${FILESDIR}"/${P}-compile-updates.patch - "${FILESDIR}"/${P}-tempfile.patch - "${FILESDIR}"/${P}-r2-build-fixes.patch - "${FILESDIR}"/${P}-make.patch - "${FILESDIR}"/${P}-solaris.patch - "${FILESDIR}"/${P}-librle-toolchain.patch - "${FILESDIR}"/${P}-implicit-function-declarations.patch -) - -urt_config() { - use $1 && echo "#define $2" || echo "##define $2" -} - -src_prepare() { - rm -f bin/README || die - - default - - # punt bogus manpage #109511 - rm -f man/man1/template.1 || die - - # stupid OS X declares a stack_t type already #107428 - sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die - -} - -src_configure() { - append-cflags -fPIC - - sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr || die - - cp "${FILESDIR}"/gentoo-config config/gentoo || die - cat >> config/gentoo <<-EOF - $(urt_config X X11) - $(urt_config postscript POSTSCRIPT) - $(urt_config tiff TIFF) - ExtraCFLAGS = ${CFLAGS} - MFLAGS = ${MAKEOPTS} - # prevent circular depend #111455 - $(has_version media-libs/giflib && urt_config gif GIF) - EOF - - ./Configure config/gentoo || die "configure failed" -} - -src_compile() { - tc-export AR RANLIB - - emake CC="$(tc-getCC)" -C lib buildlibso - emake CC="$(tc-getCC)" -} - -src_install() { - mkdir -p man-dest/man{1,3,5} - # this just installs it into some local dirs - emake install - - use tools && dobin bin/* - - use static-libs && dolib.a lib/librle.a - - dolib.so lib/librle.so - dosym librle.so /usr/$(get_libdir)/librle-0.0.0.so - - insinto /usr/include - doins include/rle*.h - doman man-dest/man?/*.[135] - dodoc *-changes CHANGES* README blurb -} |