Clean up

Author: Andrea Medeghini

Dockerfile.linux

@@ -1,6 +1,6 @@
 FROM ffmpeg4java:latest
 
-RUN apt-get update && apt-get -y install make gcc g++ libbz2-dev libz-dev
+RUN apt-get update && apt-get -y install make gcc g++
 
 #RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 

Dockerfile.mingw64

@@ -1,6 +1,6 @@
 FROM ffmpeg4java:latest
 
-RUN apt-get update && apt-get -y install make mingw-w64 libbz2-dev libz-dev
+RUN apt-get update && apt-get -y install make mingw-w64
 
 #RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 

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 -L. -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -lstdc++ -lm -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lz -lbz2 $(BUILD_DIR)/ffmpeg4java_wrap.c
+	mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -L. -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -lstdc++ -lm -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lz $(BUILD_DIR)/ffmpeg4java_wrap.c

Makefile.jni.mingw64

@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
 OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/win32
 
 all: 
-	mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-gcc --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -L. -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,--out-implib=libffmpeg4java.dll.a -Wl,-add-stdcall-alias -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lz -lbz2 -lws2_32 
+	mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-gcc --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -L. -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,--out-implib=libffmpeg4java.dll.a -Wl,-add-stdcall-alias -shared -fPIC -Wall -m$(LIB_TYPE) -Ilibavformat -Ilibavcodec -Ilibavutil -Ilibavfilter -Ilibavdevice -Ilibswscale -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lws2_32 

Makefile.lib.mingw64

@@ -3,6 +3,6 @@ LIB_TYPE=64
 LIB_ARCH=x86_$(LIB_TYPE)
 
 ffmpeg:
-	./configure --cross-prefix=$(LIB_ARCH)-w64-mingw32- --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --enable-cross-compile --target-os=mingw32 --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-memalign-hack --enable-w32threads --enable-static --disable-shared --enable-pic && make
+	./configure --cross-prefix=$(LIB_ARCH)-w64-mingw32- --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --enable-cross-compile --target-os=mingw32 --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-memalign-hack --enable-w32threads --enable-static --disable-shared && make
 
 

build-macos.sh

@@ -15,6 +15,6 @@ cp Makefile.jni.macos ffmpeg/Makefile.jni.macos
 
 cd ffmpeg
 
-#make -f Makefile.lib.macos ffmpeg
+make -f Makefile.lib.macos ffmpeg
 
 make -f Makefile.jni.macos all