Restored checkout from git repo

Author: Andrea Medeghini

Dockerfile.linux

@@ -2,15 +2,13 @@ FROM ffmpeg4java:latest
 
 RUN apt-get update && apt-get -y install make gcc g++
 
-#RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 
 COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
 COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
 
 COPY build-linux.sh build-linux.sh
 
-COPY ffmpeg /ffmpeg
-
 RUN chmod 700 build-linux.sh
 
 CMD ["sh", "-c", "/build-linux.sh"]

Dockerfile.mingw64

@@ -2,7 +2,7 @@ FROM ffmpeg4java:latest
 
 RUN apt-get update && apt-get -y install make mingw-w64
 
-#RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 
 COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
 COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
@@ -12,8 +12,6 @@ RUN patch -p0 < ffmpeg/mingw64.patch
 
 COPY build-mingw64.sh build-mingw64.sh
 
-COPY ffmpeg /ffmpeg
-
 RUN chmod 700 build-mingw64.sh
 
 CMD ["sh", "-c", "/build-mingw64.sh"]

Makefile.jni.linux

@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
 OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/linux
 
 all: 	
-	mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lstdc++ -lm -lz $(BUILD_DIR)/ffmpeg4java_wrap.c
+	mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lstdc++ -lm -lz 

build-macos.sh

@@ -1,18 +1,14 @@
 #/bin/sh
 export BUILD_DIR=`pwd`/build
 
-#rm -fR ffmpeg
+rm -fR ffmpeg
 
-#git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 
 cp Makefile.lib.macos ffmpeg/Makefile.lib.macos
 
 cp Makefile.jni.macos ffmpeg/Makefile.jni.macos
 
-#cp macos.patch ffmpeg/macos.patch
-
-#patch -p0 < ffmpeg/macos.patch
-
 cd ffmpeg
 
 make -f Makefile.lib.macos ffmpeg