Fix a logic error
This commit is contained in:
ArsenArsen
parent
69d0796881
commit
010278105d
@ -12,24 +12,16 @@ function addFileIn {
|
||||
echo "Source: \"$2\\$(basename $1)\"; DestDir: \"{app}\\$2\"; Flags: ignoreversion" >> installer.iss
|
||||
}
|
||||
|
||||
function addAllFiles {
|
||||
for file in $1/$2; do addFile "$file"; done
|
||||
}
|
||||
|
||||
ver=$(cat main.cpp | grep setApplicationVersion | sed "s/\\s*a.setApplicationVersion(\"//g" | sed "s/\");//g")
|
||||
|
||||
cd packages/windows
|
||||
cp ../../KShare.exe . || exit 1
|
||||
# BOOOOOOIII Feeels good, it's not powershell.
|
||||
|
||||
sed "s/;VER;/$ver/" installer.iss.pattern.top > installer.iss
|
||||
|
||||
addFile ../../build/QtAV-depends-windows-x86+x64/bin/avcodec-57.dll
|
||||
#addFile ../../build/QtAV-depends-windows-x86+x64/bin/avdevice-57.dll
|
||||
#addFile ../../build/QtAV-depends-windows-x86+x64/bin/avfilter-6.dll
|
||||
addFile ../../build/QtAV-depends-windows-x86+x64/bin/avformat-57.dll
|
||||
addFile ../../build/QtAV-depends-windows-x86+x64/bin/avutil-55.dll
|
||||
#addFile ../../build/QtAV-depends-windows-x86+x64/bin/postproc-54.dll
|
||||
addFile ../../build/QtAV-depends-windows-x86+x64/bin/swresample-2.dll
|
||||
addFile ../../build/QtAV-depends-windows-x86+x64/bin/swscale-4.dll
|
||||
addFile /c/Qt/5.9/mingw53_32/bin/Qt5Core.dll
|
||||
@ -45,9 +37,6 @@ addFile /c/Qt/5.9/mingw53_32/bin/LIBSTDC++-6.DLL
|
||||
addFile /c/Qt/5.9/mingw53_32/bin/LIBWINPTHREAD-1.DLL
|
||||
addFile /c/Qt/5.9/mingw53_32/bin/LIBGCC_S_DW2-1.DLL
|
||||
|
||||
#addAllFiles /c/Qt/5.9/mingw53_32/bin/ '*.dll'
|
||||
#addAllFiles ../../build/QtAV-depends-windows-x86+x64/bin/ '*.dll'
|
||||
|
||||
cat installer.iss.pattern.bottom >> installer.iss
|
||||
"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" installer.iss
|
||||
cp Output/setup.exe ../../installer.exe || exit 1
|
||||
|
||||
@ -3,7 +3,7 @@ A [ShareX](https://getsharex.com/) inspired cross platform utility written with
|
||||
|
||||
|Linux|Windows|OS X|
|
||||
|:---:|:-----:|:--:|
|
||||
|[](https://nativeci.arsenarsen.com/job/KShare)| [](https://nativeci.arsenarsen.com/job/KShare%20Windows%20x86_64/)| Soon |
|
||||
|[](https://nativeci.arsenarsen.com/job/KShare)| [](https://ci.appveyor.com/project/ArsenArsen/kshare)| Soon |
|
||||
## Screenshot
|
||||
Made with KShare itself, of course :)
|
||||
|
||||
|
||||
@ -30,10 +30,7 @@ void hotkeying::load(QString seqName, std::function<void()> func, QString def) {
|
||||
if (hotkeys.contains(seqName)) return;
|
||||
QString k = settings::settings().value(name).toString();
|
||||
if (!k.isEmpty()) {
|
||||
if (!k.isEmpty())
|
||||
h = new QHotkey(QKeySequence(settings::settings().value(k).toString()), true);
|
||||
else
|
||||
h = new QHotkey(def.isEmpty() ? "" : def, true);
|
||||
h = new QHotkey(QKeySequence(k), true);
|
||||
} else
|
||||
h = new QHotkey(def.isEmpty() ? "" : def, true);
|
||||
QObject::connect(h, &QHotkey::activated, func);
|
||||
|
||||
@ -1 +1,255 @@
|
||||
BLANK: FILL IN BEFORE RELEASE
|
||||
Copyright (c) 2017 ArsenArsen
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
This software uses and possibly bundles Qt, OpenSSL, FFMpeg, and QHotkey, whose licenses are respectively:
|
||||
|
||||
------------------------------ Qt:
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
|
||||
|
||||
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
|
||||
Contact: http://www.qt.io/licensing/
|
||||
|
||||
|
||||
You may use, distribute and copy the Qt Toolkit under the terms of
|
||||
GNU Lesser General Public License version 3, which is displayed below.
|
||||
This license makes reference to the version 3 of the GNU General
|
||||
Public License, which you can find in the LICENSE.GPLv3 file.
|
||||
|
||||
|
||||
------------------------------ OpenSSL:
|
||||
LICENSE ISSUES
|
||||
==============
|
||||
|
||||
|
||||
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
|
||||
the OpenSSL License and the original SSLeay license apply to the toolkit.
|
||||
See below for the actual license texts.
|
||||
|
||||
|
||||
OpenSSL License
|
||||
---------------
|
||||
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
Original SSLeay License
|
||||
-----------------------
|
||||
|
||||
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
|
||||
------------------------------ FFMpeg:
|
||||
License
|
||||
Most files in FFmpeg are under the GNU Lesser General Public License version 2.1 or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to FFmpeg.
|
||||
Some optional parts of FFmpeg are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
|
||||
Specifically, the GPL parts of FFmpeg are:
|
||||
libpostproc
|
||||
optional x86 optimization in the files
|
||||
libavcodec/x86/flac_dsp_gpl.asm
|
||||
libavcodec/x86/idct_mmx.c
|
||||
libavfilter/x86/vf_removegrain.asm
|
||||
the following building and testing tools
|
||||
compat/solaris/make_sunver.pl
|
||||
doc/t2h.pm
|
||||
doc/texi2pod.pl
|
||||
libswresample/swresample-test.c
|
||||
tests/checkasm/*
|
||||
tests/tiny_ssim.c
|
||||
the following filters in libavfilter:
|
||||
vf_blackframe.c
|
||||
vf_boxblur.c
|
||||
vf_colormatrix.c
|
||||
vf_cover_rect.c
|
||||
vf_cropdetect.c
|
||||
vf_delogo.c
|
||||
vf_eq.c
|
||||
vf_find_rect.c
|
||||
vf_fspp.c
|
||||
vf_geq.c
|
||||
vf_histeq.c
|
||||
vf_hqdn3d.c
|
||||
vf_interlace.c
|
||||
vf_kerndeint.c
|
||||
vf_mcdeint.c
|
||||
vf_mpdecimate.c
|
||||
vf_owdenoise.c
|
||||
vf_perspective.c
|
||||
vf_phase.c
|
||||
vf_pp.c
|
||||
vf_pp7.c
|
||||
vf_pullup.c
|
||||
vf_repeatfields.c
|
||||
vf_sab.c
|
||||
vf_smartblur.c
|
||||
vf_spp.c
|
||||
vf_stereo3d.c
|
||||
vf_super2xsai.c
|
||||
vf_tinterlace.c
|
||||
vf_uspp.c
|
||||
vsrc_mptestsrc.c
|
||||
Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then the configure parameter --enable-version3 will activate this licensing option for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts, COPYING.GPLv3 to learn the exact legal terms that apply in this case.
|
||||
There are a handful of files under other licensing terms, namely:
|
||||
The files libavcodec/jfdctfst.c, libavcodec/jfdctint_template.c and libavcodec/jrevdct.c are taken from libjpeg, see the top of the files for licensing details. Specifically note that you must credit the IJG in the documentation accompanying your program if you only distribute executables. You must also indicate any changes including additions and deletions to those three files in the documentation.
|
||||
tests/reference.pnm is under the expat license.
|
||||
External libraries
|
||||
FFmpeg can be combined with a number of external libraries, which sometimes affect the licensing of binaries resulting from the combination.
|
||||
Compatible libraries
|
||||
The following libraries are under GPL:
|
||||
frei0r
|
||||
libcdio
|
||||
librubberband
|
||||
libvidstab
|
||||
libx264
|
||||
libx265
|
||||
libxavs
|
||||
libxvid
|
||||
When combining them with FFmpeg, FFmpeg needs to be licensed as GPL as well by passing --enable-gpl to configure.
|
||||
The OpenCORE and VisualOn libraries are under the Apache License 2.0. That license is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of those licenses. So to combine these libraries with FFmpeg, the license version needs to be upgraded by passing --enable-version3 to configure.
|
||||
Incompatible libraries
|
||||
There are certain libraries you can combine with FFmpeg whose licenses are not compatible with the GPL and/or the LGPL. If you wish to enable these libraries, even in circumstances that their license may be incompatible, pass --enable-nonfree to configure. But note that if you enable any of these libraries the resulting binary will be under a complex license mix that is more restrictive than the LGPL and that may result in additional obligations. It is possible that these restrictions cause the resulting binary to be unredistributable.
|
||||
The Fraunhofer FDK AAC and OpenSSL libraries are under licenses which are incompatible with the GPLv2 and v3. To the best of our knowledge, they are compatible with the LGPL.
|
||||
The NVENC library, while its header file is licensed under the compatible MIT license, requires a proprietary binary blob at run time, and is deemed to be incompatible with the GPL. We are not certain if it is compatible with the LGPL, but we require --enable-nonfree even with LGPL configurations in case it is not.
|
||||
|
||||
------------------------------ QHotkey:
|
||||
Copyright (c) 2016, Felix Barz
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name of QHotkey nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user