Merge branch 'release/2.0.8'

darbyjohnston · Jun 12, 2020 · 00a3824 · 00a3824
2 parents 2bef491 + c12899f
commit 00a3824
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 57 deletions.
diff --git a/cmake/Modules/BuildFFmpeg.cmake b/cmake/Modules/BuildFFmpeg.cmake
@@ -22,6 +22,7 @@ else()
         --disable-avfoundation
         --disable-coreimage
         --disable-audiotoolbox
+        --disable-vaapi
         --enable-pic
         --extra-cflags=${FFmpeg_EXTRA_CFLAGS}
         --extra-cxxflags=${FFmpeg_EXTRA_CXXFLAGS}

diff --git a/docs/_site/build_linux.html b/docs/_site/build_linux.html
@@ -39,7 +39,7 @@
     <p>On CentOS systems you can install the requirements with the
     following command:</p>
     <pre>
-$ sudo yum install centos-release-scl install devtoolset-7-gcc* git mesa-libGL-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel alsa-lib-devel
+$ sudo yum install centos-release-scl install devtoolset-7-gcc* rpm-build git mesa-libGL-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel alsa-lib-devel
 $ scl enable devtoolset-7 bash
 </pre>
     <p>Note that the version of CMake available from your package manager
@@ -94,16 +94,18 @@
 
 <div class="block">
 	<p class="header"><a name="Packaging">Packaging</a></p>
+    <p>Create a release branch:</p>
+    <pre>
+$ git branch -b release/2.0.0
+$ git push -u origin release/2.0.0
+</pre>
+    <p>Update "docs/index.html" with an announcement about the version.</p>
 	<p>Update the version numbers in "docs/download.html" and "docs/djv_install.html".</p>
+    <p>Update the milestone in "docs/download.html".</p>
 	<p>Build the static web site:</p>
     <pre>
 $ cd docs
 $ bundle exec jekyll serve
-</pre>
-	<p>Tag the git repository with the new version:</p>
-	<pre>
-git tag -a 2.0.0 -m "Version 2.0.0"
-git push origin 2.0.0
 </pre>
     <p>Create a release build:</p>
 	<pre>
@@ -138,6 +140,11 @@
 $ cmake ../DJV -DCPACK_GENERATOR=TGZ -DCPACK_PACKAGING_INSTALL_PREFIX= -DDJV_THIRD_PARTY=TRUE
 $ cmake --build .
 $ cmake --build . --target package
+</pre>
+	<p>Tag the git repository with the new version:</p>
+	<pre>
+$ git tag -a 2.0.0 -m "Version 2.0.0"
+$ git push origin 2.0.0
 </pre>
 	<p>Bump the version number in "CMakeLists.txt", "Doxyfile", and "sonar-project.properties".</p>
 </div>

diff --git a/docs/_site/build_windows.html b/docs/_site/build_windows.html
@@ -77,6 +77,7 @@
       --disable-bzlib \
       --disable-iconv \
       --disable-lzma \
+      --disable-vaapi \
       --enable-pic \
       --arch=x86_64 \
       --cross-prefix=x86_64-w64-mingw32- \

diff --git a/docs/_site/djv_install.html b/docs/_site/djv_install.html
@@ -26,7 +26,7 @@
 	<p class="header"><a name="LinuxRPM">Linux RPM</a></p>
 	<p>Installing the RPM package:</p>
 	<pre>
-sudo rpm -i DJV2-2.0.7-1.x86_64.rpm
+sudo rpm -i DJV2-2.0.8-1.x86_64.rpm
 </pre>
     <p>The default installation directory is "/usr/local/DJV2".</p>
     <p>Starting the DJV player:</p>
@@ -43,7 +43,7 @@
 	<p class="header"><a name="LinuxDEB">Linux DEB</a></p>
 	<p>Installing the Debian package:</p>
     <pre>
-sudo dpkg -i DJV2_2.0.7_amd64.deb
+sudo dpkg -i DJV2_2.0.8_amd64.deb
 </pre>
     <p>The default installation directory is "/usr/local/DJV2".</p>
     <p>Starting the DJV viewer:</p>

