summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Lorenzen2021-01-04 09:26:41 +0100
committerDirk Lorenzen2021-01-04 09:26:41 +0100
commit92239f11e730717b9f980c5de1350ac2541aa946 (patch)
treedc4d01e508c6c93aba0f5db384f324d3d1de1e76
parent1f0432bdf1452f69440d3e04436471202fcaa5e6 (diff)
downloadaur-92239f11e730717b9f980c5de1350ac2541aa946.tar.gz
New version
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD18
-rw-r--r--otrverwaltung3p_actions_cutvirtualdub.diff28
3 files changed, 12 insertions, 44 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 265fabda77b..e9fdac0d6f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = otr-verwaltung3p-dev
pkgdesc = Manage your onlinetvrecorder.com files: cut, preview cuts, rate cutlists etc.
- pkgver = 1.0.0b8.post1
- pkgrel = 10
+ pkgver = 1.0.0b8.post4
+ pkgrel = 11
url = https://github.com/EinApfelBaum/otr-verwaltung3p
arch = any
license = GPL3
@@ -34,10 +34,8 @@ pkgbase = otr-verwaltung3p-dev
conflicts = otr-verwaltung3p
conflicts = otr-verwaltung3p-dev-git
options = !strip
- source = https://github.com/EinApfelBaum/otr-verwaltung3p/archive/1.0.0b8.post1.tar.gz
- source = otrverwaltung3p_actions_cutvirtualdub.diff
- sha256sums = 62dba87eaca54b546126e09be94bca2c555acf9eebb3fce11657efb9dc708a84
- sha256sums = 5f3b58ee6f2259a8e5f25420f561c64beb2fb915ac537bc585d768416ad44ee8
+ source = https://github.com/EinApfelBaum/otr-verwaltung3p/archive/1.0.0b8.post4.tar.gz
+ sha256sums = 8488a48c3a0ca3d4d5f793e8b6b410f8e6763ab086e5e06dd06a596378365040
pkgname = otr-verwaltung3p-dev
diff --git a/PKGBUILD b/PKGBUILD
index 8e2e897da4c..4084f389afe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: gCurse <gcurse at web de>
pkgname=otr-verwaltung3p-dev
-pkgver=1.0.0b8.post1
-pkgrel=10
+pkgver=1.0.0b8.post4
+pkgrel=11
pkgdesc='Manage your onlinetvrecorder.com files: cut, preview cuts, rate cutlists etc.'
arch=('any')
url='https://github.com/EinApfelBaum/otr-verwaltung3p'
@@ -20,16 +20,14 @@ provides=('otr-verwaltung3p')
_pkgname='otr-verwaltung3p'
-source=("https://github.com/EinApfelBaum/otr-verwaltung3p/archive/${pkgver}.tar.gz"
- "otrverwaltung3p_actions_cutvirtualdub.diff")
-sha256sums=('62dba87eaca54b546126e09be94bca2c555acf9eebb3fce11657efb9dc708a84'
- '5f3b58ee6f2259a8e5f25420f561c64beb2fb915ac537bc585d768416ad44ee8')
+source=("https://github.com/EinApfelBaum/otr-verwaltung3p/archive/${pkgver}.tar.gz")
+sha256sums=('8488a48c3a0ca3d4d5f793e8b6b410f8e6763ab086e5e06dd06a596378365040')
options=('!strip')
-prepare() {
- # hotfix
- patch "${srcdir}/${_pkgname}-${pkgver}/otrverwaltung3p/actions/cutvirtualdub.py" otrverwaltung3p_actions_cutvirtualdub.diff
-}
+#prepare() {
+ ## hotfix
+ #patch "${srcdir}/${_pkgname}-${pkgver}/otrverwaltung3p/actions/decodeorcut.py" otrverwaltung3p_actions_decodeorcut.diff
+#}
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/otrverwaltung3p_actions_cutvirtualdub.diff b/otrverwaltung3p_actions_cutvirtualdub.diff
deleted file mode 100644
index 951e2b4b735..00000000000
--- a/otrverwaltung3p_actions_cutvirtualdub.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- otr-verwaltung3p-1.0.0b8.post1/otrverwaltung3p/actions/cutvirtualdub.py 2020-07-23 08:03:38.000000000 +0200
-+++ otr-verwaltung3p-1.0.0b8.post1/otrverwaltung3p/actions/cutvirtualdub_b.py 2020-07-23 11:03:57.181021042 +0200
-@@ -16,6 +16,7 @@
- # END LICENSE
-
- import os
-+import shutil
- import subprocess
- import time
-
-@@ -64,13 +65,10 @@
- return None, error
-
- # find wine
-- def cmd_exists(x):
-- any(os.access(os.path.join(pathx, x), os.X_OK) for pathx in os.environ["PATH"].split(os.pathsep))
--
-- if cmd_exists("wineconsole"):
-- winecommand = "wineconsole"
-- elif cmd_exists("wine"):
-- winecommand = "wine"
-+ if shutil.which("wineconsole"):
-+ winecommand = shutil.which("wineconsole")
-+ elif shutil.which("wine"):
-+ winecommand = shutil.which("wine")
- else:
- return None, "Wine konnte nicht aufgerufen werden."
-