Cleanup

4 files changed, 35 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0108331ff906..815165239873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = waifu2x-converter-cpp-cuda-git
-	pkgdesc = Image rescaling and noise reduction using the power of convolutional neural networks, with CUDA support
-	pkgver = r250.ca65c93
-	pkgrel = 2
+	pkgdesc = Image Super-Resolution for Anime-Style-Art. (re-implementation in C++ using OpenCV). with CUDA support (GIT Version)
+	pkgver = r383.fa270a5
+	pkgrel = 1
 	url = https://github.com/tanakamura/waifu2x-converter-cpp
 	arch = i686
 	arch = x86_64
-	license = MIT
+	license = GPL
 	makedepends = cmake
 	makedepends = git
-	depends = cuda
-	depends = opencl-headers
-	depends = opencl-nvidia
 	depends = opencv
-	provides = waifu2x
+	depends = cuda
 	provides = waifu2x-converter-cpp
-	conflicts = waifu2x-git
+	provides = waifu2x
+	conflicts = waifu2x-converter-cpp
+	conflicts = waifu2x
 	source = git+https://github.com/tanakamura/waifu2x-converter-cpp.git
-	md5sums = SKIP
+	sha1sums = SKIP
 
 pkgname = waifu2x-converter-cpp-cuda-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9094ff0869b2..91935e6903a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,47 @@
+# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 # Contributor: Yamashita Ren
 # Contributor: Fredrick Brennan <admin@8chan.co>
 # Contributor: Julien Machiels
 
 pkgname=waifu2x-converter-cpp-cuda-git
-_gitname=${pkgname%-cuda-git}
-pkgver=r250.ca65c93
-pkgrel=3
-pkgdesc="Image rescaling and noise reduction using the power of convolutional neural networks, with CUDA support"
+pkgver=r383.fa270a5
+pkgrel=1
+pkgdesc="Image Super-Resolution for Anime-Style-Art. (re-implementation in C++ using OpenCV). with CUDA support (GIT Version)"
 arch=('i686' 'x86_64')
-url="https://github.com/tanakamura/waifu2x-converter-cpp"
-license=('MIT')
-depends=('cuda' 'opencl-headers' 'opencl-nvidia' 'opencv')
-makedepends=('cmake' 'git')
-provides=('waifu2x' 'waifu2x-converter-cpp')
-conflicts=('waifu2x-git')
+url='https://github.com/tanakamura/waifu2x-converter-cpp'
+license=('GPL')
+depends=('opencv'
+         'cuda'
+         )
+makedepends=('cmake'
+             'git'
+             )
+provides=('waifu2x-converter-cpp' 'waifu2x')
+conflicts=('waifu2x-converter-cpp' 'waifu2x')
 source=('git+https://github.com/tanakamura/waifu2x-converter-cpp.git')
-md5sums=('SKIP')
+sha1sums=('SKIP')
 
 pkgver() {
-  cd ${_gitname}
+  cd waifu2x-converter-cpp
+  #echo $(git describe --long --tags | tr - .)
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd ${_gitname}
-  patch -Np1 -i ../../arch_use_usr_share_for_models.patch
-  sed -i 's/g++-4.7/g++/' CMakeLists.txt
-  sed -i 's/gcc-4.7/gcc/' Makefile.linux
+  mkdir -p build
 }
 
 build() {
-  cd ${_gitname}
-  cmake -D CUDA_TOOLKIT_ROOT_DIR=/opt/cuda/ .
+  cd build
+  cmake ../waifu2x-converter-cpp \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCUDA_SDK_ROOT_DIR=/opt/cuda \
+    -DINSTALL_MODELS=on
   make
 }
 
 package() {
-  cd ${_gitname}
-  install -D ${_gitname} $pkgdir/usr/bin/waifu2x
-  install -D libw2xc.so $pkgdir/usr/lib/libw2xc.so
-  install -D ../../waifu2x.1.gz $pkgdir/usr/share/man/man1/waifu2x.1.gz
-  install -D src/w2xconv.h $pkgdir/usr/include/w2xconv.h
-  mkdir -p $pkgdir/usr/share/waifu2x || true
-  cp -r models_rgb $pkgdir/usr/share/waifu2x
-}
-
-check() {
-  cd ${_gitname}
-  msg 'Running Waifu2x'\''s test suite. Since you are using CUDA, this shouldn'\''t take a while.'
-  ./runtest
+  make -C build DESTDIR=${pkgdir} install
 }
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",
diff --git a/waifu2x.1.gz b/waifu2x.1.gz
deleted file mode 100644
index 7bd91810b6f0..000000000000
--- a/waifu2x.1.gz
+++ /dev/null