diff --git a/docs/_site/download.html b/docs/_site/download.html
@@ -15,21 +15,21 @@
         <a class="button" href="mailto:[email protected]">Contact</a>
     </div>
     <div class="block">
-    <p class="header">Version 2.0.7</p>
+    <p class="header">Version 2.0.8</p>
     <p>Linux:
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV2-2.0.7-1.x86_64.rpm/download">RPM</a>,
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV2_2.0.7_amd64.deb/download">DEB</a>,
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-Linux.tar.gz/download">TAR.GZ</a>
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV2-2.0.8-1.x86_64.rpm/download">RPM</a>,
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV2_2.0.8_amd64.deb/download">DEB</a>,
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-Linux.tar.gz/download">TAR.GZ</a>
     </p>
     <p>Apple macOS:
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-Darwin.dmg/download">DMG</a>
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-Darwin.dmg/download">DMG</a>
     </p>
     <p>Microsoft Windows:
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-win64.exe/download">EXE</a>,
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-win64.zip/download">ZIP</a>
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-win64.exe/download">EXE</a>,
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-win64.zip/download">ZIP</a>
     </p>
     <p>The list of changes can be found
-        <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/4?closed=1">here</a>.
+        <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/5?closed=1">here</a>.
     </p>
 </div>
 

diff --git a/docs/_site/index.html b/docs/_site/index.html
@@ -24,6 +24,10 @@
     <a href="https://twitter.com/djv_opensource?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-show-screen-name="false" data-show-count="false">Follow @djv_opensource</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 </div>
 <div class="block">
+    <p><b class="emphasis">2020/06/11 - Version
+    <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/5?closed=1">2.0.8</a>
+    released!</b></p>
+    <p>This version fixes the Linux packages for older systems (CentOS 7 and Ubuntu 18.04).</p>
     <p><b class="emphasis">2020/06/09 - Version
     <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/4?closed=1">2.0.7</a>
     released!</b></p>

diff --git a/docs/build_linux.html b/docs/build_linux.html
@@ -83,7 +83,14 @@
 
 <div class="block">
 	<p class="header"><a name="Packaging">Packaging</a></p>
+    <p>Create a release branch:</p>
+    <pre>
+$ git branch -b release/2.0.0
+$ git push -u origin release/2.0.0
+</pre>
+    <p>Update "docs/index.html" with an announcement about the version.</p>
 	<p>Update the version numbers in "docs/download.html" and "docs/djv_install.html".</p>
+    <p>Update the milestone in "docs/download.html".</p>
 	<p>Build the static web site:</p>
     <pre>
 $ cd docs

diff --git a/docs/build_windows.html b/docs/build_windows.html
@@ -66,6 +66,7 @@
       --disable-bzlib \
       --disable-iconv \
       --disable-lzma \
+      --disable-vaapi \
       --enable-pic \
       --arch=x86_64 \
       --cross-prefix=x86_64-w64-mingw32- \

diff --git a/docs/djv_install.html b/docs/djv_install.html
@@ -15,7 +15,7 @@
 	<p class="header"><a name="LinuxRPM">Linux RPM</a></p>
 	<p>Installing the RPM package:</p>
 	<pre>
-sudo rpm -i DJV2-2.0.7-1.x86_64.rpm
+sudo rpm -i DJV2-2.0.8-1.x86_64.rpm
 </pre>
     <p>The default installation directory is "/usr/local/DJV2".</p>
     <p>Starting the DJV player:</p>
@@ -32,7 +32,7 @@
 	<p class="header"><a name="LinuxDEB">Linux DEB</a></p>
 	<p>Installing the Debian package:</p>
     <pre>
-sudo dpkg -i DJV2_2.0.7_amd64.deb
+sudo dpkg -i DJV2_2.0.8_amd64.deb
 </pre>
     <p>The default installation directory is "/usr/local/DJV2".</p>
     <p>Starting the DJV viewer:</p>

diff --git a/docs/download.html b/docs/download.html
@@ -4,21 +4,21 @@
 ---
 
 <div class="block">
