Merge remote-tracking branch 'upstream/master' into fancybits-upstream-merge-mar2020

Author: eric

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -24,3 +24,8 @@ configure
 depcomp
 install-sh
 missing
+comskip.c.save-failed
+
+# Eclipse IDE
+.cproject
+.project

.travis.yml

@@ -1,7 +1,7 @@
 language: c
 os: linux
 before_script:
-  - sudo add-apt-repository -y ppa:jonathonf/ffmpeg-3
+  - sudo add-apt-repository -y ppa:jonathonf/ffmpeg-4
   - sudo apt-get update -q
   - sudo apt-get install -y --allow-unauthenticated libargtable2-dev libsdl1.2-dev ffmpeg libavcodec-dev libavformat-dev
 script:
@@ -12,5 +12,5 @@ after_script:
   - wget https://s3.amazonaws.com/tmm1/ten-copy.mkv
   - ./comskip ten-copy.mkv
   - cat ten-copy.txt
-  - grep "9359	17920" ten-copy.txt
+  - grep "9361	17922" ten-copy.txt
   - test -x comskip-gui

DDRAW.H

@@ -0,0 +1,16 @@
+FROM alpine:3.11
+
+WORKDIR /tmp
+
+RUN apk --no-cache add python ffmpeg tzdata bash \
+&& apk --no-cache add --virtual=builddeps autoconf automake libtool git ffmpeg-dev wget tar build-base \
+&& wget http://prdownloads.sourceforge.net/argtable/argtable2-13.tar.gz \
+&& tar xzf argtable2-13.tar.gz \
+&& cd argtable2-13/ && ./configure && make && make install \
+&& cd /tmp && git clone git://github.com/erikkaashoek/Comskip.git \
+&& cd Comskip && ./autogen.sh && ./configure && make && make install \
+&& apk del builddeps \
+&& rm -rf /var/cache/apk/* /tmp/* /tmp/.[!.]*
+
+ENTRYPOINT [ "comskip"]
+CMD [comskip]

Dockerfile

@@ -42,7 +42,7 @@ $ make
 There are many ways to setup a build system on Windows. These instructions use MSYS2 and MinGW-w64, but other environments should also work:
 
 - Install MSYS2 by following the instructions at https://msys2.github.io/
-- Install the essential build tools: `pacman -S mingw-w64-i686-gcc autoconf automake libtool pkgconfig yasm`
+- Install the essential build tools: `pacman -S mingw-w64-i686-gcc gcc make autoconf automake libtool pkgconfig yasm`
 - Close the MSYS2 shell and launch a MinGW-w64 shell; this is the shell you'll use for all builds
 - Build FFmpeg (http://ffmpeg.org/), argtable2 (http://argtable.sourceforge.net/) and SDL2 from source and install them to /usr/local
 - Add /usr/local/lib/pkg-config to PKG_CONFIG_PATH (e.g., add `export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig` to ~/.bashrc, then type `source ~/.bashrc`)

README.md

@@ -30,4 +30,4 @@ test_script:
   - SET PATH=C:\projects\comskip\ffmpeg-3.3.1-win64-shared/bin;%PATH%
   - comskip ten-copy.mkv
   - cat ten-copy.txt
-  - grep "9359\s17920" ten-copy.txt
+  - grep "9361\s17922" ten-copy.txt