add image for download distros and remove bash

diff --git a/images/download-distros.png b/images/download-distros.png
new file mode 100644 (file)
index 0000000..35aaad8
Binary files /dev/null and b/images/download-distros.png differ

diff --git a/parts/Installation.tex b/parts/Installation.tex
index aa2e3fbbe7c6828ad577916c1438f42e121f2668..28c52f713d38ffc91900dab97bfa14ae7388ed25 100644 (file)
--- a/parts/Installation.tex
+++ b/parts/Installation.tex
@@ -47,7 +47,7 @@ The differences make it possible to have several different versions installed wi
     \item  The \textit{git:} step has to download many files (approx 130\,MB) so allow time.  When decompressed this will expand to about 530 MB.
     \item  Run the following commands (this takes awhile):
 
-        \begin{lstlisting}[language=bash,numbers=none]
+        \begin{lstlisting}[numbers=none]
 $ cd /<build_path>/           # this is where you need the 6.0GB of disk space
 $ git clone --depth 1 "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cinelerra5 
 $ cd cinelerra5/cinelerra-5.1 # toplevel directory
@@ -56,7 +56,7 @@ $ cd cinelerra5/cinelerra-5.1 # toplevel directory
         NOTE: if your system has never had Cinelerra-GG Infinity installed, you will have to make sure you have all of the compilers and libraries necessary.  
         So on the very first build you should run:
 
-        \begin{lstlisting}[language=bash,numbers=none]
+        \begin{lstlisting}[numbers=none]
 $ ./blds/bld_prepare.sh <os> # where <os> represents the Operating System of centos, fedora, suse, ubuntu, mint, debian.
 $ ./autogen.sh
 $ ./configure --prefix=/usr  # optional parameters can be added here
