Skip to content

Commit 65ba4e0

Browse files
author
Andrea Medeghini
committed
Compilation partially working
1 parent 5377d1c commit 65ba4e0

11 files changed

Lines changed: 28 additions & 17 deletions

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
21
build
32
*.iml
43
.idea
5-
4+
ffmpeg

‎Dockerfile.linux‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
FROM ffmpeg4java:latest
22

3-
RUN apt-get update && apt-get -y install cvs make gcc g++
3+
RUN apt-get update && apt-get -y install make gcc g++ libbz2-dev libz-dev
44

5-
RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
5+
#RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
66

77
COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
88
COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
99

1010
COPY build-linux.sh build-linux.sh
1111

12+
COPY ffmpeg /ffmpeg
13+
1214
RUN chmod 700 build-linux.sh
1315

1416
CMD ["sh", "-c", "/build-linux.sh"]

‎Dockerfile.mingw64‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ffmpeg4java:latest
22

3-
RUN apt-get update && apt-get -y install cvs make mingw-w64
3+
RUN apt-get update && apt-get -y install make mingw-w64 libbz2-dev libz-dev
44

5-
RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
5+
#RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
66

77
COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
88
COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
@@ -12,6 +12,8 @@ RUN patch -p0 < ffmpeg/mingw64.patch
1212

1313
COPY build-mingw64.sh build-mingw64.sh
1414

15+
COPY ffmpeg /ffmpeg
16+
1517
RUN chmod 700 build-mingw64.sh
1618

1719
CMD ["sh", "-c", "/build-mingw64.sh"]

‎Makefile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java
33

44
all:
5-
mkdir -p $(OUTPUT_DIR)/src/main/java/com/nextbreakpoint/ffmpeg4java && swig -v -c++ -java -o $(BUILD_DIR)/ffmpeg4java_wrap.cxx -outdir $(OUTPUT_DIR)/src/main/java/com/nextbreakpoint/ffmpeg4java -package com.nextbreakpoint.ffmpeg4java ffmpeg4java.i
5+
mkdir -p $(OUTPUT_DIR)/src/main/java/com/nextbreakpoint/ffmpeg4java && swig -v -java -o $(BUILD_DIR)/ffmpeg4java_wrap.c -outdir $(OUTPUT_DIR)/src/main/java/com/nextbreakpoint/ffmpeg4java -package com.nextbreakpoint.ffmpeg4java ffmpeg4java.i

‎Makefile.jni.linux‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/linux
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && g++ --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -L. -ISource -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -lstdc++ -lm -lffmpeg $(BUILD_DIR)/ffmpeg4java_wrap.cxx
8+
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

‎Makefile.jni.macos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ JAVA_HOME=`/usr/libexec/java_home`
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/macos
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && g++ --verbose -o $(OUTPUT_DIR)/libffmpeg4java.jnilib -ISource -L. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -shared -fPIC -Wall -m$(LIB_TYPE) -lffmpeg -lm $(BUILD_DIR)/ffmpeg4java_wrap.cxx
8+
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.jnilib -std=gnu99 -I. -L. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -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
99

‎Makefile.jni.mingw64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/win32
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-g++ --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -L. -ISource -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) $(BUILD_DIR)/ffmpeg4java_wrap.cxx -lffmpeg -lm -lws2_32
8+
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

‎Makefile.lib.linux‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
DISTDIR ?= Dist
2+
LIB_TYPE=64
3+
LIB_ARCH=x86_$(LIB_TYPE)
24

3-
clean:
5+
ffmpeg:
6+
./configure --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-pthreads --enable-static --disable-shared --enable-pic && make
47

58

‎Makefile.lib.macos‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
DISTDIR ?= Dist
2+
LIB_TYPE=64
3+
LIB_ARCH=x86_$(LIB_TYPE)
24

3-
clean:
4-
5+
ffmpeg:
6+
./configure --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-static --disable-shared --enable-pic && make
57

‎Makefile.lib.mingw64‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
DISTDIR ?= Dist
2+
LIB_TYPE=64
3+
LIB_ARCH=x86_$(LIB_TYPE)
24

3-
clean:
5+
ffmpeg:
6+
./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
47

58

0 commit comments

Comments
 (0)