diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | arch_use_usr_share_for_models.patch | 39 |
3 files changed, 7 insertions, 53 deletions
@@ -1,6 +1,6 @@ pkgbase = waifu2x-git pkgdesc = Image rescaling and noise reduction using the power of convolutional neural networks - pkgver = r260.2ca9d90 + pkgver = r264.0149e06 pkgrel = 1 arch = x86_64 license = MIT @@ -1,6 +1,6 @@ # Maintainer: Fredrick Brennan <admin@8chan.co> pkgname=waifu2x-git -pkgver=r260.2ca9d90 +pkgver=r264.0149e06 pkgrel=1 pkgdesc="Image rescaling and noise reduction using the power of convolutional neural networks" arch=('x86_64') @@ -8,7 +8,7 @@ url="" license=('MIT') groups=() depends=('opencl-headers' 'ocl-icd' 'opencv') -makedepends=('git' 'cmake') +makedepends=('git' 'cmake' 'make') optdepends=('cuda: Significantly speeds up operations, but only works with NVIDIA GPU') provides=('waifu2x' 'waifu2x-converter-cpp') conflicts=() @@ -22,9 +22,7 @@ md5sums=('SKIP') #generate with 'makepkg -g' gitreponame="waifu2x-converter-cpp" prepare() { - cd $gitreponame - - patch -Np1 -i ../../arch_use_usr_share_for_models.patch + sed -i "s/waifu2x-converter-cpp/waifu2x/g" $gitreponame/CMakeLists.txt } build() { @@ -32,19 +30,15 @@ build() { # # BUILD HERE # - cmake . + cmake -DINSTALL_MODELS=on . make } package() { ## Waifu2x's Makefile has no `install` ## Just copy its binary, and some files it require... - install -D $gitreponame/$gitreponame $pkgdir/usr/bin/waifu2x - install -D $gitreponame/libw2xc.so $pkgdir/usr/lib/libw2xc.so + make DESTDIR=$pkgdir install -C$gitreponame install -D ../waifu2x.1.gz $pkgdir/usr/share/man/man1/waifu2x.1.gz - install -D $gitreponame/src/w2xconv.h $pkgdir/usr/include/w2xconv.h - mkdir -p $pkgdir/usr/share/waifu2x || true - cp -r $gitreponame/models_rgb $pkgdir/usr/share/waifu2x } # From https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git @@ -54,9 +48,8 @@ pkgver() { } check() { - cd $gitreponame msg 'Running Waifu2x'\''s test suite. Depending on your processor and GPU, this may take a while.' - ./runtest + make test ARGS="-V" -C$gitreponame } # vim:set ts=2 sw=2 et: diff --git a/arch_use_usr_share_for_models.patch b/arch_use_usr_share_for_models.patch deleted file mode 100644 index 936f9d4cfe4c..000000000000 --- a/arch_use_usr_share_for_models.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/appendix/waifu2x-nocuda/lib/settings.lua b/appendix/waifu2x-nocuda/lib/settings.lua -index 56f894d..3ea818c 100644 ---- a/appendix/waifu2x-nocuda/lib/settings.lua -+++ b/appendix/waifu2x-nocuda/lib/settings.lua -@@ -21,7 +21,7 @@ cmd:text("Options:") - cmd:option("-seed", 11, 'fixed input seed') - cmd:option("-data_dir", "./data", 'data directory') - cmd:option("-test", "images/miku_small.png", 'test image file') --cmd:option("-model_dir", "./models", 'model directory') -+cmd:option("-model_dir", "/usr/share/waifu2x/models", 'model directory') - cmd:option("-method", "scale", '(noise|scale)') - cmd:option("-noise_level", 1, '(1|2)') - cmd:option("-scale", 2.0, 'scale') -diff --git a/appendix/waifu2x-nocuda/waifu2x.lua b/appendix/waifu2x-nocuda/waifu2x.lua -index 7afe284..d0b4f37 100644 ---- a/appendix/waifu2x-nocuda/waifu2x.lua -+++ b/appendix/waifu2x-nocuda/waifu2x.lua -@@ -19,7 +19,7 @@ local function waifu2x() - cmd:text("Options:") - cmd:option("-i", "images/miku_small.png", 'path of input image') - cmd:option("-o", "(auto)", 'path of output') -- cmd:option("-model_dir", "./models", 'model directory') -+ cmd:option("-model_dir", "/usr/share/waifu2x/models", 'model directory') - cmd:option("-m", "noise_scale", 'method (noise|scale|noise_scale)') - cmd:option("-noise_level", 1, '(1|2)') - cmd:option("-crop_size", 128, 'crop size') -diff --git a/src/main.cpp b/src/main.cpp -index ad1a2d4..b2a7ecc 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -52,7 +52,7 @@ int main(int argc, char** argv) { - - TCLAP::ValueArg<std::string> cmdModelPath("", "model_dir", - "path to custom model directory (don't append last / )", false, -- "models_rgb", "string", cmd); -+ "/usr/share/waifu2x/models_rgb", "string", cmd); - - TCLAP::ValueArg<int> cmdNumberOfJobs("j", "jobs", - "number of threads launching at the same time", false, 0, "integer", |