-    <p class="header">Version 2.0.7</p>
+    <p class="header">Version 2.0.8</p>
     <p>Linux:
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV2-2.0.7-1.x86_64.rpm/download">RPM</a>,
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV2_2.0.7_amd64.deb/download">DEB</a>,
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-Linux.tar.gz/download">TAR.GZ</a>
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV2-2.0.8-1.x86_64.rpm/download">RPM</a>,
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV2_2.0.8_amd64.deb/download">DEB</a>,
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-Linux.tar.gz/download">TAR.GZ</a>
     </p>
     <p>Apple macOS:
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-Darwin.dmg/download">DMG</a>
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-Darwin.dmg/download">DMG</a>
     </p>
     <p>Microsoft Windows:
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-win64.exe/download">EXE</a>,
-        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.7/DJV-2.0.7-win64.zip/download">ZIP</a>
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-win64.exe/download">EXE</a>,
+        <a class="text" href="https://sourceforge.net/projects/djv/files/djv-beta/2.0.8/DJV-2.0.8-win64.zip/download">ZIP</a>
     </p>
     <p>The list of changes can be found
-        <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/4?closed=1">here</a>.
+        <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/5?closed=1">here</a>.
     </p>
 </div>
 

diff --git a/docs/index.html b/docs/index.html
@@ -13,6 +13,10 @@
     <a href="https://twitter.com/djv_opensource?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-show-screen-name="false" data-show-count="false">Follow @djv_opensource</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 </div>
 <div class="block">
+    <p><b class="emphasis">2020/06/11 - Version
+    <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/5?closed=1">2.0.8</a>
+    released!</b></p>
+    <p>This version fixes the Linux packages for older systems (CentOS 7 and Ubuntu 18.04).</p>
     <p><b class="emphasis">2020/06/09 - Version
     <a class="text" href="https://github.com/darbyjohnston/DJV/milestone/4?closed=1">2.0.7</a>
     released!</b></p>

diff --git a/etc/Linux/build_linux_deb.sh b/etc/Linux/build_linux_deb.sh
@@ -3,19 +3,19 @@
 # Run this script in the parent directory of the repository.
 
 export DJV_BUILD=$PWD
-export PATH=$DJV_BUILD/DJV-install-Package/bin:$PATH
-export LD_LIBRARY_PATH=$DJV_BUILD/DJV-install-Package/lib:$LD_LIBRARY_PATH
+export PATH=$DJV_BUILD/DJV-install-package/bin:$PATH
+export LD_LIBRARY_PATH=$DJV_BUILD/DJV-install-package/lib:$LD_LIBRARY_PATH
 
-mkdir -p DJV-third-party-Package
-cd DJV-third-party-Package
-cmake ../DJV/third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-Package
+mkdir -p DJV-third-party-package
+cd DJV-third-party-package
+cmake ../DJV/third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-package
 cmake --build . -j 8
 cmake --build . -j 8 --target install
 cd ..
 
-mkdir -p DJV-Package
-cd DJV-Package
-cmake ../DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-Package -DCMAKE_PREFIX_PATH=$DJV_BUILD/DJV-install-Package
+mkdir -p DJV-package
+cd DJV-package
+cmake ../DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-package -DCMAKE_PREFIX_PATH=$DJV_BUILD/DJV-install-package
 cmake --build . -j 8
 
 cmake ../DJV -DCPACK_GENERATOR=DEB -DCPACK_PACKAGING_INSTALL_PREFIX=/usr/local/DJV2 -DDJV_THIRD_PARTY=TRUE

diff --git a/etc/Linux/build_linux_rpm.sh b/etc/Linux/build_linux_rpm.sh
@@ -3,19 +3,19 @@
 # Run this script in the parent directory of the repository.
 
 export DJV_BUILD=$PWD
-export PATH=$DJV_BUILD/DJV-install-Package/bin:$PATH
-export LD_LIBRARY_PATH=$DJV_BUILD/DJV-install-Package/lib:$LD_LIBRARY_PATH
+export PATH=$DJV_BUILD/DJV-install-package/bin:$PATH
+export LD_LIBRARY_PATH=$DJV_BUILD/DJV-install-package/lib:$LD_LIBRARY_PATH
 
