commit: 9ffbaa051a7375977d0cca68af26c6fb6ba1c59b Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> AuthorDate: Fri Apr 4 15:16:39 2025 +0000 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> CommitDate: Fri Apr 4 15:16:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffbaa05
media-gfx/tachyon: add 0.99.5, drop 0.99_beta6-r2 Closes: https://bugs.gentoo.org/710486 Closes: https://bugs.gentoo.org/831434 Closes: https://bugs.gentoo.org/875260 Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> media-gfx/tachyon/Manifest | 2 +- ...6-r2-ldflags.patch => tachyon-0.99.5-ldflags.patch} | 7 ++++--- ...ta6-r2-shared.patch => tachyon-0.99.5-shared.patch} | 18 ++++++++++-------- ...hyon-0.99_beta6-r2.ebuild => tachyon-0.99.5.ebuild} | 10 +++++----- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest index 0d9127997009..ccaa60c00ccd 100644 --- a/media-gfx/tachyon/Manifest +++ b/media-gfx/tachyon/Manifest @@ -1 +1 @@ -DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33 +DIST tachyon-0.99.5.tar.gz 1163063 BLAKE2B e3e02dbec850e5fd04aa8dea838d97cca042476ddd2694a455811287f9f6837dbc7b73a6de3ea5d32a6a572752cf40df1c053b6efcee1e91a01bd0f18bf871e4 SHA512 a7a2af36e8cd31855bb048c135145ed62c09d580b80a761a7e8ce26add2aa3665bd8a8684e8cca9bdd1230bb2b6257f9f602c72c847b0b6f2d95673bcbed51b5 diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch b/media-gfx/tachyon/files/tachyon-0.99.5-ldflags.patch similarity index 80% rename from media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch rename to media-gfx/tachyon/files/tachyon-0.99.5-ldflags.patch index 220589a8f548..06fb74d91255 100644 --- a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch +++ b/media-gfx/tachyon/files/tachyon-0.99.5-ldflags.patch @@ -1,6 +1,7 @@ ---- a/Makefile -+++ b/Makefile -@@ -121,7 +121,7 @@ ${MGFLIB} : ../libmgf/Makefile +diff '--color=auto' -urN unix.orig/Makefile unix/Makefile +--- unix.orig/Makefile 2025-04-04 18:07:35.287673315 +0300 ++++ unix/Makefile 2025-04-04 18:07:46.214794876 +0300 +@@ -165,7 +165,7 @@ }; ${ARCHDIR}/tachyon : ${RAYLIB} ${PARSELIB} ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch b/media-gfx/tachyon/files/tachyon-0.99.5-shared.patch similarity index 95% rename from media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch rename to media-gfx/tachyon/files/tachyon-0.99.5-shared.patch index 8bd37071a8dc..43d0571fe610 100644 --- a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch +++ b/media-gfx/tachyon/files/tachyon-0.99.5-shared.patch @@ -1,16 +1,18 @@ -diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile ---- a/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 -+++ b/Makefile 2011-07-23 20:23:51.000000000 +0200 -@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon +diff '--color=auto' -urN unix.orig/Makefile unix/Makefile +--- unix.orig/Makefile 2025-04-04 18:08:53.437298704 +0300 ++++ unix/Makefile 2025-04-04 18:11:23.444469688 +0300 +@@ -23,8 +23,8 @@ # # Name of raytracing library file to create # -RAYLIB=${ARCHDIR}/libtachyon.a +-RAYLIBOPTIX=${ARCHDIR}/libtachyonoptix.a +RAYLIB=${ARCHDIR}/libtachyon.so ++RAYLIBOPTIX=${ARCHDIR}/libtachyonoptix.so RAYLIBDIR=${ARCHDIR} - # -@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \ + +@@ -337,124 +337,125 @@ ${OBJDIR}/tgafile.o \ ${OBJDIR}/winbmp.o @@ -175,5 +177,5 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile - ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o + ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o - clean : - @echo "Cleaning object files, binaries etc." + + ## diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99.5.ebuild similarity index 94% rename from media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild rename to media-gfx/tachyon/tachyon-0.99.5.ebuild index e6b03c7a30c3..68096e01db6b 100644 --- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild +++ b/media-gfx/tachyon/tachyon-0.99.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x64-macos" IUSE="doc examples jpeg mpi +opengl openmp png threads" DEPEND=" - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu @@ -30,8 +30,8 @@ RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PF}-ldflags.patch" - "${FILESDIR}/${PF}-shared.patch" + "${FILESDIR}/${P}-ldflags.patch" + "${FILESDIR}/${P}-shared.patch" ) src_prepare() {
