Skip to content

Commit

Permalink
Updated BuildpyFLTK.cmake.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Apr 12, 2024
1 parent eaec090 commit a0a5b03
Show file tree
Hide file tree
Showing 77 changed files with 199 additions and 207 deletions.
26 changes: 9 additions & 17 deletions cmake/Modules/BuildpyFLTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,15 @@ endif()
set(pyFLTK_CONFIGURE ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py swig --enable-shared)
set(pyFLTK_BUILD ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py build --enable-shared)

#
# Install steps (on Windows, we can just use setup.py install.
# on other platforms we can't, we install a wheel file)
#
if(WIN32)
set(pyFLTK_INSTALL ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py install --enable-shared)
else()
set(pyFLTK_PIP_INSTALL_WHEEL ${PYTHON_EXECUTABLE} -m pip install wheel )
set(pyFLTK_CREATE_WHEELS ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py bdist_wheel)
set(pyFLTK_INSTALL_WHEELS ${CMAKE_COMMAND}
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DWHL_DIRECTORY=${CMAKE_BINARY_DIR}/pyFLTK-prefix/src/pyFLTK/dist
-P "${CMAKE_SOURCE_DIR}/cmake/install_whl_files.cmake" )
set(pyFLTK_INSTALL "${pyFLTK_PIP_INSTALL_WHEEL}"
COMMAND "${pyFLTK_CREATE_WHEELS}"
COMMAND "${pyFLTK_INSTALL_WHEELS}")
endif()
set(pyFLTK_PIP_INSTALL_WHEEL ${PYTHON_EXECUTABLE} -m pip install wheel )
set(pyFLTK_CREATE_WHEELS ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py bdist_wheel)
set(pyFLTK_INSTALL_WHEELS ${CMAKE_COMMAND}
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DWHL_DIRECTORY=${CMAKE_BINARY_DIR}/pyFLTK-prefix/src/pyFLTK/dist
-P "${CMAKE_SOURCE_DIR}/cmake/install_whl_files.cmake" )
set(pyFLTK_INSTALL "${pyFLTK_PIP_INSTALL_WHEEL}"
COMMAND "${pyFLTK_CREATE_WHEELS}"
COMMAND "${pyFLTK_INSTALL_WHEELS}")


ExternalProject_Add(
Expand Down
6 changes: 3 additions & 3 deletions docs/sphinx/en/user_docs/getting_started/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ association).

On Debian (Ubuntu, etc) systems, you would install with::

sudo dpkg -i mrv2-v1.1.1-amd64.tar.gz
sudo dpkg -i mrv2-v1.1.2-amd64.tar.gz
On Red Hat (Rocky Linux, etc), you would install it with::

sudo rpm -i mrv2-v1.1.1-amd64.tar.gz
sudo rpm -i mrv2-v1.1.2-amd64.tar.gz

Once you install it, you can run mrv2 by just typing mrv2 in the shell, as a symlink to the executable is placed in /usr/bin. The installers will also associate file extensions and install an icon for easy starting up in the Desktop icon of the user that installed it. For running mrv2 with the icon, you need to select it and use the right mouse button to open the menu and choose Allow Launch.

If you lack sudo permissions in your organization, you should download the .tar.gz file and you can uncompress it with::

tar -xf mrv2-v1.1.1-amd64.tar.gz
tar -xf mrv2-v1.1.2-amd64.tar.gz
That will create a folder in the direcory you uncompress it from. You can then run mrv2 by using the bash script::

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/en/user_docs/interface/interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ The Timeline menu provides controls for modifying the timeline viewport at the b
.. topic:: Transitions

With this on, you can show audio and video transitions in .otio files.
(Currently not implemented in v1.1.1).
(Currently not implemented in v1.1.2).

.. topic:: Markers

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/en/user_docs/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mrv2 is an open source professional flipbook and review tool for the Visual Effe
mrv2 can handle collections of media sources quickly, loads specialised image formats and displays images with colour management. Users can quickly import, organise and group media into playlists and 'subsets', playing through and looping on media items and adding review notes and sketched annotations, allowing one to view the media in a highly interactive and collaborative way. This enables workflows that are essential for teams in VFX, animation and other post-production activities who need to see, on demand, the artwork that they and their colleagues are creating. For example one can jump between the viewed media source instantaneously, inspect pixels close-up, do frame-by-frame comparisons across multiple media sources, annotate the media with drawings and captions or add feedback notes to share.


Current Version: v1.1.1 - Overview
Current Version: v1.1.2 - Overview
**********************************

This version of the application is a robust and high performance playback and review solution. mrv2 has been deployed at multiple facilities and is used by multiple individuals daily since August 2022.
Expand Down
8 changes: 4 additions & 4 deletions docs/sphinx/es/user_docs/getting_started/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Instalando mrv2
- En macOS usted lo instala abriendo el archivo .dmg, y llevando el ícono de mrv2 icon al directorio de Aplicaciones. Si ya hay una versión de mrv2, le recomendamos que la sobreescriba. La aplicación de macOS actualmente no está notarizada, por lo que cuando la ejecute macOS le avisará que el archivo no es seguro porque fue bajado de la internet. Para evitar eso, necesita abrir el Finder, ir al directorio de Aplicaciones y presionar CTRL + boton izquierdo del ratón sobre la aplicación mrv2. Esta acción traerá la misma advertencia, pero esta vez tendrá un botón que le permitirá abrirlo. Necesitará hacer esto sólo una vez.

