Switch to open source version 2.6.13

5 files changed, 41 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9808645ae049..f89467935b79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,19 @@
-# Generated by mksrcinfo v8
-# Sun Feb 18 09:07:08 UTC 2018
 pkgbase = tsmuxer
 	pkgdesc = Remux/mux elementary streams, EVO/VOB/MPG, MKV/MKA, MP4/MOV, TS, M2TS to TS to M2TS, without re-encoding. Can quickly generate your own Blu-ray discs by processing your media files and converting them into streamable content. CLI and GUI all-in-one
-	pkgver = 2.6.11
-	pkgrel = 8
-	url = http://www.videohelp.com/software/tsMuxeR
-	arch = i686
+	pkgver = 2.6.13
+	pkgrel = 1
+	url = https://github.com/justdan96/tsMuxer
 	arch = x86_64
-	license = custom
-	depends = bash
-	depends = gcc-libs
+	license = Apache License 2.0
+	makedepends = ninja
 	depends = freetype2
-	depends = qt4
-	depends = libpng12
-	depends = lib32-gcc-libs
-	depends = lib32-freetype2
-	depends = lib32-qt4
-	depends = lib32-libpng12
-	provides = tsmuxer-cli
-	provides = tsmuxer-cli-ng
-	provides = tsmuxer-gui
-	provides = tsmuxer-gui-ng
-	provides = tsmuxer-ng-cli-bin
-	provides = tsmuxer-ng-gui-bin
-	conflicts = tsmuxer-cli
-	conflicts = tsmuxer-cli-ng
-	conflicts = tsmuxer-gui
-	conflicts = tsmuxer-gui-ng
-	conflicts = tsmuxer-ng-cli-bin
-	conflicts = tsmuxer-ng-gui-bin
-	source = https://www.deb-multimedia.org/pool/non-free/t/tsmuxer/tsmuxer_2.6.11.orig.tar.gz
+	depends = zlib
+	depends = qt5-multimedia
+	depends = qt5-declarative
+	source = tsmuxer.git::git+https://github.com/justdan96/tsMuxer.git
 	source = tsmuxer.desktop
