From f329ff232d92d0d62634bad67bf16f944ba0e55e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 19 Aug 2024 19:09:34 -0700 Subject: [PATCH 1/2] build/pkgs/tachyon/spkg-install.in: Set USEPNG, PNGLIB by make options instead of patch, pass LDFLAGS --- build/pkgs/tachyon/patches/Make-config.patch | 56 -------------------- build/pkgs/tachyon/spkg-install.in | 3 +- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 build/pkgs/tachyon/patches/Make-config.patch diff --git a/build/pkgs/tachyon/patches/Make-config.patch b/build/pkgs/tachyon/patches/Make-config.patch deleted file mode 100644 index 49462387134..00000000000 --- a/build/pkgs/tachyon/patches/Make-config.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/unix/Make-config 2011-03-13 11:01:07.000000000 +0000 -+++ b/unix/Make-config 2016-07-04 15:29:57.982923000 +0000 -@@ -122,29 +122,25 @@ - # PNG support configuration: - # PNGINC is the directory where your libpng and libz include files - # are made available. PNGLIB is the directory where your libpng --# and libz libraries are made available. -+# and libz libraries are made available. - # - # LibPNG can be downlaoded from: - # http://www.libpng.org/ - ########################################################################## - # Uncomment the following lines to disable PNG support --USEPNG= --PNGINC= --PNGLIB= -+USEPNG= -DUSEPNG -+PNGINC= -I$(SAGE_LOCAL)/include -+PNGLIB= -L$(SAGE_LOCAL)/lib -lpng -lz - --# Uncomment the following lines to enable PNG support --#USEPNG= -DUSEPNG --#PNGINC= -I/usr/local/include --#PNGLIB= -L/usr/local/lib -lpng -lz - - - ########################################################################## --# OMF (Open Media Framework) configuration -+# OMF (Open Media Framework) configuration - # Requires OMF Toolkit version 2.x - ########################################################################## - #OMFDIR = /disk5/users/johns/graphics/OMFKT202/Toolkit - #OMFINC = -I$(OMFDIR)/include -I$(OMFDIR)/kitomfi -I$(OMFDIR)/bento -I$(OMFDIR)/jpeg -I$(OMFDIR)/portinc -I$(OMFDIR)/avidjpg --#OMFLIB = -L$(OMFDIR)/DO_sun5_opt/usr/lib -lAJPG -lOMFI -lbento -ljpeg -+#OMFLIB = -L$(OMFDIR)/DO_sun5_opt/usr/lib -lAJPG -lOMFI -lbento -ljpeg - #OMFDEF = -DUSEOMF - - -@@ -159,7 +155,7 @@ - - ########################################################################## - # Spaceball I/O library configuration: --# A spaceball can used for fly-throughs of scenes when running on -+# A spaceball can used for fly-throughs of scenes when running on - # a fast multiprocessor, parallel machine, or PC cluster. - # - # Libsball can be downloaded from: -@@ -172,7 +168,7 @@ - - ########################################################################## - # MGF Materials and Geometry Format scene parser library --# If enabled, this allows Tachyon to read MGF scene files using -+# If enabled, this allows Tachyon to read MGF scene files using - # compiled-in MGF scene parser code. - ########################################################################## - #MGFDIR=../../libmgf diff --git a/build/pkgs/tachyon/spkg-install.in b/build/pkgs/tachyon/spkg-install.in index dc1ebb49740..6a68d95688c 100644 --- a/build/pkgs/tachyon/spkg-install.in +++ b/build/pkgs/tachyon/spkg-install.in @@ -52,7 +52,8 @@ if [ -z "$TARGET" ]; then sdh_die "Error: Sorry, your platform isn't supported by Tachyon and/or Sage. Exiting..." fi -sdh_make "$TARGET" +# The Makefile ignores LDFLAGS; we include it here so that rpath is set on Linux +sdh_make "$TARGET" USEPNG=-DUSEPNG PNGLIB="$LDFLAGS -lpng -lz" echo "Installing the Tachyon binary..." cd "$CUR" From 069f036f0eaf7e3dcd32db1f25fdf7143eea40b0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 19 Aug 2024 19:12:12 -0700 Subject: [PATCH 2/2] build/pkgs/tachyon/package-version.txt: Bump patch level --- build/pkgs/tachyon/package-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/tachyon/package-version.txt b/build/pkgs/tachyon/package-version.txt index 2d666706df4..fcdf7816d66 100644 --- a/build/pkgs/tachyon/package-version.txt +++ b/build/pkgs/tachyon/package-version.txt @@ -1 +1 @@ -0.99.5 +0.99.5.p0