- Windows y Chrome, como macOS, también te protejen de instalar archivos de Internet. Cuando lo baja con Chrome puede que le avise que no es un archivo usual para ser bajado. Asegúrese de cliquear en el menu de la flecha derecha arriba para seleccionar "Grabar de todas formas". No puede ejecutar un .exe directo de Chrome. Tendra que abrir la carpeta contenedora o usar Windows Explorer e ir al directorio de Descargas. Luego deberá correrlo desde ahí. Windows le abrirá un mensaje Azul avisándole que SmartScreen previno el arranque de una aplicación desconocidas y que puede poner a su PC en peligro. Cliquée en Más Informacion y un botón que dice Correr de todas formas o similar aparecerá. Cliquee en él y siga las intruciones usuales del instalador de Windows.
Para asociar los archivos, tiene que manualmente seleccionar el tipo de
Para asociar los archivos, tiene que manualmente seleccionar el tipo de
archivo y usar BDR->Abrir Con. Si instaló mrv2 con el instalador .exe,
puede asociar los archivos a una version específica que tenga instalada o bien
a la última versión (Lo recomendable, así no tendrá que re-asociar los archivos
Expand All @@ -28,11 +28,11 @@ cada vez que descarga una nueva versión).

En Debian (Ubuntu, etc), lo instalaría con::

sudo dpkg -i mrv2-v1.1.1-amd64.tar.gz
sudo dpkg -i mrv2-v1.1.2-amd64.tar.gz
En Red Hat (Rocky Linux, etc), lo instalaría con::

sudo rpm -i mrv2-v1.1.1-amd64.tar.gz
sudo rpm -i mrv2-v1.1.2-amd64.tar.gz

Una vez que lo instala, puede correr mrv2 tipeando::

Expand All @@ -44,7 +44,7 @@ Para correr mrv2 con el ícono, necesita seleccionarlo y usar el botón derecho

Si no tiene permisos de super usuario en su organización, debería bajar el archivo .tar.gz y descomprimirlo con::

tar -xf mrv2-v1.1.1-amd64.tar.gz
tar -xf mrv2-v1.1.2-amd64.tar.gz
Eso creará una carpeta en el directorio desde donde lo descomprimió. Podrá correr mrv2 usando el script de bash::

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/es/user_docs/interface/interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ El menú de línea de tiempo provee controles para modificar la ventana gráfica

Con esto prendido, podés mostrar las transiciones de audio y vídeo en
archivos .otio.
(Actualmente no implementado en v1.1.1).
(Actualmente no implementado en v1.1.2).

.. topic:: Marcadores

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/es/user_docs/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mrv2 es un flipbook profesional y herramienta de revisión de código abierto pa
mrv2 puede manejar colecciones de medios rápidamente, carga una multitud de formatos de imagen y video especializados y muestra la imágenes con manejo de color. Los usuarios pueden importar, organizar y agrupar medios en listas de reproducción de OTIO, reproduciendo items y agregando notas de revisiones y anotaciones dibujadas, permitiendo visualizar el contenido en forma interactiva y colaborativa. Esto permite el flujo que es esencial para los equipos de efectos visuales, animación y otras actividades de post-production que necesitan ver, en demanda, el arte que ellos y sus colegas están creando. Por ejemplo, uno puede cambiar de fuente de medios instantáneamente, inspeccionar pixels de cerca, hacer comparaciones cuadro a cuadro a través de multiple fuentes de medios, anotar los medios con dibujos y texto o agregar notas para compartir con otros.


Versión Actual: v1.1.1 - Descripción General
Versión Actual: v1.1.2 - Descripción General
********************************************