-	source = tsmuxer.png
-	source = LICENSE
-	md5sums = 21e86f83d76917a4160d9ae93b9ac765
-	md5sums = 6ce782be4b5f7ca0203ba4fb14d1c328
-	md5sums = 3e71328058f9dbeb5c580a5fb7c6850a
-	md5sums = c042a4c5e9dd8393f62ee0e63affc485
+	md5sums = SKIP
+	md5sums = f1419c462f5decb22bec6bae4077693c
 
 pkgname = tsmuxer
 
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 6cf629998a38..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,42 +0,0 @@
-(c) SmartLabs LLC, 2008-2009
-
-Freeware Licence Agreement
-This licence agreement only applies to the free version of this software.
-
-Terms and Conditions
-BY DOWNLOADING, INSTALLING, USING, TRANSMITTING, DISTRIBUTING OR COPYING THIS SOFTWARE ("THE SOFTWARE"), YOU AGREE TO THE TERMS OF THIS AGREEMENT (INCLUDING THE SOFTWARE LICENCE AND DISCLAIMER OF WARRANTY) WITH SmartLabs LLC (with the business address at 72, Oktyabrskata str., 127521 Moscow, Russia) THE OWNER OF ALL RIGHTS IN RESPECT OF THE SOFTWARE. 
-
-PLEASE READ THIS DOCUMENT CAREFULLY BEFORE USING THE SOFTWARE. 
-
-IF YOU DO NOT AGREE TO ANY OF THE TERMS OF THIS LICENCE THEN DO NOT DOWNLOAD, INSTALL, USE, TRANSMIT, DISTRIBUTE OR COPY THE SOFTWARE. 
-
-THIS DOCUMENT CONSTITUES A LICENCE TO USE THE SOFTWARE ON THE TERMS AND CONDITIONS APPEARING BELOW. 
-
-The Software is licensed to you without charge for use only upon the terms of this licence, and SmartLabs LLC reserves all rights not expressly granted to you. SmartLabs LLC retains ownership of all copies of the Software. 
-
-1. Licence
-You may use the Software without charge. 
-
-You may distribute exact copies of the Software to anyone. 
-
-2. Restrictions
-SmartLabs LLC reserves the right to revoke the above distribution right at any time, for any or no reason. 
-
-YOU MAY NOT MODIFY, ADAPT, TRANSLATE, RENT, LEASE, LOAN, SELL, REQUEST DONATIONS OR CREATE DERIVATE WORKS BASED UPON THE SOFTWARE OR ANY PART THEREOF. 
-
-The Software contains trade secrets and to protect them you may not decompile, reverse engineer, disassemble or otherwise reduce the Software to a humanly perceivable form. You agree not to divulge, directly or indirectly, until such trade secrets cease to be confidential, for any reason not your own fault. 
-
-3. Termination
-This licence is effective until terminated. The Licence will terminate automatically without notice from SmartLabs LLC if you fail to comply with any provision of this Licence. Upon termination you must destroy the Software and all copies thereof. You may terminate this Licence at any time by destroying the Software and all copies thereof. Upon termination of this licence for any reason you shall continue to be bound by the provisions of Section 2 above. Termination will be without prejudice to any rights SmartLabs LLC may have as a result of this agreement. 
-
-4. Disclaimer of Warranty, Limitation of Remedies
-TO THE FULL EXTENT PERMITTED BY LAW, SmartLabs LLC HEREBY EXCLUDES ALL CONDITIONS AND WARRANTIES, WHETHER IMPOSED BY STATUTE OR BY OPERATION OF LAW OR OTHERWISE, NOT EXPRESSLY SET OUT HEREIN. THE SOFTWARE, AND ALL ACCOMPANYING FILES, DATA AND MATERIALS ARE DISTRIBUTED "AS IS" AND WITH NO WARRANTIES OF ANY KIND, WHETHER EXPRESS OR IMPLIED. SmartLabs LLC DOES NOT WARRANT, GUARANTEE OR MAKE ANY REPRESENTATIONS REGARDING THE USE, OR THE RESULTS OF THE USE, OF THE SOFTWARE WITH RESPECT TO ITS CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS OR OTHERWISE. THE ENTIRE RISK OF USING THE SOFTWARE IS ASSUMED BY YOU. SmartLabs LLC MAKES NO EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS INCLUDING, WITHOUT LIMITATION, THE WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY SmartLabs LLC, IT'S DISTRIBUTORS, AGENTS OR EMPLOYEES SHALL CREATE A WARRANTY, AND YOU MAY NOT RELY ON ANY SUCH INFORMATION OR ADVICE. 
-
-IMPORTANT NOTE: Nothing in this Agreement is intended or shall be construed as excluding or modifying any statutory rights, warranties or conditions which by virtue of any national or state Fair Trading, Trade Practices or other such consumer legislation may not be modified or excluded. If permitted by such legislation, however, SmartLabs LLC' liability for any breach of any such warranty or condition shall be and is hereby limited to the supply of the Software licensed hereunder again as SmartLabs LLC at its sole discretion may determine to be necessary to correct the said breach. 
-
-IN NO EVENT SHALL SmartLabs LLC BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, AND THE LOSS OF BUSINESS INFORMATION OR COMPUTER PROGRAMS), EVEN IF SmartLabs LLC OR ANY SmartLabs LLC REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ADDITION, IN NO EVENT DOES SmartLabs LLC AUTHORISE YOU TO USE THE SOFTWARE IN SITUATIONS WHERE FAILURE OF THE SOFTWARE TO PERFORM CAN REASONABLY BE EXPECTED TO RESULT IN A PHYSICAL INJURY, OR IN LOSS OF LIFE. ANY SUCH USE BY YOU IS ENTIRELY AT YOUR OWN RISK, AND YOU AGREE TO HOLD SmartLabs LLC HARMLESS FROM ANY CLAIMS OR LOSSES RELATING TO SUCH UNAUTHORISED USE. 
-
-5. General
-All rights of any kind in the Software which are not expressly granted in this Agreement are entirely and exclusively reserved to and by SmartLabs LLC. 
-
-This agreement contains the entire Agreement between the parties hereto with respect to the subject matter hereof, and supersedes all prior agreements and/or understandings (oral or written). Failure or delay by SmartLabs LLC in enforcing any right or provision hereof shall not be deemed a waiver of such provision or right with respect to the instant or any subsequent breach. If any provision of this Agreement shall be held by a court of competent jurisdiction to be contrary to law, that provision will be enforced to the maximum extent permissible, and the remaining provisions of this Agreement will remain in force and effect.
diff --git a/PKGBUILD b/PKGBUILD
index 1bde64ccf793..27ddfe32e095 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,35 @@
-# Maintainer: zoe <chp321 at gmail dot com>
+# Contributor: zoe <chp321 [at] gmail (dot) com>
+# Maintainer: zoe <chp321 [at] gmail (dot) com>
 
 pkgname=tsmuxer
