[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-tachyon-0.99.patch)
Antonio Rojas
arojas at gemini.archlinux.org
Sat May 21 18:20:42 UTC 2022
Date: Saturday, May 21, 2022 @ 18:20:42
Author: arojas
Revision: 1209877
Add topcom optdepend, fix for mew tachyon
Added:
sagemath/trunk/sagemath-tachyon-0.99.patch
Modified:
sagemath/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 13 ++++---
sagemath-tachyon-0.99.patch | 77 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-05-21 17:52:16 UTC (rev 1209876)
+++ PKGBUILD 2022-05-21 18:20:42 UTC (rev 1209877)
@@ -7,7 +7,7 @@
pkgname=sagemath
pkgver=9.6
-pkgrel=1
+pkgrel=2
pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
arch=(x86_64)
url='http://www.sagemath.org'
@@ -46,7 +46,8 @@
'python-pip: to install optional packages with sage -pip'
'sage-notebook-exporter: convert flask notebooks to Jupyter'
'python-database-knotinfo: interface to the KnotInfo and LinkInfo databases'
- 'python-phitigra: graph editor')
+ 'python-phitigra: graph editor'
+ 'topcom: to compute triangulations of point configurations')
makedepends=(cython boost python-jinja sirocco mcqd coxeter bliss tdlib python-pkgconfig shared_meataxe)
conflicts=(sagemath-jupyter)
replaces=(sagemath-jupyter)
@@ -55,13 +56,15 @@
latte-count.patch
test-optional.patch
sagemath-linbox-1.7.patch
- sagemath-bliss-0.77.patch)
+ sagemath-bliss-0.77.patch
+ sagemath-tachyon-0.99.patch)
sha256sums=('c6225d48f70ac955fceed5c1fddfdd7294001d460b43a686329d5d44d836f6a3'
'e24c075a9f8e562fe9d85e6fd5b01eac4691683c01d4d22c83cde145b63f4dba'
'bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba'
'89c1f82dbba376087f08b39b11f43bf781cec199d7d894713167d09dc32e3e18'
'eacea27b214d32cb886a75695153dfc36b5bad2fd2517e8e4eee18e74220e9e3'
- 'b467a41e1e0a0850f7722d875a743233751966a206c2f61401c7582aa722f84e')
+ 'b467a41e1e0a0850f7722d875a743233751966a206c2f61401c7582aa722f84e'
+ '4ee8071efd7b9ad66ac5bbfe081fe670cc58cfcac8fb783d5a40b6da3593cbf4')
prepare(){
cd sage-$pkgver
@@ -71,6 +74,8 @@
patch -p1 -i ../sagemath-linbox-1.7.patch
# Fix build with bliss 0.77 https://trac.sagemath.org/ticket/33010
patch -p1 -i ../sagemath-bliss-0.77.patch
+# Fix tests with tachyon 0.99 https://trac.sagemath.org/ticket/23712
+ patch -p1 -i ../sagemath-tachyon-0.99.patch
# Arch-specific patches
# assume all optional packages are installed
Added: sagemath-tachyon-0.99.patch
===================================================================
--- sagemath-tachyon-0.99.patch (rev 0)
+++ sagemath-tachyon-0.99.patch 2022-05-21 18:20:42 UTC (rev 1209877)
@@ -0,0 +1,77 @@
+--- a/src/sage/interfaces/tachyon.py
++++ b/src/sage/interfaces/tachyon.py
+@@ -261,13 +261,13 @@ written in the sequence they are listed in the examples in this section.
+ The {\bf PROJECTION} keyword must be followed by one of the supported
+ camera projection mode identifiers {\bf PERSPECTIVE}, {\bf PERSPECTIVE_DOF},
+ {\bf ORTHOGRAPHIC}, or {\bf FISHEYE}. The {\bf FISHEYE} projection mode
+-requires two extra parameters {\bf FOCALLENGTH} and {\bf APERTURE}
++requires two extra parameters {\bf FOCALDIST} and {\bf APERTURE}
+ which precede the regular camera options.
+
+ \begin{verbatim}
+ Camera
+ projection perspective_dof
+- focallength 0.75
++ FOCALDIST 0.75
+ aperture 0.02
+ Zoom 0.666667
+ Aspectratio 1.000000
+--- a/src/sage/plot/plot3d/tachyon.py
++++ b/src/sage/plot/plot3d/tachyon.py
+@@ -92,7 +92,7 @@ angle, right angle)::
+ Finally there is the ``projection='perspective_dof'`` option. ::
+
+ sage: T = Tachyon(xres=800, antialiasing=4, raydepth=10,
+- ....: projection='perspective_dof', focallength='1.0', aperture='.0025')
++ ....: projection='perspective_dof', FOCALDIST='1.0', aperture='.0025')
+ sage: T.light((0,5,7), 1.0, (1,1,1))
+ sage: T.texture('t1', opacity=1, specular=.3)
+ sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1))
+@@ -186,7 +186,7 @@ class Tachyon(WithEqualityById, SageObject):
+ or ``'fisheye'``.
+ - ``frustum`` - (default ''), otherwise list of four numbers. Only
+ used with projection='fisheye'.
+- - ``focallength`` - (default ''), otherwise a number. Only used
++ - ``FOCALDIST`` - (default ''), otherwise a number. Only used
+ with projection='perspective_dof'.
+ - ``aperture`` - (default ''), otherwise a number. Only used
+ with projection='perspective_dof'.
+@@ -331,7 +331,7 @@ class Tachyon(WithEqualityById, SageObject):
+ Use of the ``projection='perspective_dof'`` option. This may not be
+ implemented correctly. ::
+
+- sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focallength='1.0', aperture='.0025')
++ sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', FOCALDIST='1.0', aperture='.0025')
+ sage: T.light((0,5,7), 1.0, (1,1,1))
+ sage: T.texture('t1', opacity=1, specular=.3)
+ sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1))
+@@ -365,7 +365,7 @@ class Tachyon(WithEqualityById, SageObject):
+ look_at=[0, 0, 0],
+ viewdir=None,
+ projection='PERSPECTIVE',
+- focallength='',
++ FOCALDIST='',
+ aperture='',
+ frustum=''):
+ r"""
+@@ -391,7 +391,7 @@ class Tachyon(WithEqualityById, SageObject):
+ self._camera_position = (-3, 0, 0) # default value
+ self._updir = updir
+ self._projection = projection
+- self._focallength = focallength
++ self._FOCALDIST = FOCALDIST
+ self._aperture = aperture
+ self._frustum = frustum
+ self._objects = []
+@@ -624,9 +624,9 @@ class Tachyon(WithEqualityById, SageObject):
+ camera_out = r"""
+ camera
+ projection %s""" % (tostr(self._projection))
+- if self._focallength != '':
++ if self._FOCALDIST != '':
+ camera_out = camera_out + r"""
+- focallength %s""" % (float(self._focallength))
++ FOCALDIST %s""" % (float(self._FOCALDIST))
+ if self._aperture != '':
+ camera_out = camera_out + r"""
+ aperture %s""" % (float(self._aperture))
More information about the arch-commits
mailing list