Updated and repurposed the package.

It now installs the original waifu2x.

6 files changed, 125 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dc0bd6b2e4b..89ba747cccdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,34 @@
-# Generated by mksrcinfo v8
-# Sun Apr  2 11:15:41 UTC 2017
 pkgbase = waifu2x-git
 	pkgdesc = Image rescaling and noise reduction using the power of convolutional neural networks
-	pkgver = r427.f89dd61
+	pkgver = r512.7dad4bc
 	pkgrel = 1
-	arch = x86_64
+	epoch = 1
+	url = https://github.com/nagadomi/waifu2x
+	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = cmake
 	makedepends = make
-	depends = opencl-headers
-	depends = ocl-icd
-	depends = opencv
-	optdepends = cuda: Significantly speeds up operations, but only works with NVIDIA GPU
+	makedepends = pkg-config
+	depends = luajit
+	depends = lua51-penlight
+	depends = lua51-graphicsmagick-git
+	depends = graphicsmagick
+	depends = lua-moses-git
+	depends = torch7-sys-git
+	depends = torch7-cutorch-git
+	depends = torch7-cunn-git
+	depends = torch7-image-git
+	depends = torch7-xlua-git
+	depends = torch7-dok-git
 	provides = waifu2x
-	provides = waifu2x-converter-cpp
-	noextract = waifu2x.1.gz
-	source = git+https://github.com/tanakamura/waifu2x-converter-cpp.git
-	source = waifu2x.1.gz
+	conflicts = waifu2x
+	source = git+https://github.com/nagadomi/waifu2x.git
+	source = waifu2x.sh
+	source = 0001-Use-absolute-path-to-models-directory.patch
 	md5sums = SKIP
-	md5sums = bc1a849b7bc63dfa8d54497fa1297a00
+	md5sums = f6e182a8278a4dd9b4a9168200d7666b
+	md5sums = 0942efd456a6f6a83bff9c21759876e6
 
 pkgname = waifu2x-git
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3bf29c7d6e65..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-#dolphin
-.directory
-
-#pkg building files
-
-*.7z
-*.tar.xz
-*.tar.gz
-
-src/
-pkg/
-
-# source
-/waifu2x-converter-cpp/
-
-!waifu2x.1.gz
diff --git a/0001-Use-absolute-path-to-models-directory.patch b/0001-Use-absolute-path-to-models-directory.patch
new file mode 100644
index 000000000000..edb44c532d28
--- /dev/null
+++ b/0001-Use-absolute-path-to-models-directory.patch
@@ -0,0 +1,39 @@
+From 5d761cf214e2f345aef3560a3f92b223f93130c0 Mon Sep 17 00:00:00 2001
+From: "Andrei \"Akari\" Alexeyev" <akari@alienslab.net>
+Date: Sun, 23 Jul 2017 16:19:36 +0300
+Subject: [PATCH] Use absolute path to models directory
+
+---
+ lib/settings.lua | 2 +-
+ waifu2x.lua      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/settings.lua b/lib/settings.lua
+index 03830e4..7e88ee7 100644
+--- a/lib/settings.lua
++++ b/lib/settings.lua
+@@ -22,7 +22,7 @@ cmd:option("-seed", 11, 'RNG seed')
+ cmd:option("-data_dir", "./data", 'path to data directory')
+ cmd:option("-backend", "cunn", '(cunn|cudnn)')
+ cmd:option("-test", "images/miku_small.png", 'path to test image')
+-cmd:option("-model_dir", "./models", 'model directory')
++cmd:option("-model_dir", "/usr/share/waifu2x/models", 'model directory')
+ cmd:option("-method", "scale", 'method to training (noise|scale|noise_scale|user)')
+ cmd:option("-model", "vgg_7", 'model architecture (vgg_7|vgg_12|upconv_7|upconv_8_4x|dilated_7)')
+ cmd:option("-noise_level", 1, '(0|1|2|3)')
+diff --git a/waifu2x.lua b/waifu2x.lua
+index 6ffa98d..e54e348 100644
+--- a/waifu2x.lua
++++ b/waifu2x.lua
+@@ -254,7 +254,7 @@ local function waifu2x()
+    cmd:option("-scale", 2, 'scale factor')
+    cmd:option("-o", "(auto)", 'path to output file')
+    cmd:option("-depth", 8, 'bit-depth of the output image (8|16)')
+-   cmd:option("-model_dir", "./models/upconv_7/art", 'path to model directory')
++   cmd:option("-model_dir", "/usr/share/waifu2x/models/upconv_7/art", 'path to model directory')
+    cmd:option("-name", "user", 'model name for user method')
+    cmd:option("-m", "noise_scale", 'method (noise|scale|noise_scale|user)')
+    cmd:option("-method", "", 'same as -m')
+-- 
+2.13.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 4bce31c47e5a..6d203ac977aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,73 @@
-# Maintainer: Frantic1048 <archer@frantic1048.com>
-# Maintainer: Fredrick Brennan <admin@8chan.co>
+# Maintainer: Andrei Alexeyev <akari@alienslab.net>
+# Contributor: Frantic1048 <archer@frantic1048.com>
+# Contributor: Fredrick Brennan <admin@8chan.co>
+
 pkgname=waifu2x-git