Esta versión de la aplicación es una solución de revisión sólida y robusta. mrv2 ha sido desplegado en múltiples estudios y es usado por múltiples individuos diariamente desde Augosto del 2022.
Expand Down
2 changes: 1 addition & 1 deletion mrv2/docs/en/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: a37ad846daa2a2c25b23780e3d138240
config: 4afbb65c131c8f1447e5cf65b45884d8
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion mrv2/docs/en/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const DOCUMENTATION_OPTIONS = {
VERSION: 'v1.1.1',
VERSION: 'v1.1.2',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
4 changes: 2 additions & 2 deletions mrv2/docs/en/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Index &mdash; mrv2 v1.1.1 documentation</title>
<title>Index &mdash; mrv2 v1.1.2 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="_static/graphviz.css?v=eafc0fe6" />
Expand All @@ -15,7 +15,7 @@

<script src="_static/jquery.js?v=5d32c60e"></script>
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="_static/documentation_options.js?v=a34f1657"></script>
<script src="_static/documentation_options.js?v=94b79c3d"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions mrv2/docs/en/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Welcome to mrv2’s documentation! &mdash; mrv2 v1.1.1 documentation</title>
<title>Welcome to mrv2’s documentation! &mdash; mrv2 v1.1.2 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="_static/graphviz.css?v=eafc0fe6" />
Expand All @@ -16,7 +16,7 @@

<script src="_static/jquery.js?v=5d32c60e"></script>
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="_static/documentation_options.js?v=a34f1657"></script>
<script src="_static/documentation_options.js?v=94b79c3d"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions mrv2/docs/en/py-modindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Python Module Index &mdash; mrv2 v1.1.1 documentation</title>
<title>Python Module Index &mdash; mrv2 v1.1.2 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="_static/graphviz.css?v=eafc0fe6" />
Expand All @@ -15,7 +15,7 @@

<script src="_static/jquery.js?v=5d32c60e"></script>
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="_static/documentation_options.js?v=a34f1657"></script>
<script src="_static/documentation_options.js?v=94b79c3d"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions mrv2/docs/en/python_api/annotations.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>annotations module &mdash; mrv2 v1.1.1 documentation</title>
<title>annotations module &mdash; mrv2 v1.1.2 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="../_static/graphviz.css?v=eafc0fe6" />
Expand All @@ -16,7 +16,7 @@

<script src="../_static/jquery.js?v=5d32c60e"></script>
<script src="../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="../_static/documentation_options.js?v=a34f1657"></script>
<script src="../_static/documentation_options.js?v=94b79c3d"></script>
<script src="../_static/doctools.js?v=888ff710"></script>
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions mrv2/docs/en/python_api/cmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>cmd module &mdash; mrv2 v1.1.1 documentation</title>
<title>cmd module &mdash; mrv2 v1.1.2 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="../_static/graphviz.css?v=eafc0fe6" />
Expand All @@ -16,7 +16,7 @@

<script src="../_static/jquery.js?v=5d32c60e"></script>
<script src="../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="../_static/documentation_options.js?v=a34f1657"></script>
<script src="../_static/documentation_options.js?v=94b79c3d"></script>
<script src="../_static/doctools.js?v=888ff710"></script>
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
Expand Down Expand Up @@ -173,7 +173,7 @@

<dl class="py function">
<dt class="sig sig-object py" id="mrv2.cmd.getLayers">
<span class="sig-prename descclassname"><span class="pre">mrv2.cmd.</span></span><span class="sig-name descname"><span class="pre">getLayers</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">List</span><span class="p"><span class="pre">[</span></span><span class="pre">str</span><span class="p"><span class="pre">]</span></span></span></span><a class="headerlink" href="#mrv2.cmd.getLayers" title="Link to this definition"></a></dt>
<span class="sig-prename descclassname"><span class="pre">mrv2.cmd.</span></span><span class="sig-name descname"><span class="pre">getLayers</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">list</span><span class="p"><span class="pre">[</span></span><span class="pre">str</span><span class="p"><span class="pre">]</span></span></span></span><a class="headerlink" href="#mrv2.cmd.getLayers" title="Link to this definition"></a></dt>
<dd><p>Get the layers of the timeline (GUI).</p>
</dd></dl>

Expand Down Expand Up @@ -221,7 +221,7 @@

<dl class="py function">
<dt class="sig sig-object py" id="mrv2.cmd.save">
<span class="sig-prename descclassname"><span class="pre">mrv2.cmd.</span></span><span class="sig-name descname"><span class="pre">save</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">file:</span> <span class="pre">str</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">options:</span> <span class="pre">mrv2.io.SaveOptions</span> <span class="pre">=</span> <span class="pre">&lt;mrv2.io.SaveOptions</span>&#160; <span class="pre">annotations=False</span> <span class="pre">ffmpegProfile=None</span> <span class="pre">ffmpegAudioCodec=AAC</span> <span class="pre">exrCompression=ZIP</span> <span class="pre">zipCompressionLevel=4</span> <span class="pre">dwaCompressionLevel=45&gt;</span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">None</span></span></span><a class="headerlink" href="#mrv2.cmd.save" title="Link to this definition"></a></dt>
<span class="sig-prename descclassname"><span class="pre">mrv2.cmd.</span></span><span class="sig-name descname"><span class="pre">save</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">file:</span> <span class="pre">str</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">options:</span> <span class="pre">mrv2.io.SaveOptions</span> <span class="pre">=</span> <span class="pre">&lt;mrv2.io.SaveOptions</span> <span class="pre">annotations=False</span> <span class="pre">ffmpegProfile=None</span> <span class="pre">ffmpegAudioCodec=AAC</span> <span class="pre">exrCompression=ZIP</span> <span class="pre">zipCompressionLevel=4</span> <span class="pre">dwaCompressionLevel=45&gt;</span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">None</span></span></span><a class="headerlink" href="#mrv2.cmd.save" title="Link to this definition"></a></dt>
<dd><p>Save a movie or sequence from the front layer.</p>
</dd></dl>

Expand Down
Loading

0 comments on commit a0a5b03

Please sign in to comment.