-pkgver=2.6.11
-pkgrel=8
+PkgName=tsMuxer
+pkgver=2.6.13
+pkgrel=1
 pkgdesc="Remux/mux elementary streams, EVO/VOB/MPG, MKV/MKA, MP4/MOV, TS, M2TS to TS to M2TS, without re-encoding. Can quickly generate your own Blu-ray discs by processing your media files and converting them into streamable content. CLI and GUI all-in-one"
-url="http://www.videohelp.com/software/tsMuxeR"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('bash' 'gcc-libs' 'freetype2' 'qt4' 'libpng12'
-         'lib32-gcc-libs' 'lib32-freetype2' 'lib32-qt4' 'lib32-libpng12'
-         )
-conflicts=('tsmuxer-cli' 'tsmuxer-cli-ng' 'tsmuxer-gui' 'tsmuxer-gui-ng' 'tsmuxer-ng-cli-bin' 'tsmuxer-ng-gui-bin')
-provides=('tsmuxer-cli' 'tsmuxer-cli-ng' 'tsmuxer-gui' 'tsmuxer-gui-ng' 'tsmuxer-ng-cli-bin' 'tsmuxer-ng-gui-bin')
-source=("https://www.deb-multimedia.org/pool/non-free/t/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz"
-         "${pkgname}.desktop" "${pkgname}.png" "LICENSE")
-md5sums=('21e86f83d76917a4160d9ae93b9ac765'
-         '6ce782be4b5f7ca0203ba4fb14d1c328'
-         '3e71328058f9dbeb5c580a5fb7c6850a'
-         'c042a4c5e9dd8393f62ee0e63affc485')
+arch=('x86_64')
+url="https://github.com/justdan96/${PkgName}"
+license=("Apache License 2.0")
+depends=('freetype2' 'zlib' 'qt5-multimedia' 'qt5-declarative')
+makedepends=('ninja')
+source=("${pkgname}.git::git+https://github.com/justdan96/${PkgName}.git"
+        "${pkgname}.desktop")
+md5sums=(SKIP 'f1419c462f5decb22bec6bae4077693c')
+
+build() {
+cd ${srcdir}/${pkgname}.git
+rm -rf build
+mkdir build
+cd build
+cmake ../ -G Ninja -DTSMUXER_GUI=ON
+ninja
+}
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver}  
-  install -D -m755 -t $pkgdir/usr/bin/  ./tsMuxeR   ./tsMuxerGUI
-  install -D -m644 $srcdir/${pkgname}.png     $pkgdir/usr/share/icons/hicolor/32x32/apps/${pkgname}.png
-  install -D -m644 $srcdir/${pkgname}.desktop $pkgdir/usr/share/applications/${pkgname}.desktop
-  install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+install -D -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+cd ${srcdir}/${pkgname}.git
+install -D -m755 -t ${pkgdir}/usr/bin/  ./build/${PkgName}/${pkgname}   ./build/${PkgName}GUI/${PkgName}GUI
+install -D -m644 ./${PkgName}GUI/images/icon.png     ${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png
+install -D -m644 ./LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+install -D -m644 ./README.md ${pkgdir}/usr/share/doc/${pkgname}/README.md
+install -D -m644 ./CHANGELOG.md ${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG.md
 }
diff --git a/tsmuxer.desktop b/tsmuxer.desktop
index 515ae5196177..28eac3430af9 100644
--- a/tsmuxer.desktop
+++ b/tsmuxer.desktop
@@ -2,7 +2,7 @@
 Name=tsMuxeR
 Comment=tsMuxeR
 Exec=tsMuxerGUI
-Icon=/usr/share/icons/hicolor/32x32/apps/tsmuxer.png
+Icon=/usr/share/icons/hicolor/128x128/apps/tsmuxer.png
 Terminal=false
 Type=Application
 Categories=AudioVideo;
diff --git a/tsmuxer.png b/tsmuxer.png
deleted file mode 100644
index c06827849239..000000000000
--- a/tsmuxer.png
+++ /dev/null