-pkgver=r427.f89dd61
+pkgver=r512.7dad4bc
 pkgrel=1
+epoch=1
 pkgdesc="Image rescaling and noise reduction using the power of convolutional neural networks"
-arch=('x86_64')
-url=""
+arch=('any')
+url="https://github.com/nagadomi/waifu2x"
 license=('MIT')
 groups=()
-depends=('opencl-headers' 'ocl-icd' 'opencv')
-makedepends=('git' 'cmake' 'make')
-optdepends=('cuda: Significantly speeds up operations, but only works with NVIDIA GPU')
-provides=('waifu2x' 'waifu2x-converter-cpp')
-conflicts=()
+depends=(
+    'luajit'
+    'lua51-penlight'
+    'lua51-graphicsmagick-git'
+    'graphicsmagick' # XXX: lua51-graphicsmagick-git should require this
+    'lua-moses-git'
+    'torch7-sys-git'
+    'torch7-cutorch-git'
+    'torch7-cunn-git'
+    'torch7-image-git'
+    'torch7-xlua-git' # XXX: torch7-image-git should require this
+    'torch7-dok-git' # XXX: torch7-image-git should require this
+)
+makedepends=(
+    'git'
+    'cmake'
+    'make'
+    'pkg-config'
+)
+optdepends=()
+provides=('waifu2x')
+conflicts=('waifu2x')
 replaces=()
 backup=()
 options=()
 install=
-source=('git+https://github.com/tanakamura/waifu2x-converter-cpp.git' 'waifu2x.1.gz')
-noextract=('waifu2x.1.gz')
-md5sums=('SKIP' 'bc1a849b7bc63dfa8d54497fa1297a00') #generate with 'makepkg -g'
-gitreponame="waifu2x-converter-cpp"
+source=(
+    'git+https://github.com/nagadomi/waifu2x.git'
+    'waifu2x.sh'
+    '0001-Use-absolute-path-to-models-directory.patch'
+)
+noextract=()
+md5sums=('SKIP'
+         'f6e182a8278a4dd9b4a9168200d7666b'
+         '0942efd456a6f6a83bff9c21759876e6'
+)
 
 prepare() {
-  sed -i "s/waifu2x-converter-cpp/waifu2x/g" $gitreponame/CMakeLists.txt
-}
-
-build() {
-  cd $gitreponame
-  #
-  # BUILD HERE
-  #
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_MODELS=on .
-  make
+    cd waifu2x
+    patch -Np1 -i "$srcdir/0001-Use-absolute-path-to-models-directory.patch"
 }
 
 package() {
-  ## Waifu2x's Makefile has no `install`
-  ## Just copy its binary, and some files it require...
-  make DESTDIR=$pkgdir install -C$gitreponame
-  install -D ./waifu2x.1.gz $pkgdir/usr/share/man/man1/waifu2x.1.gz
-}
+    cd waifu2x
+    local prefix="$pkgdir/usr/share/${pkgname%%-git}"
 
-# From https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
-pkgver() {
-  cd $gitreponame
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+    for luafile in {.,lib}/*.lua; do
+        install -Dm644 "$luafile" "$prefix/$luafile"
+        luajit -b "$prefix/$luafile" "$prefix/$luafile"
+    done
 
-check() {
-  msg 'Running Waifu2x'\''s test suite. Depending on your processor and GPU, this may take a while.'
-  make test ARGS="-V" -C$gitreponame
+    cp -dpr --no-preserve=ownership models "$prefix/models"
+    install -Dm755 "$srcdir/waifu2x.sh" "$pkgdir/usr/bin/waifu2x"
+    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-# vim:set ts=2 sw=2 et:
+pkgver() {
+    cd waifu2x
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
diff --git a/waifu2x.1.gz b/waifu2x.1.gz
deleted file mode 100644
index 7bd91810b6f0..000000000000
--- a/waifu2x.1.gz
+++ /dev/null
diff --git a/waifu2x.sh b/waifu2x.sh
new file mode 100644
index 000000000000..c55475a08c4d
--- /dev/null
+++ b/waifu2x.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+waifu2x="/usr/share/waifu2x/waifu2x.lua"
+
+if [[ -n "$1" ]]; then
+    exec luajit "$waifu2x" "$@"
+else
+    exec luajit "$waifu2x" -h "$@"
+fi