* [gentoo-commits] repo/gentoo:master commit in: media-libs/urt/files/, media-libs/urt/
@ 2018-08-15 6:54 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2018-08-15 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 5a34e5ca05798aaa96ad6e77bcb7cbf253aa3d7f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 06:54:32 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 06:54:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a34e5ca
media-libs/urt: Install a shared library.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
.../urt/files/urt-3.1b-librle-toolchain.patch | 60 +++++++++
media-libs/urt/files/urt-3.1b-r2-build-fixes.patch | 139 +++++++++++++++++++++
media-libs/urt/urt-3.1b-r2.ebuild | 96 ++++++++++++++
3 files changed, 295 insertions(+)
diff --git a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch
new file mode 100644
index 00000000000..19c492988a1
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch
@@ -0,0 +1,60 @@
+--- 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-r2-build-fixes.patch b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch
new file mode 100644
index 00000000000..0463abec15d
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch
@@ -0,0 +1,139 @@
+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/urt-3.1b-r2.ebuild b/media-libs/urt/urt-3.1b-r2.ebuild
new file mode 100644
index 00000000000..9630f407797
--- /dev/null
+++ b/media-libs/urt/urt-3.1b-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
+HOMEPAGE="http://www.cs.utah.edu/gdc/projects/urt/"
+SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
+
+LICENSE="URT gif? ( free-noncomm )"
+SLOT="0/${PVR}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="gif postscript static-libs tiff 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 )
+"
+
+S=${WORKDIR}
+
+urt_config() {
+ use $1 && echo "#define $2" || echo "##define $2"
+}
+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
+)
+
+src_prepare() {
+ rm -f bin/README
+
+ default
+
+ # punt bogus manpage #109511
+ rm -f man/man1/template.1
+
+ # 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
+
+ cp "${FILESDIR}"/gentoo-config config/gentoo
+ 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 "config"
+}
+
+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
+ make install || die
+ 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/urt/files/, media-libs/urt/
@ 2018-08-15 7:04 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2018-08-15 7:04 UTC (permalink / raw
To: gentoo-commits
commit: ff2fd068236a2b6e716cc419c458e3edf48a3c2d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 07:03:44 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 07:03:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2fd068
media-libs/urt: Fix includes (bug #293578).
Package-Manager: Portage-2.3.46, Repoman-2.3.10
.../urt-3.1b-implicit-function-declarations.patch | 96 ++++++++++++++++++++++
.../urt/{urt-3.1b-r2.ebuild => urt-3.1b-r3.ebuild} | 3 +-
2 files changed, 98 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..4e0e31e660b
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch
@@ -0,0 +1,96 @@
+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/urt-3.1b-r2.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
similarity index 96%
rename from media-libs/urt/urt-3.1b-r2.ebuild
rename to media-libs/urt/urt-3.1b-r3.ebuild
index 9630f407797..c22b164afab 100644
--- a/media-libs/urt/urt-3.1b-r2.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cs.utah.edu/gdc/projects/urt/"
SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
LICENSE="URT gif? ( free-noncomm )"
-SLOT="0/${PVR}"
+SLOT="0/3.1b-r2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="gif postscript static-libs tiff X"
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${P}-make.patch
"${FILESDIR}"/${P}-solaris.patch
"${FILESDIR}"/${P}-librle-toolchain.patch
+ "${FILESDIR}"/${P}-implicit-function-declarations.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/urt/files/, media-libs/urt/
@ 2025-03-21 15:45 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-03-21 15:45 UTC (permalink / raw
To: gentoo-commits
commit: c97b171a5170a0cb7778c01bcccf5c5119fa9b6b
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 15:42:36 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 15:44:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97b171a
media-libs/urt: drop 3.1b-r3
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
media-libs/urt/Manifest | 1 -
media-libs/urt/files/gentoo-config | 53 ------
.../urt/files/urt-3.1b-compile-updates.patch | 141 --------------
.../urt-3.1b-implicit-function-declarations.patch | 96 ----------
.../urt/files/urt-3.1b-librle-toolchain.patch | 60 ------
media-libs/urt/files/urt-3.1b-make.patch | 75 --------
media-libs/urt/files/urt-3.1b-r2-build-fixes.patch | 139 --------------
media-libs/urt/files/urt-3.1b-rle-fixes.patch | 203 ---------------------
media-libs/urt/files/urt-3.1b-solaris.patch | 14 --
media-libs/urt/files/urt-3.1b-tempfile.patch | 19 --
media-libs/urt/urt-3.1b-r3.ebuild | 99 ----------
11 files changed, 900 deletions(-)
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 7cad775a200e..0b496dce579b 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,2 +1 @@
-DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
DIST urt-3.2_rc1_p20250101.tar.gz 1079866 BLAKE2B 519760a11b10d1cad1d2f9ba6b0de3918000ad9a6fa0a3edbf0382d8bdf99248aa12e89aec09bbe134db0138f8eb1326bad06a9c6ad581766b5f45bee3152989 SHA512 347fabddc2ff14f9313d2ed2ad7902b0fdc2108e1cb0d472f4040c2ab42c171360be390833359d813ad03bf4ea94537fe481a1bd5facfd9b72b2178622771e66
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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-21 15:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-15 6:54 [gentoo-commits] repo/gentoo:master commit in: media-libs/urt/files/, media-libs/urt/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2018-08-15 7:04 Jeroen Roovers
2025-03-21 15:45 Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox