Skip to content

Commit e8f4636

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #809 from MediaArea/master
Preparing v1.3
2 parents dbb860c + a34e534 commit e8f4636

13 files changed

Lines changed: 187 additions & 49 deletions

File tree

‎License.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Copyright ©: 2018-2020, <a href="mailto:dave@dericed.com">RiceCapades</a> &amp; <a href="mailto:Info@MediaArea.net">MediaArea.net SARL</a>. All Rights Reserved.
1414
</p>
1515
<p>
16-
Version 1.2.1
16+
Version 1.3
1717
</p>
1818
<p>
1919
QCTools is licensed under a GPLv3 License.

‎Project/GNU/GUI/qctools.desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
22
Type=Application
3-
Version=1.2.1
3+
Version=1.3
44
Name=QCTools
55
GenericName=QCTools
66
Comment=QCTools

‎Project/GNU/PKGBUILD‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# $Id$
22
# Maintainer: MediaArea.net SARL <info@mediaarea.net>
33

4-
pkgname=qctools
5-
pkgver=1.2.1
4+
pkgname=('qctools' 'qcli')
5+
pkgver=1.3
66
pkgrel=1
77
pkgdesc="QCTools (Quality Control Tools for Video Preservation)"
88
url="http://mediaarea.net"
@@ -11,19 +11,26 @@ source=(${pkgname}_${pkgver}-1.tar.gz)
1111
md5sums=('00000000000000000000000000000000')
1212
arch=('i686' 'x86_64')
1313

14-
depends=('qt5-base' 'bzip2' 'zlib' 'cmake' 'yasm')
14+
depends=('qt5-base' 'qt5-multimedia' 'qt5-declarative' 'bzip2' 'zlib' 'yasm')
1515

1616
build() {
1717
cd "${srcdir}/qctools/qctools"
1818
./Project/BuildAllFromSource/build
1919
}
2020

21-
package() {
22-
install -D -m 0755 "${srcdir}"/qctools/qctools/Project/QtCreator/QCTools "${pkgdir}"/usr/bin/QCTools
21+
package_qctools() {
22+
pkgdesc="${pkgdesc}"
23+
install -D -m 0755 "${srcdir}"/qctools/qctools/Project/QtCreator/build/qctools-gui/QCTools "${pkgdir}"/usr/bin/QCTools
2324
install -D -m 0644 "${srcdir}"/qctools/qctools/Source/Resource/Logo.png "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/qctools.png
2425
install -D -m 0644 "${srcdir}"/qctools/qctools/Source/Resource/Logo.png "${pkgdir}"/usr/share/pixmaps/qctools.png
2526
install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.desktop "${pkgdir}"/usr/share/applications/qctools.desktop
2627
install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.kde3.desktop "${pkgdir}"/usr/share/apps/konqueror/servicemenus/qctools.desktop
2728
install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.kde4.desktop "${pkgdir}"/usr/share/kde4/services/ServiceMenus/qctools.desktop
29+
install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.kde4.desktop "${pkgdir}"/usr/share/kservices5/ServiceMenus/qctools.desktop
30+
install -D -m 0644 "${srcdir}"/qctools/qctools/Project/GNU/GUI/qctools.metainfo.xml "${pkgdir}"/usr/share/metainfo/qctools.metainfo.xml
2831
}
2932

33+
package_qcli() {
34+
pkgdesc="${pkgdesc} (CLI)"
35+
install -D -m 0755 "${srcdir}"/qctools/qctools/Project/QtCreator/build/qctools-cli/qcli "${pkgdir}"/usr/bin/qcli
36+
}

‎Project/GNU/qctools.dsc‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
Format: 1.0
1+
Format: 3.0 (quilt)
22
Source: qctools
3-
Binary: qctools, qctools-dbg
3+
Binary: qctools, qctools-dbg, qcli, qcli-dbg
44
Architecture: any
5-
Version: 1.2.1
5+
Version: 1.3-1
66
Maintainer: MediaArea.net SARL <info@mediaarea.net>
77
Homepage: http://www.bavc.org/qctools
88
Standards-Version: 3.7.3
9-
Build-Depends: debhelper (>= 5), libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libbz2-dev, pkg-config, cmake, yasm
9+
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
1010
Package-List:
11+
qcli deb utils optional arch=any
12+
qcli-dbg deb debug optional arch=any
1113
qctools deb utils optional arch=any
1214
qctools-dbg deb debug optional arch=any
13-
Checksums-Sha1:
14-
0000000000000000000000000000000000000000 000000 qctools_1.2.1.tar.gz
15-
Checksums-Sha256:
16-
0000000000000000000000000000000000000000000000000000000000000000 000000 qctools_1.2.1.tar.gz
1715
Files:
18-
00000000000000000000000000000000 000000 qctools_1.2.1.tar.gz
16+
00000000000000000000000000000000 000000 qctools_1.3.orig.tar.xz
17+
00000000000000000000000000000000 000000 qctools_1.3-1.debian.tar.xz

‎Project/GNU/qctools.spec‎

Lines changed: 97 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
%define qctools_version 1.2.1
1+
%define qctools_version 1.3
2+
%define debug_package %{nil}
3+
%define _unpackaged_files_terminate_build 0
24

35
Name: qctools
46
Version: %{qctools_version}
@@ -11,6 +13,7 @@ URL: http://MediaArea.net
1113
Packager: MediaArea.net SARL <info@mediaarea.net>
1214
Source0: %{name}_%{version}-1.tar.gz
1315

16+
Prefix: %{_prefix}
1417
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1518
BuildRequires: gcc-c++
1619
BuildRequires: pkgconfig
@@ -22,42 +25,80 @@ BuildRequires: bzip2-devel
2225
BuildRequires: libbz2-devel
2326
%endif
2427
%endif
25-
%if ! 0%{?rhel}
2628
BuildRequires: yasm
27-
%endif
2829
BuildRequires: cmake
2930
%if 0%{?suse_version}
3031
BuildRequires: update-desktop-files
3132
%endif
3233

33-
%if 0%{?suse_version} || 0%{?rhel}
34+
%if 0%{?rhel} > 7
35+
BuildRequires: alternatives
36+
%endif
37+
3438
%if 0%{?suse_version} >= 1200
39+
BuildRequires: pkgconfig(Qt5Qml)
40+
BuildRequires: pkgconfig(Qt5Svg)
3541
BuildRequires: pkgconfig(Qt5Core)
3642
BuildRequires: pkgconfig(Qt5Widgets)
43+
BuildRequires: pkgconfig(Qt5Network)
3744
BuildRequires: pkgconfig(Qt5Concurrent)
3845
BuildRequires: pkgconfig(Qt5PrintSupport)
39-
%else
40-
BuildRequires: libqt4-devel
41-
%endif
46+
BuildRequires: pkgconfig(Qt5QuickControls2)
47+
BuildRequires: pkgconfig(Qt5XmlPatterns)
48+
BuildRequires: pkgconfig(Qt5Multimedia)
49+
BuildRequires: libXv-devel
4250
%endif
4351

44-
%if 0%{?fedora}
52+
%if 0%{?fedora_version} || 0%{?rhel} > 7
4553
BuildRequires: pkgconfig(Qt5)
54+
BuildRequires: pkgconfig(Qt5Qml)
55+
BuildRequires: pkgconfig(Qt5QuickControls2)
56+
BuildRequires: pkgconfig(Qt5Svg)
57+
BuildRequires: pkgconfig(Qt5XmlPatterns)
58+
BuildRequires: pkgconfig(Qt5Multimedia)
4659
BuildRequires: desktop-file-utils
60+
BuildRequires: libXv-devel
4761
%endif
4862

4963
%if 0%{?mageia}
5064
%ifarch x86_64
51-
BuildRequires: lib64qt5base5-devel
5265
BuildRequires: lib64bzip2-devel
66+
BuildRequires: lib64qt5qml-devel
67+
BuildRequires: lib64qt5base5-devel
68+
BuildRequires: lib64qt5quicktemplates2-devel
69+
BuildRequires: lib64qt5quicktemplates2_5
70+
BuildRequires: lib64qt5quickcontrols2-devel
71+
BuildRequires: lib64qt5quickcontrols2_5
72+
BuildRequires: lib64qt5quickwidgets-devel
73+
BuildRequires: lib64qt5multimedia-devel
74+
BuildRequires: lib64qt5svg-devel
75+
BuildRequires: lib64qt5xmlpatterns-devel
76+
BuildRequires: lib64qt5xmlpatterns5
5377
%else
54-
BuildRequires: libqt5base5-devel
5578
BuildRequires: libbzip2-devel
79+
BuildRequires: libqt5qml-devel
80+
BuildRequires: libqt5base5-devel
81+
BuildRequires: libqt5quicktemplates2-devel
82+
BuildRequires: libqt5quicktemplates2_5
83+
BuildRequires: libqt5quickcontrols2-devel
84+
BuildRequires: libqt5quickcontrols2_5
85+
BuildRequires: libqt5quickwidgets-devel
86+
BuildRequires: libqt5multimedia-devel
87+
BuildRequires: libqt5svg-devel
88+
BuildRequires: libqt5xmlpatterns-devel
89+
BuildRequires: libqt5xmlpatterns5
90+
%endif
91+
%if 0%{?mageia} > 5
92+
BuildRequires: libproxy-pacrunner
5693
%endif
5794
BuildRequires: sane-backends-iscan
5895
BuildRequires: libuuid-devel
5996
%endif
6097

98+
%package -n qcli
99+
Summary: QCTools command line interface
100+
Group: Applications/Multimedia
101+
61102
%description
62103
QCTools (Quality Control Tools for Video Preservation)
63104

@@ -67,7 +108,21 @@ to help users detect corruptions or compromises in the results of analog video d
67108
The goal of the project is to cut down the time it takes to perform high-quality video preservation
68109
and direct time towards preservation issues that are solvable - for example, identifying tapes
69110
that would benefit from a second transfer, saving not only the precious time of preservationists
70-
and institutional resources, but giving collections a necessary advantage in the bigger race against time
111+
and institutional resources, but giving collections a necessary advantage in the bigger race against time
112+
to preserve their significant cultural artifacts. QCTools incorporates archival standards and best practices
113+
for reformatting and capturing metadata that enables the long-term preservation of and access to the original artifact,
114+
the digital object, and the associated catalog record.
115+
116+
%description -n qcli
117+
QCli - QCTools Command Line Interface
118+
119+
QCTools (Quality Control Tools for Video Preservation) is a free and open source software tool
120+
that helps users analyze and understand their digitized video files through use of audiovisual analytics and filtering
121+
to help users detect corruptions or compromises in the results of analog video digitization or in born-digital video.
122+
The goal of the project is to cut down the time it takes to perform high-quality video preservation
123+
and direct time towards preservation issues that are solvable - for example, identifying tapes
124+
that would benefit from a second transfer, saving not only the precious time of preservationists
125+
and institutional resources, but giving collections a necessary advantage in the bigger race against time
71126
to preserve their significant cultural artifacts. QCTools incorporates archival standards and best practices
72127
for reformatting and capturing metadata that enables the long-term preservation of and access to the original artifact,
73128
the digital object, and the associated catalog record.
@@ -77,16 +132,15 @@ the digital object, and the associated catalog record.
77132

78133
# build
79134
pushd qctools
80-
chmod 644 History.txt
81-
chmod 644 License.html
82-
./Project/BuildAllFromSource/build
135+
chmod 644 History.txt
136+
chmod 644 License.html
137+
./Project/BuildAllFromSource/build
83138
popd
84139

85140
%install
86-
pushd qctools/Project/QtCreator
87-
install -dm 755 %{buildroot}%{_bindir}
88-
install -m 755 QCTools %{buildroot}%{_bindir}
89-
popd
141+
install -dm 755 %{buildroot}%{_bindir}
142+
install -m 755 qctools/Project/QtCreator/build/qctools-gui/QCTools %{buildroot}%{_bindir}
143+
install -m 755 qctools/Project/QtCreator/build/qctools-cli/qcli %{buildroot}%{_bindir}
90144

91145
# icon
92146
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
108162
install -dm 755 %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/
109163
install -m 644 qctools/Project/GNU/GUI/qctools.kde4.desktop \
110164
%{buildroot}/%{_datadir}/kde4/services/ServiceMenus/qctools.desktop
165+
install -dm 755 %{buildroot}/%{_datadir}/kservices5/ServiceMenus/
166+
install -m 644 qctools/Project/GNU/GUI/qctools.kde4.desktop \
167+
%{buildroot}/%{_datadir}/kservices5/ServiceMenus/qctools.desktop
111168
%if 0%{?suse_version}
112169
%suse_update_desktop_file -n %{buildroot}/%{_datadir}/kde4/services/ServiceMenus/qctools.desktop AudioVideo AudioVideoEditing
170+
%suse_update_desktop_file -n %{buildroot}/%{_datadir}/kservices5/ServiceMenus/qctools.desktop AudioVideo AudioVideoEditing
171+
%endif
172+
%if %{undefined fedora_version} || 0%{?fedora_version} < 26
173+
install -dm 755 %{buildroot}%{_datadir}/appdata/
174+
install -m 644 qctools/Project/GNU/GUI/qctools.metainfo.xml %{buildroot}%{_datadir}/appdata/qctools.appdata.xml
175+
%else
176+
install -dm 755 %{buildroot}%{_datadir}/metainfo/
177+
install -m 644 qctools/Project/GNU/GUI/qctools.metainfo.xml %{buildroot}%{_datadir}/metainfo/qctools.metainfo.xml
113178
%endif
114-
115179

116180
%files
117181
%defattr(-,root,root,-)
@@ -131,7 +195,21 @@ install -m 644 qctools/Project/GNU/GUI/qctools.kde4.desktop \
131195
%dir %{_datadir}/kde4/services
132196
%dir %{_datadir}/kde4/services/ServiceMenus
133197
%{_datadir}/kde4/services/ServiceMenus/*.desktop
198+
%dir %{_datadir}/kservices5
199+
%dir %{_datadir}/kservices5/ServiceMenus
200+
%{_datadir}/kservices5/ServiceMenus/*.desktop
201+
%if 0%{?fedora_version} && 0%{?fedora_version} >= 26
202+
%dir %{_datadir}/metainfo
203+
%{_datadir}/metainfo/*.xml
204+
%else
205+
%dir %{_datadir}/appdata
206+
%{_datadir}/appdata/*.xml
207+
%endif
134208

209+
%files -n qcli
210+
%defattr(-,root,root,-)
211+
%doc qctools/License.html qctools/History.txt
212+
%{_bindir}/qcli
135213

136214
%changelog
137215
* Wed Jan 01 2014 MediaArea.net SARL <info@mediaarea.net> - 0.5.0

‎Project/MSVC2013/GUI/QCTools.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 1,2,1,0
5-
PRODUCTVERSION 1,2,1,0
4+
FILEVERSION 1,3,0,0
5+
PRODUCTVERSION 1,3,0,0
66
FILEFLAGSMASK 0x17L
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "QCTools"
22-
VALUE "FileVersion", "1.2.1.0"
22+
VALUE "FileVersion", "1.3.0.0"
2323
VALUE "InternalName", "QCTools - GUI - MSVC 2017"
2424
VALUE "LegalCopyright", "BAVC.org"
2525
VALUE "OriginalFilename", "QCTools.exe"
2626
VALUE "ProductName", "QCTools"
27-
VALUE "ProductVersion", "1.2.1.0"
27+
VALUE "ProductVersion", "1.3.0.0"
2828
END
2929
END
3030
BLOCK "VarFileInfo"

‎Project/MSVC2015/GUI/QCTools.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 1,2,1,0
5-
PRODUCTVERSION 1,2,1,0
4+
FILEVERSION 1,3,0,0
5+
PRODUCTVERSION 1,3,0,0
66
FILEFLAGSMASK 0x17L
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "QCTools"
22-
VALUE "FileVersion", "1.2.1.0"
22+
VALUE "FileVersion", "1.3.0.0"
2323
VALUE "InternalName", "QCTools - GUI - MSVC 2017"
2424
VALUE "LegalCopyright", "BAVC.org"
2525
VALUE "OriginalFilename", "QCTools.exe"
2626
VALUE "ProductName", "QCTools"
27-
VALUE "ProductVersion", "1.2.1.0"
27+
VALUE "ProductVersion", "1.3.0.0"
2828
END
2929
END
3030
BLOCK "VarFileInfo"

‎Project/Mac/Info.plist‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildMachineOSBuild</key>
6+
<string>10K549</string>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>English</string>
9+
<key>CFBundleExecutable</key>
10+
<string>QCTools</string>
11+
<key>CFBundleIconFile</key>
12+
<string>Logo</string>
13+
<key>CFBundleIdentifier</key>
14+
<string>net.mediaarea.qctools.mac</string>
15+
<key>CFBundleInfoDictionaryVersion</key>
16+
<string>6.0</string>
17+
<key>CFBundleName</key>
18+
<string>QCTools</string>
19+
<key>CFBundlePackageType</key>
20+
<string>APPL</string>
21+
<key>CFBundleShortVersionString</key>
22+
<string>1.3</string>
23+
<key>CFBundleVersion</key>
24+
<string>1.3</string>
25+
<key>DTCompiler</key>
26+
<string></string>
27+
<key>DTPlatformBuild</key>
28+
<string>4C199</string>
29+
<key>DTPlatformVersion</key>
30+
<string>GM</string>
31+
<key>DTSDKBuild</key>
32+
<string>10K549</string>
33+
<key>DTSDKName</key>
34+
<string>macosx10.12</string>
35+
<key>DTXcode</key>
36+
<string>0420</string>
37+
<key>DTXcodeBuild</key>
38+
<string>4C199</string>
39+
<key>LSApplicationCategoryType</key>
40+
<string>public.app-category.utilities</string>
41+
<key>LSMinimumSystemVersion</key>
42+
<string>10.12</string>
43+
<key>NSHumanReadableCopyright</key>
44+
<string>(c) MediaArea.net</string>
45+
<key>NSMainNibFile</key>
46+
<string>MainMenu</string>
47+
<key>NSPrincipalClass</key>
48+
<string>NSApplication</string>
49+
<key>ITSAppUsesNonExemptEncryption</key>
50+
<false />
51+
<key>NSRequiresAquaSystemAppearance</key>
52+
<true />
53+
</dict>
54+
</plist>

‎Project/Mac/mkdmg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ VERSION="$2"
1010
FILES="$3"
1111

1212
APPNAME="QCTools"
13-
VERSION="1.2.1"
13+
VERSION="1.3"
1414
SIGNATURE="MediaArea.net"
1515

1616
DMG="tmp-${APPNAME}.dmg"

‎Project/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.1
1+
1.3

0 commit comments

Comments
 (0)