diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | fix.patch | 69 |
3 files changed, 5 insertions, 80 deletions
@@ -1,7 +1,7 @@ pkgbase = dreampower pkgdesc = CLI application that allow to transform photos of people for private entertainment - With CUDA support - pkgver = 1.0.0 - pkgrel = 2 + pkgver = 1.1.0 + pkgrel = 1 url = https://github.com/private-dreamnet/dreampower arch = x86_64 license = GPL3 @@ -16,12 +16,10 @@ pkgbase = dreampower provides = dreampower conflicts = dreampower-cpu options = !strip - source = dreampower-1.0.0::git+https://github.com/private-dreamnet/dreampower.git#tag=v1.0.0 + source = dreampower-1.1.0::git+https://github.com/private-dreamnet/dreampower.git#tag=v1.1.0 source = dreampower - source = fix.patch md5sums = SKIP md5sums = 3d4dd155d414eb1c8484731eb339e596 - md5sums = 3675517801179a988eca1f4467b8fe87 pkgname = dreampower @@ -1,8 +1,8 @@ # Maintainer: PommeDroid <pommedroid@dreamnet.tech> pkgname=dreampower -pkgver=1.0.0 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc='CLI application that allow to transform photos of people for private entertainment - With CUDA support' arch=('x86_64') options=(!strip) @@ -15,17 +15,13 @@ conflicts=('dreampower-cpu') source=( "$pkgname-$pkgver::git+${url}.git#tag=v$pkgver" 'dreampower' - 'fix.patch' ) md5sums=( 'SKIP' '3d4dd155d414eb1c8484731eb339e596' - '3675517801179a988eca1f4467b8fe87' ) prepare() { - patch -p1 -d "$pkgname-$pkgver" < "fix.patch" - cd "$pkgname-$pkgver" virtualenv venv source venv/bin/activate diff --git a/fix.patch b/fix.patch deleted file mode 100644 index ee41d9a30910..000000000000 --- a/fix.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/main.py b/main.py -index 65e2bf2..fd25095 100644 ---- a/main.py -+++ b/main.py -@@ -189,7 +189,7 @@ def main(args): - if not os.path.isfile(args.input): - print("Error : {} file doesn't exist".format( - args.input), file=sys.stderr) -- exit(1) -+ sys.exit(1) - start = time.time() - - gpu_ids = args.gpu -@@ -236,7 +236,7 @@ def main(args): - if image.shape != (512, 512, 3): - print("Error : image is not 512 x 512, got shape: {}".format( - image.shape), file=sys.stderr) -- exit(1) -+ sys.exit(1) - - # Process - if args.n_runs is None or args.n_runs == 1: -diff --git a/run.py b/run.py -index 9f09b78..3c61bb6 100644 ---- a/run.py -+++ b/run.py -@@ -155,30 +155,24 @@ def process(cv_img, gpu_ids, prefs): - # Save Data - if phase == "correct_to_mask": - mask = cv2.cvtColor(im, cv2.COLOR_RGB2BGR) -- cv2.imwrite("mask.png", mask) - - elif phase == "maskref_to_maskdet": - maskdet = cv2.cvtColor(im, cv2.COLOR_RGB2BGR) -- cv2.imwrite("maskdet.png", maskdet) - - elif phase == "maskfin_to_nude": - nude = cv2.cvtColor(im, cv2.COLOR_RGB2BGR) -- cv2.imwrite("nude.png", nude) - - # Correcting: - elif phase == "dress_to_correct": - correct = create_correct(dress) -- cv2.imwrite("correct.png", correct) - - # mask_ref phase (opencv) - elif phase == "mask_to_maskref": - maskref = create_maskref(mask, correct) -- cv2.imwrite("maskref.png", maskref) - - # mask_fin phase (opencv) - elif phase == "maskdet_to_maskfin": - maskfin = create_maskfin(maskref, maskdet, prefs) -- cv2.imwrite("maskfin.png", maskfin) - - # nude_to_watermark phase (opencv) - elif phase == "nude_to_watermark": -diff --git a/scripts/setup.py b/scripts/setup.py -index bf10fb0..d07d4ad 100644 ---- a/scripts/setup.py -+++ b/scripts/setup.py -@@ -1,6 +1,7 @@ - import argparse - import fileinput - import importlib -+from importlib import util - import logging - import os - import subprocess |