-mkdir -p DJV-third-party-Package
-cd DJV-third-party-Package
-cmake ../DJV/third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-Package
+mkdir -p DJV-third-party-package
+cd DJV-third-party-package
+cmake ../DJV/third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-package
 cmake --build . -j 8
 cmake --build . -j 8 --target install
 cd ..
 
-mkdir -p DJV-Package
-cd DJV-Package
-cmake ../DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-Package -DCMAKE_PREFIX_PATH=$DJV_BUILD/DJV-install-Package
+mkdir -p DJV-package
+cd DJV-package
+cmake ../DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-package -DCMAKE_PREFIX_PATH=$DJV_BUILD/DJV-install-package
 cmake --build . -j 8
 
 cmake ../DJV -DCPACK_GENERATOR=RPM -DCPACK_PACKAGING_INSTALL_PREFIX=/usr/local/DJV2 -DDJV_THIRD_PARTY=TRUE

diff --git a/etc/OSX/build_macos_dmg.sh b/etc/OSX/build_macos_dmg.sh
@@ -3,19 +3,19 @@
 # Run this script in the parent directory of the repository.
 
 export DJV_BUILD=$PWD
-export PATH=$DJV_BUILD/DJV-install-Package/bin:$PATH
-export DYLD_LIBRARY_PATH=$DJV_BUILD/DJV-install-Package/lib:$DYLD_LIBRARY_PATH
+export PATH=$DJV_BUILD/DJV-install-package/bin:$PATH
+export DYLD_LIBRARY_PATH=$DJV_BUILD/DJV-install-package/lib:$DYLD_LIBRARY_PATH
 
-mkdir -p DJV-third-party-Package
-cd DJV-third-party-Package
-cmake ../DJV/third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-Package -DCMAKE_FIND_FRAMEWORK="LAST"
+mkdir -p DJV-third-party-package
+cd DJV-third-party-package
+cmake ../DJV/third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-package -DCMAKE_FIND_FRAMEWORK="LAST"
 cmake --build . -j 8
 cmake --build . -j 8 --target install
 cd ..
 
-mkdir -p DJV-Package
-cd DJV-Package
-cmake ../DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-Package -DCMAKE_PREFIX_PATH=$DJV_BUILD/DJV-install-Package -DCMAKE_FIND_FRAMEWORK="LAST"
+mkdir -p DJV-package
+cd DJV-package
+cmake ../DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DJV_BUILD/DJV-install-package -DCMAKE_PREFIX_PATH=$DJV_BUILD/DJV-install-package -DCMAKE_FIND_FRAMEWORK="LAST"
 cmake --build . -j 8
 
 cmake ../DJV -DDJV_THIRD_PARTY=TRUE

diff --git a/etc/Windows/build_windows_packages.bat b/etc/Windows/build_windows_packages.bat
@@ -1,18 +1,18 @@
 # Run this script in the parent directory of the repository.
 
 set DJV_BUILD=C:/dev
-set PATH=%CD%\DJV-install-Package\bin;%PATH%
+set PATH=%CD%\DJV-install-package\bin;%PATH%
 
-mkdir DJV-third-party-Package
-cd DJV-third-party-Package
-cmake ..\DJV\third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%DJV_BUILD%/DJV-install-Package
+mkdir DJV-third-party-package
+cd DJV-third-party-package
+cmake ..\DJV\third-party -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%DJV_BUILD%/DJV-install-package
 cmake --build . --config Release -j
 cmake --build . --config Release --target install
 cd ..
 
-mkdir DJV-Package
-cd DJV-Package
-cmake ..\DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=%DJV_BUILD%/DJV-install-Package -DCMAKE_INSTALL_PREFIX=%DJV_BUILD%/DJV-install-Package
+mkdir DJV-package
+cd DJV-package
+cmake ..\DJV -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=%DJV_BUILD%/DJV-install-package -DCMAKE_INSTALL_PREFIX=%DJV_BUILD%/DJV-install-package
 cmake --build . --config Release -j
 
 cmake ..\DJV -DDJV_THIRD_PARTY=TRUE