Merge pull request #809 from MediaArea/master

Preparing v1.3

License.html

@@ -13,7 +13,7 @@
             Copyright ©: 2018-2020, <a href="mailto:[email protected]">RiceCapades</a> &amp; <a href="mailto:[email protected]">MediaArea.net SARL</a>. All Rights Reserved.
         </p>
         <p>
-            Version 1.2.1
+            Version 1.3
         </p>
         <p>
             QCTools is licensed under a GPLv3 License.

Project/GNU/GUI/qctools.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=1.2.1
+Version=1.3
 Name=QCTools
 GenericName=QCTools
 Comment=QCTools

Project/GNU/PKGBUILD

@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: MediaArea.net SARL <[email protected]>
 
-pkgname=qctools
-pkgver=1.2.1
+pkgname=('qctools' 'qcli')
+pkgver=1.3
 pkgrel=1
 pkgdesc="QCTools (Quality Control Tools for Video Preservation)"
 url="http://mediaarea.net"
@@ -11,19 +11,26 @@ source=(${pkgname}_${pkgver}-1.tar.gz)
 md5sums=('00000000000000000000000000000000')
 arch=('i686' 'x86_64')
 
-depends=('qt5-base' 'bzip2' 'zlib' 'cmake' 'yasm')
+depends=('qt5-base' 'qt5-multimedia' 'qt5-declarative' 'bzip2' 'zlib' 'yasm')
 
 build() {
     cd "${srcdir}/qctools/qctools"
     ./Project/BuildAllFromSource/build
 }
 
-package() {
-    install -D -m 0755 "${srcdir}"/qctools/qctools/Project/QtCreator/QCTools "${pkgdir}"/usr/bin/QCTools
+package_qctools() {
+    pkgdesc="${pkgdesc}"
+    install -D -m 0755 "${srcdir}"/qctools/qctools/Project/QtCreator/build/qctools-gui/QCTools "${pkgdir}"/usr/bin/QCTools
     install -D -m 0644 "${srcdir}"/qctools/qctools/Source/Resource/Logo.png "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/qctools.png
     install -D -m 0644 "${srcdir}"/qctools/qctools/Source/Resource/Logo.png "${pkgdir}"/usr/share/pixmaps/qctools.png
     install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.desktop "${pkgdir}"/usr/share/applications/qctools.desktop
     install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.kde3.desktop "${pkgdir}"/usr/share/apps/konqueror/servicemenus/qctools.desktop
     install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.kde4.desktop "${pkgdir}"/usr/share/kde4/services/ServiceMenus/qctools.desktop
+    install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.kde4.desktop "${pkgdir}"/usr/share/kservices5/ServiceMenus/qctools.desktop
+    install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.metainfo.xml "${pkgdir}"/usr/share/metainfo/qctools.metainfo.xml
 }
 
+package_qcli() {
+    pkgdesc="${pkgdesc} (CLI)"
+    install -D -m 0755 "${srcdir}"/qctools/qctools/Project/QtCreator/build/qctools-cli/qcli "${pkgdir}"/usr/bin/qcli
+}

Project/GNU/qctools.dsc

@@ -1,18 +1,17 @@
-Format: 1.0
+Format: 3.0 (quilt)
 Source: qctools
-Binary: qctools, qctools-dbg
+Binary: qctools, qctools-dbg, qcli, qcli-dbg
 Architecture: any
-Version: 1.2.1
+Version: 1.3-1
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://www.bavc.org/qctools
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libbz2-dev, pkg-config, cmake, yasm
+Build-Depends: debhelper (>= 9), qtbase5-dev, qtdeclarative5-dev, libqt5svg5-dev, libqt5xmlpatterns5-dev, qtmultimedia5-dev, qtquickcontrols2-5-dev, libqt5opengl5-dev, qtchooser, libegl1-mesa-dev, libxv-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-xfixes0-dev, libxcb-shape0-dev, zlib1g-dev, libbz2-dev, pkg-config, yasm
 Package-List:
+ qcli deb utils optional arch=any
+ qcli-dbg deb debug optional arch=any
  qctools deb utils optional arch=any
  qctools-dbg deb debug optional arch=any
-Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 qctools_1.2.1.tar.gz
-Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 qctools_1.2.1.tar.gz
 Files:
- 00000000000000000000000000000000 000000 qctools_1.2.1.tar.gz
+ 00000000000000000000000000000000 000000 qctools_1.3.orig.tar.xz
+ 00000000000000000000000000000000 000000 qctools_1.3-1.debian.tar.xz

Project/GNU/qctools.spec

@@ -1,4 +1,6 @@
-%define qctools_version           1.2.1
+%define qctools_version           1.3
+%define debug_package %{nil}
+%define _unpackaged_files_terminate_build 0
 
 Name:           qctools
 Version:        %{qctools_version}
@@ -11,6 +13,7 @@ URL:            http://MediaArea.net
 Packager:       MediaArea.net SARL <[email protected]>
 Source0:        %{name}_%{version}-1.tar.gz
 
+Prefix:         %{_prefix}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -22,42 +25,80 @@ BuildRequires: bzip2-devel
 BuildRequires:  libbz2-devel
 %endif
 %endif
-%if ! 0%{?rhel}
 BuildRequires:  yasm
-%endif
 BuildRequires:  cmake
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
 
-%if 0%{?suse_version} || 0%{?rhel}
+%if 0%{?rhel} > 7
+BuildRequires:  alternatives
+%endif
+
 %if 0%{?suse_version} >= 1200
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
-%else
-BuildRequires:  libqt4-devel
-%endif
+BuildRequires:  pkgconfig(Qt5QuickControls2)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  libXv-devel
 %endif
 
-%if 0%{?fedora}
+%if 0%{?fedora_version} ||  0%{?rhel} > 7
 BuildRequires:  pkgconfig(Qt5)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5QuickControls2)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  desktop-file-utils
+BuildRequires:  libXv-devel
 %endif
 
 %if 0%{?mageia}
 %ifarch x86_64
-BuildRequires:  lib64qt5base5-devel
 BuildRequires:  lib64bzip2-devel
+BuildRequires:  lib64qt5qml-devel
+BuildRequires:  lib64qt5base5-devel
+BuildRequires:  lib64qt5quicktemplates2-devel
+BuildRequires:  lib64qt5quicktemplates2_5
+BuildRequires:  lib64qt5quickcontrols2-devel
+BuildRequires:  lib64qt5quickcontrols2_5
+BuildRequires:  lib64qt5quickwidgets-devel
+BuildRequires:  lib64qt5multimedia-devel
+BuildRequires:  lib64qt5svg-devel
+BuildRequires:  lib64qt5xmlpatterns-devel
+BuildRequires:  lib64qt5xmlpatterns5
 %else
-BuildRequires:  libqt5base5-devel
 BuildRequires:  libbzip2-devel
+BuildRequires:  libqt5qml-devel
+BuildRequires:  libqt5base5-devel
+BuildRequires:  libqt5quicktemplates2-devel
+BuildRequires:  libqt5quicktemplates2_5
+BuildRequires:  libqt5quickcontrols2-devel
+BuildRequires:  libqt5quickcontrols2_5
+BuildRequires:  libqt5quickwidgets-devel
+BuildRequires:  libqt5multimedia-devel
+BuildRequires:  libqt5svg-devel
+BuildRequires:  libqt5xmlpatterns-devel
+BuildRequires:  libqt5xmlpatterns5
+%endif
+%if 0%{?mageia} > 5
+BuildRequires:  libproxy-pacrunner
 %endif
 BuildRequires:  sane-backends-iscan
 BuildRequires:  libuuid-devel
 %endif
 
+%package -n qcli
+Summary:  QCTools command line interface
+Group:    Applications/Multimedia
+
 %description
 QCTools (Quality Control Tools for Video Preservation)
 
@@ -67,7 +108,21 @@ to help users detect corruptions or compromises in the results of analog video d
 The goal of the project is to cut down the time it takes to perform high-quality video preservation
 and direct time towards preservation issues that are solvable - for example, identifying tapes
 that would benefit from a second transfer, saving not only the precious time of preservationists
-and institutional resources, but giving collections a necessary advantage in the bigger race against time 
+and institutional resources, but giving collections a necessary advantage in the bigger race against time
+to preserve their significant cultural artifacts. QCTools incorporates archival standards and best practices
+for reformatting and capturing metadata that enables the long-term preservation of and access to the original artifact,
+the digital object, and the associated catalog record.
+
+%description -n qcli
+QCli - QCTools Command Line Interface
+
+QCTools (Quality Control Tools for Video Preservation) is a free and open source software tool
+that helps users analyze and understand their digitized video files through use of audiovisual analytics and filtering
+to help users detect corruptions or compromises in the results of analog video digitization or in born-digital video.
+The goal of the project is to cut down the time it takes to perform high-quality video preservation
+and direct time towards preservation issues that are solvable - for example, identifying tapes
+that would benefit from a second transfer, saving not only the precious time of preservationists
+and institutional resources, but giving collections a necessary advantage in the bigger race against time
 to preserve their significant cultural artifacts. QCTools incorporates archival standards and best practices
 for reformatting and capturing metadata that enables the long-term preservation of and access to the original artifact,
 the digital object, and the associated catalog record.
@@ -77,16 +132,15 @@ the digital object, and the associated catalog record.
 
 # build
 pushd qctools
-	chmod 644 History.txt
-	chmod 644 License.html
-	./Project/BuildAllFromSource/build
+    chmod 644 History.txt
+    chmod 644 License.html
+    ./Project/BuildAllFromSource/build
 popd
 
 %install
-pushd qctools/Project/QtCreator
-	install -dm 755 %{buildroot}%{_bindir}
-	install -m 755 QCTools %{buildroot}%{_bindir}
-popd
+install -dm 755 %{buildroot}%{_bindir}
+install -m 755 qctools/Project/QtCreator/build/qctools-gui/QCTools %{buildroot}%{_bindir}
+install -m 755 qctools/Project/QtCreator/build/qctools-cli/qcli %{buildroot}%{_bindir}
 
 # icon
 install -dm 755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
