summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzoe2016-01-28 12:51:53 +0100
committerzoe2016-01-28 12:51:53 +0100
commit29be66330e3371232e8fa4cdfd114a78de98634e (patch)
tree54dbb355c16b13efe3767d48f2728c61b28f0f46
parent017cb6b34f1e4f66bb3d6a118eef80ef128c0ba3 (diff)
downloadaur-29be66330e3371232e8fa4cdfd114a78de98634e.tar.gz
Update to 2.6.11-2
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD5
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f078717d2c1f..a9831f4c6c71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Jan 28 11:38:48 UTC 2016
+# Thu Jan 28 11:51:36 UTC 2016
pkgbase = tsmuxer
- pkgdesc = Remux/mux elementary streams, EVO/VOB/MPG, MKV/MKA, MP4/MOV, TS, M2TS to TS to M2TS. Can quickly generate your own Blu-ray discs by processing your media files and converting them into streamable content
+ 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 = 1
+ pkgrel = 2
url = http://www.videohelp.com/software/tsMuxeR
arch = i686
arch = x86_64
@@ -13,6 +13,10 @@ pkgbase = tsmuxer
depends = lib32-freetype2
depends = lib32-qt4
depends = lib32-libpng12
+ conflicts = tsmuxer-cli
+ conflicts = tsmuxer-cli-ng
+ conflicts = tsmuxer-gui
+ conflicts = tsmuxer-gui-ng
source = https://www.deb-multimedia.org/pool/non-free/t/tsmuxer/tsmuxer_2.6.11.orig.tar.gz
source = tsmuxer.desktop
source = tsmuxer.png
diff --git a/PKGBUILD b/PKGBUILD
index 6ef34cbeda44..3035a50687bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,13 @@
pkgname=tsmuxer
pkgver=2.6.11
-pkgrel=1
-pkgdesc="Remux/mux elementary streams, EVO/VOB/MPG, MKV/MKA, MP4/MOV, TS, M2TS to TS to M2TS. Can quickly generate your own Blu-ray discs by processing your media files and converting them into streamable content"
+pkgrel=2
+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' 'lib32-gcc-libs' 'lib32-freetype2' 'lib32-qt4' 'lib32-libpng12')
+conflicts=('tsmuxer-cli' 'tsmuxer-cli-ng' 'tsmuxer-gui' 'tsmuxer-gui-ng')
source=("https://www.deb-multimedia.org/pool/non-free/t/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz"
"${pkgname}.desktop" "${pkgname}.png" "LICENSE")
md5sums=('21e86f83d76917a4160d9ae93b9ac765'