@@ -67,17 +67,17 @@ $ make 2>&1 | tee log        # make and log the build
 
        \url{https://cinelerra-gg.org/download/README.gentoo}}
     \item  Check for obvious build errors:
-        \begin{lstlisting}[language=bash,numbers=none]
+        \begin{lstlisting}[numbers=none]
 $ grep "\*\*\*.*error" -ai log
         \end{lstlisting}
         If this reports errors and you need assistance or you think improvements can be made to the builds,
         email the log which is listed below to: \href{mailto:[email protected]}{[email protected]}
-        \begin{lstlisting}[language=bash,numbers=none]
+        \begin{lstlisting}[numbers=none]
 $ /<build_path>/cinelerra5/cinelerra-5.1/log
         \end{lstlisting}
     \item  If there are no build errors, finally just run:
-        \begin{lstlisting}[language=bash,numbers=none]
-   $  make install
+        \begin{lstlisting}[numbers=none]
+   $ make install
         \end{lstlisting}
     \item  If it all worked, you are all setup. Just click on the Cinelerra desktop icon.
 \end{enumerate}
@@ -88,7 +88,7 @@ $ /<build_path>/cinelerra5/cinelerra-5.1/log
     \item  Recommend you build and run as \textbf{root}, just to avoid permission issues initially.
     \item  The \textit{git} step has to download many files (approx 130\,MB) so allow time.
     \item  Run the following commands (this takes awhile):
-        \begin{lstlisting}[language=bash,numbers=none]
+        \begin{lstlisting}[numbers=none]
 $ cd /<build_path>/           # this is where you need the 6GB of disk space
 $ git clone --depth 1 "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cinelerra5 
 $ cd cinelerra5/cinelerra-5.1 # toplevel directory
@@ -98,10 +98,10 @@ $ cd cinelerra5/cinelerra-5.1 # toplevel directory
 NOTE: if your system has never had Cinelerra-GG Infinity installed, you will have to make sure all
 the compilers and libraries necessary are installed. So on the very first build you should run as \textbf{root}:
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./blds/bld_prepare.sh <os>     # where <os> represents the Operating System of centos, fedora, suse, ubuntu, mint, debian.
 $ ./autogen.sh
-$ ./configure --with-single-user # the “with-single-user” parameter makes it so
+$ ./configure --with-single-user # the "with-single-user" parameter makes it so
 $ make 2>&1 | tee log            # make and log build (check for errors before proceeding)
 $ make install
 \end{lstlisting}
@@ -110,7 +110,7 @@ Then just start the application by keying in: \texttt{./cin} in the bin subdirec
 using the appropriate directory to copy the files to, run as \textbf{root}, and edit to correct
 the directory path.  Below are generic directions of how to do this.
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ cd /cinelerra_directory_path
 $ cp -a image/cin.{svg,xpm} /usr/share/pixmaps/.
 $ cp -a image/cin.desktop /usr/share/applications/cin.desktop
@@ -129,12 +129,12 @@ These procedures and the Cinelerra-GG Infinity software have all been run as \te
 
 To see the full list of features use:   
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./configure -help
 \end{lstlisting}
 The default build is a system build which uses:    
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./configure -without-single-user
 \end{lstlisting}
 
@@ -143,24 +143,24 @@ Because this is also the developer build, constant names are used throughout.
 However, you can rename files after the install is complete.
 
 If your operating system has issues with the default install to \texttt{/usr/local}, you might have to change the location to \texttt{/usr} for a system build.  Then you will have to use:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./configure --prefix=/usr
 \end{lstlisting}
 
 If you wish to change the default directory for a system build you will have to add the destination directory path on the \texttt{make install} line.  For example:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ make install DESTDIR=<your selected target directory path>
 \end{lstlisting}
 
 The application name can be set during installation, but defaults to \texttt{cin} so that the GG/Infinity build can coexist with other Cinelerra builds if necessary.  To override the default \texttt{cin} name, use: 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./configure --with-exec-name=cinelerra
 \end{lstlisting}
 
 The home configuration directory can also be set, but default location is \texttt{\$HOME/.bcast5}.  
 For example:
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./configure -with-config-dir=/myusername/.bcast5
 \end{lstlisting}
 
@@ -171,7 +171,7 @@ That is, you will need \$\$ (2 dollar signs) to represent a single dollar sign.
 It may be necessary on some distros which have missing or incomplete up-to-date libraries, to build Cinelerra without Ladspa.  
 To do so, use:
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./configure --prefix=/usr --without-ladspa-build
 \end{lstlisting}
 
@@ -179,7 +179,7 @@ Note that the with-ladspa-dir is the ladspa search path, and exists even if the
 
 Note for 32-bit 14.2 Slackware, Debian, Gentoo, Arch, FreeBSD, before running the configure, you will need to set up the following:
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ export ac_cv_header_xmmintrin_h=no
 $ export FFMPEG_EXTRA_CFG=" --disable-vdpau"
 \end{lstlisting}
@@ -245,7 +245,7 @@ There may be several libraries which need special treatment.
 
 An example of a problem you might encounter with your customized installation is with \texttt{a52dec} which has probes line \texttt{(CHECK\_LIB/CHECK\_HEADERS)} in \texttt{configure.ac}, but \texttt{djbfft} does not.  
 In this case, \texttt{djbfft} is only built because \texttt{a52dec} is built, so if your system has \texttt{a52dec}, set \texttt{a52dec} to auto and see if that problem is solved by retrying the build with:  
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ ./confgure --with-single-user -enable-a52dec=auto .
 \end{lstlisting}
 
@@ -255,7 +255,7 @@ If you need help, email the \texttt{log} and \texttt{config.log}, which is usual
 
 If you have already installed the \texttt{libfdk\_aac} development package on your computer because you prefer this version over the default aac, you will have to do the following to get this alternative operational. The libfdk\_aac library is not a part of Cinelerra by default because it is not license free.
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ export FFMPEG_EXTRA_CFG=" --enable-libfdk-aac --enable-nonfree"
 $ export EXTRA_LIBS=" -lfdk-aac"
 $ for f in `grep -lw aac cinelerra-5.1/ffmpeg/audio/*`; do
@@ -295,7 +295,7 @@ Checking connectivity... done.
 \label{par:update_an_existing_repo}
 The below shows how you can get updates.
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
  $ cd /<repo home>/cin5
  $ git pull
 \end{lstlisting}
@@ -304,7 +304,7 @@ The below shows how you can get updates.
 \label{par:useful_git_commands}
 Some other commands that are useful.
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cin5
 $ git pull         # pull remote changes to the local version
 $ git status       # shows changed files
@@ -317,7 +317,7 @@ $ git clean -i     # interactive clean, use answer 1 to "clean"
 \label{sub:how_to_build_from_a_previous_git_version}
 
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ cd /<path>/cin5_repo
 $ git log
 $ git checkout <version>
@@ -383,7 +383,7 @@ $ ./bld.sh
 
 Then, to run as a developer in the debugger:
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ CFLAGS="-O2 -ggdb" make -j8 rebuild_all
 $ cd cinelerra
 $ gdb ./ci
@@ -417,6 +417,13 @@ For example, in the current case of Leap 15, libx264 and libx265 are not built i
 \section{Download Already Built Cinelerra-GG}%
 \label{sec:download_already_built_cinelerra_gg}
 
+\begin{figure}[htpb]
+    \centering
+    \includegraphics[width=1.0\linewidth]{images/download-distros.png}
+    \caption{Screencast of the website Download page for installing Cinelerra for various O/S.}
+    \label{fig:download-distros}
+\end{figure}
+
 If you prefer to not have to take the time to build Cinelerra-GG Infinity yourself, there are pre-built dynamic or static binaries for various versions of Ubuntu, Mint, Suse, Fedora, Debian, Centos, Arch, and Slackware linux as well as Gentoo and FreeBSD.  
 A Windows 10 version installation is described in \ref{sec:ms_windows10}.
 There are also 32-bit i686 Ubuntu, Debian, and Slackware versions available.  
@@ -433,7 +440,7 @@ Generally all of the necessary libraries are built into the static build, but in
 have to install another library that is being called for.  
 To install the single user builds, download the designated tarball from the \texttt{./tars} subdirectory and unpack as indicated below:
 
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
 $ cd /path
 $ mkdir cin
 $ cd cin
@@ -659,14 +666,14 @@ Then to install the Cinelerra tar files, you will need to start a cygwin console
        \item Download the tar file at:\\
         {\small \url{https://cinelerra-gg.org/download/testing/libxcb-bld.tar.bz2}}
        \item Install libxbc from the tar file -- installs into \texttt{/usr/local} and requires approximately 21MB storage.
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ tar -C /usr/local -xJf /path/libxcb-bld.tar.bz2
 \end{lstlisting}
 The libxcb path repairs an error (XIOError), which stops Cinelerra.
        \item Download the tar file at:\\
        {\small \url{https://cinelerra-gg.org/download/testing/cygcin-bld.tar.bz2}}     
        \item Install cygcin from the tar file - this installs into home directory.  Note this is cygcin NOT cygwin. You must change the \texttt{path} below to the name of the path where you downloaded the tar file.
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ cd
        $ tar -xJf /path/cygcin-bld.tar.bz2
 \end{lstlisting}
@@ -689,11 +696,11 @@ This opens a separate window that can survive a cygwin hang and bugs. Without th
        $ export DISPLAY=:0.0
 \end{lstlisting}
        \item Change directories to where Cinelerra is installed:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ cd /path/cygcin    (NOT cygwin)
 \end{lstlisting}
        \item Finally keyin:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ ./cin
 \end{lstlisting}
 which starts up your 4 Cinelerra windows.
@@ -711,7 +718,7 @@ omissions are applied to this build.
        \item Download and install ffmpeg into /usr/local :
 
        download ffmpeg (currently 4.2.2)
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ cd /tmp
        $ tar -xJf /path/ffmpeg-4.2.2.tar.bz2
        $ cd ffmpeg-4.2.2
@@ -720,7 +727,7 @@ omissions are applied to this build.
        $ make install
 \end{lstlisting}
        \item Download and install a patched libxcb:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ cd /tmp
        $ rm -rf libxcb-1.13/
        $ tar -xf /path/libxcb-1.13.tar.bz2
@@ -734,17 +741,17 @@ omissions are applied to this build.
        $ make install
 \end{lstlisting}
        \item Download cinelerra-gg:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ cd /build_path/
        $ git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git"
        $ cd cinelerra-gg/cinelerra-5.1
 \end{lstlisting}
        \item Apply cygwin patch:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ patch -p2 < blds/cygwin.patch
 \end{lstlisting}
        \item Run the build with:
-\begin{lstlisting}[language=bash,numbers=none]
+\begin{lstlisting}[numbers=none]
        $ ./blds/cygwin.bld
 \end{lstlisting}
 \end{enumerate}