@@ -108,10 +162,20 @@ install -m 644 qctools/Project/GNU/GUI/qctools.kde3.desktop %{buildroot}/%{_data
 install -dm 755 %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/
 install -m 644 qctools/Project/GNU/GUI/qctools.kde4.desktop \
     %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/qctools.desktop
+install -dm 755 %{buildroot}/%{_datadir}/kservices5/ServiceMenus/
+install -m 644 qctools/Project/GNU/GUI/qctools.kde4.desktop \
+    %{buildroot}/%{_datadir}/kservices5/ServiceMenus/qctools.desktop
 %if 0%{?suse_version}
   %suse_update_desktop_file -n %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/qctools.desktop AudioVideo AudioVideoEditing
+  %suse_update_desktop_file -n %{buildroot}/%{_datadir}/kservices5/ServiceMenus/qctools.desktop AudioVideo AudioVideoEditing
+%endif
+%if %{undefined fedora_version} || 0%{?fedora_version} < 26
+install -dm 755 %{buildroot}%{_datadir}/appdata/
+install -m 644 qctools/Project/GNU/GUI/qctools.metainfo.xml %{buildroot}%{_datadir}/appdata/qctools.appdata.xml
+%else
+install -dm 755 %{buildroot}%{_datadir}/metainfo/
+install -m 644  qctools/Project/GNU/GUI/qctools.metainfo.xml %{buildroot}%{_datadir}/metainfo/qctools.metainfo.xml
 %endif
-
 
 %files
 %defattr(-,root,root,-)
@@ -131,7 +195,21 @@ install -m 644 qctools/Project/GNU/GUI/qctools.kde4.desktop \
 %dir %{_datadir}/kde4/services
 %dir %{_datadir}/kde4/services/ServiceMenus
 %{_datadir}/kde4/services/ServiceMenus/*.desktop
+%dir %{_datadir}/kservices5
+%dir %{_datadir}/kservices5/ServiceMenus
+%{_datadir}/kservices5/ServiceMenus/*.desktop
+%if 0%{?fedora_version} && 0%{?fedora_version} >= 26
+%dir %{_datadir}/metainfo
+%{_datadir}/metainfo/*.xml
+%else
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/*.xml
+%endif
 
+%files -n qcli
+%defattr(-,root,root,-)
+%doc qctools/License.html qctools/History.txt
+%{_bindir}/qcli
 
 %changelog
 * Wed Jan 01 2014 MediaArea.net SARL <[email protected]> - 0.5.0

Project/MSVC2013/GUI/QCTools.rc

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,1,0
- PRODUCTVERSION 1,2,1,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "QCTools"
-            VALUE "FileVersion", "1.2.1.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "QCTools - GUI - MSVC 2017"
             VALUE "LegalCopyright", "BAVC.org"
             VALUE "OriginalFilename", "QCTools.exe"
             VALUE "ProductName", "QCTools"
-            VALUE "ProductVersion", "1.2.1.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

Project/MSVC2015/GUI/QCTools.rc

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,1,0
- PRODUCTVERSION 1,2,1,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "QCTools"
-            VALUE "FileVersion", "1.2.1.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "QCTools - GUI - MSVC 2017"
             VALUE "LegalCopyright", "BAVC.org"
             VALUE "OriginalFilename", "QCTools.exe"
             VALUE "ProductName", "QCTools"
-            VALUE "ProductVersion", "1.2.1.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

Project/Mac/Info.plist

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>BuildMachineOSBuild</key>
+    <string>10K549</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>QCTools</string>
+    <key>CFBundleIconFile</key>
+    <string>Logo</string>
+    <key>CFBundleIdentifier</key>
+    <string>net.mediaarea.qctools.mac</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>QCTools</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.3</string>
+    <key>CFBundleVersion</key>
+    <string>1.3</string>
+    <key>DTCompiler</key>
+    <string></string>
+    <key>DTPlatformBuild</key>
+    <string>4C199</string>
+    <key>DTPlatformVersion</key>
+    <string>GM</string>
+    <key>DTSDKBuild</key>
+    <string>10K549</string>
+    <key>DTSDKName</key>
+    <string>macosx10.12</string>
+    <key>DTXcode</key>
+    <string>0420</string>
+    <key>DTXcodeBuild</key>
+    <string>4C199</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.utilities</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.12</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>(c) MediaArea.net</string>
+    <key>NSMainNibFile</key>
+    <string>MainMenu</string>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false />
+    <key>NSRequiresAquaSystemAppearance</key>
+    <true />
+</dict>
+</plist>

Project/Mac/mkdmg

@@ -10,7 +10,7 @@ VERSION="$2"
 FILES="$3"
 
 APPNAME="QCTools"
-VERSION="1.2.1"
+VERSION="1.3"
 SIGNATURE="MediaArea.net"
 
 DMG="tmp-${APPNAME}.dmg"

Project/version.txt

@@ -1 +1 @@
-1.2.1
+1.3