Merge branch 'dev/v2'

close #44 close #43 close #42 close #41 close #36 close #35 close #34
bakape · Feb 2, 2019 · d220172 · d220172
2 parents f191a43 + bb0b4e4
commit d220172
Show file tree

Hide file tree

Showing 57 changed files with 642 additions and 13,914 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,4 @@
 services: docker
 script:
   - docker build -t thumbnailer_test .
-  - docker run thumbnailer_test go test
-notifications:
-  email:
-    recipients:
-      - [email protected]
-    on_success: never
-    on_failure: always
+  - docker run thumbnailer_test go test --race
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,5 @@
-FROM bakape/meguca
-ENV GOPATH=/go
-ENV PATH="${PATH}:/usr/local/go/bin:${GOPATH}/bin"
-RUN mkdir -p /go/src/github.com/bakape/thumbnailer
-WORKDIR /go/src/github.com/bakape/thumbnailer
+FROM debian:testing
 COPY . .
-RUN go get -v ./...
+RUN apt-get update
+RUN apt-get dist-upgrade -y
+RUN apt-get install -y build-essential pkg-config libpth-dev libavcodec-dev libavutil-dev libavformat-dev libswscale-dev golang
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -5,16 +5,7 @@ Package thumbnailer provides a more efficient image/video/audio/PDF thumbnailer
 than available with native Go processing libraries through GraphicsMagic and
 ffmpeg bindings.
 
-For a comprehensive list of file formats supported by default, check the `matchers` slice in `mime.go`.
-
-## License
-GNU GENERAL PUBLIC LICENSE / MIT License
-
-Depending on how the project is built it can be licensed under either MIT or
-GPLv3. Thumbnailer links against the GPLv3-licensed libimagequant for lossy PNG
-thumbnail compression by default and thus also becomes applicable under the
-GPLv3. To build thumbnailer without this feature under the MIT license, please
-specify `--tags=MIT` when building the project. See LICENSE for more details.
+For a comprehensive list of file formats supported by default see the main.go:Process().
 
 ## Dependencies
 * Go >= 1.10
@@ -23,8 +14,7 @@ specify `--tags=MIT` when building the project. See LICENSE for more details.
 * pkg-config
 * pthread
 * ffmpeg >= 3.1 libraries (libavcodec, libavutil, libavformat, libswscale)
-* GraphicsMagick
 
-NB: ffmpeg and GM should be compiled with all the dependency libraries for
+NB: ffmpeg should be compiled with all the dependency libraries for
 formats you want to process. On most Linux distributions you should be fine with
 the packages in the stock repositories.
diff --git a/audio.go b/audio.go
diff --git a/blur.c b/blur.c
diff --git a/blur.h b/blur.h
diff --git a/buf.go b/buf.go
diff --git a/build_flags_mit.go b/build_flags_mit.go