Arch linux -related documentation patch contributed by Alex Combas
parent
e80d72279e
commit
96481b14eb
|
@ -102,34 +102,62 @@ $\text{\$}$ . setpath.sh
|
|||
(note the period at the beginning -- this assumes that you are using \code{bash}).
|
||||
|
||||
\subsection{Building on Arch Linux}
|
||||
You'll first need to install a number of dependencies.
|
||||
There are two ways to install Mitsuba on Archlinux, the Arch way, and the other way.
|
||||
|
||||
First, run
|
||||
The Arch Way is to use the Aur software repository.
|
||||
Accessing software in the Aur repository is made a lot easier by using a script called packer.
|
||||
|
||||
First download packer then use makepkg to build and install it.
|
||||
The -is flags will prompt you for your sudo password and then install the package after it has finished building as well as install any needed dependencies.
|
||||
\begin{shell}
|
||||
$\text{\$}$ pacman -S mercurial openexr gcc xerces-c boost libjpeg libpng qt libxmu libxi mesa pcre libxml2 scons
|
||||
$\text{\$}$ mkdir packer && cd packer
|
||||
$\text{\$}$ wget http://aur.archlinux.org/packages/packer/packer/PKGBUILD
|
||||
$\text{\$}$ makepkg -is
|
||||
\end{shell}
|
||||
Some of the extra dependencies must be built manually:
|
||||
|
||||
Next use packer to automatically download, build, and install Mitsuba as well as any needed dependencies.
|
||||
The optional --noedit flag is used if you do not wish to edit the files after they are downloaded.
|
||||
The optional --noconfirm flag is used if you do not wish to confirm each step of the installation.
|
||||
\begin{shell}
|
||||
$\text{\$}$ wget https://www.mitsuba-renderer.org/releases/contrib/archlinux/glewmx/PKGBUILD
|
||||
$\text{\$}$ makepkg
|
||||
$\text{\$}$ sudo pacman -U glewmx-*.xz
|
||||
$\text{\$}$ sudo packer -S --noedit --noconfirm mitsuba-hg glewmx collada-dom
|
||||
\end{shell}
|
||||
and similar for \texttt{https://www.mitsuba-renderer.org/releases/contrib/archlin}-
|
||||
\texttt{ux/collada-dom/PKGBUILD}.
|
||||
Afterwards, simply run
|
||||
|
||||
Periodically you may wish to update Mitsuba to the latest version.
|
||||
To do this simply reinstall it and packer will pull and build the latest version.
|
||||
\begin{shell}
|
||||
$\text{\$}$ scons
|
||||
$\text{\$}$ sudo packer -S --noedit --noconfirm mitsuba-hg
|
||||
\end{shell}
|
||||
inside the Mitsuba directory. In the case that you have multiple processors, you might want to parallelize the build by appending \code{-j }\emph{core count} to the command.
|
||||
If all goes well, SCons should finish successfully within a few minutes:
|
||||
|
||||
Alternatively you can skip using packer and manually download the files and install them one at a time yourself.
|
||||
First install glewmx
|
||||
\begin{shell}
|
||||
scons: $\texttt{done}$ building targets.
|
||||
$\text{\$}$ mkdir glewmx && cd glewmx
|
||||
$\text{\$}$ wget http://aur.archlinux.org/packages/glewmx/glewmx/PKGBUILD
|
||||
$\text{\$}$ makepkg -is
|
||||
\end{shell}
|
||||
To be able to run the renderer from the command line, you will also have to import it into your path:
|
||||
|
||||
And then collada-dom
|
||||
\begin{shell}
|
||||
$\text{\$}$ . setpath.sh
|
||||
$\text{\$}$ mkdir collada-dom && cd collada-dom
|
||||
$\text{\$}$ wget http://aur.archlinux.org/packages/collada-dom/collada-dom/PKGBUILD
|
||||
$\text{\$}$ makepkg -is
|
||||
\end{shell}
|
||||
(note the period at the beginning -- this assumes that you are using \code{bash}).
|
||||
|
||||
And finally Mitsuba
|
||||
\begin{shell}
|
||||
$\text{\$}$ mkdir mitsuba-hg && cd mitsuba-hg
|
||||
$\text{\$}$ wget http://aur.archlinux.org/packages/mitsuba-hg/mitsuba-hg/PKGBUILD
|
||||
$\text{\$}$ makepkg -is
|
||||
\end{shell}
|
||||
|
||||
To uninstall do this
|
||||
\begin{shell}
|
||||
$\text{\$}$ sudo pacman -R mitsuba-hg glewmx collada-dom
|
||||
\end{shell}
|
||||
|
||||
After installing you will be able to run the renderer from the command line.
|
||||
|
||||
If for some reason you are unable access the Aur files, they are also hosted at (\url{https://www.mitsuba-renderer.org/releases/contrib/archlinux/})
|
||||
|
||||
|
||||
\subsection{Building on Windows}
|
||||
|
@ -152,7 +180,7 @@ build Mitsuba in 32-bit mode (i.e. you should use the configuration file \code{c
|
|||
your own 64-bit Qt binaries.
|
||||
|
||||
Having installed these dependencies, run the ``Visual Studio 2008 Command
|
||||
Prompt'' from the Start Menu (pick the \code{x86} version if you have the choice beetween \code{x86} and \code{x64}). Afterwards,
|
||||
Prompt'' from the Start Menu (pick the \code{x86} version if you have the choice between \code{x86} and \code{x64}). Afterwards,
|
||||
navigate to the Mitsuba directory and run \code{scons}.
|
||||
In the case that you have multiple processors, you might want to parallelize the build by appending \code{-j }\emph{core count} to the \code{scons} command.
|
||||
|
||||
|
@ -188,7 +216,7 @@ root directory and only add the \code{src} and \code{include} subdirectories.
|
|||
This is crucial for IntelliSense to work.
|
||||
Uncheck \emph{Show all files in Solution explorer} and
|
||||
press \emph{Next}.
|
||||
\item Choose \emph{Use external build systen} and press \emph{Next}.
|
||||
\item Choose \emph{Use external build system} and press \emph{Next}.
|
||||
\item In the following, feel free to replace any occurrence of
|
||||
\code{scons} by \code{scons -jX}, where \code{X} is the number of
|
||||
cores in your machine (this will provide faster build times).
|
||||
|
|
|
@ -52,7 +52,7 @@ class mitsuba_material(declarative_property_group):
|
|||
('roughmetal', 'Rough metal', 'Rough conductor (e.g. sand-blasted metal)'),
|
||||
('difftrans', 'Diffuse transmitter', 'Material with an ideally diffuse transmittance'),
|
||||
('microfacet', 'Microfacet', 'Microfacet material (like the rough glass material, but without transmittance)'),
|
||||
('composite', 'Compound material', 'Allows creating mixtures of different materials')
|
||||
('composite', 'Composite material', 'Allows creating mixtures of different materials')
|
||||
],
|
||||
'save_in_preset': True
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue