Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./cross_compile_ffmpeg.sh --build-dependencies=y --enable-gpl=y --disable-nonfree=n --prefer-stable=n --build-ffmpeg-static=y --fdk-aac-git-checkout-version=v2.0.1 --compiler-flavors=win64
984 changes: 626 additions & 358 deletions cross_compile_ffmpeg.sh

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions patches/AudioToolBox.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/configure b/configure
# Patch for ffmpeg release/7.1/7.1.1
--- a/configure
+++ b/configure
@@ -6676,7 +6676,7 @@ written by
check_lib camera2ndk "stdbool.h stdint.h camera/NdkCameraManager.h" ACameraManager_create -lcamera2ndk

enabled appkit && check_apple_framework AppKit
-enabled audiotoolbox && check_apple_framework AudioToolbox
+enabled audiotoolbox && check_apple_framework CoreAudioToolbox
enabled avfoundation && check_apple_framework AVFoundation
enabled coreimage && check_apple_framework CoreImage
enabled metal && check_apple_framework Metal
# Tjayz
52 changes: 52 additions & 0 deletions patches/SDL2-2.32.10_lib-only.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
--- Makefile.in.bak 2020-05-09 01:16:48.374940571 +0000
+++ Makefile.in 2020-05-09 01:19:12.707861205 +0000
@@ -39,9 +39,6 @@
SDLMAIN_TARGET = libSDL2main.la
SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@

-SDLTEST_TARGET = libSDL2_test.la
-SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
-
WAYLAND_SCANNER = @WAYLAND_SCANNER@

INSTALL_SDL2_CONFIG = @INSTALL_SDL2_CONFIG@
@@ -128,7 +125,7 @@
LT_REVISION = @LT_REVISION@
LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

-all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
+all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)

$(srcdir)/configure: $(srcdir)/configure.ac
@echo "Warning, configure is out of date, please re-run autogen.sh"
@@ -179,17 +173,9 @@
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
- $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
install-data:
- $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
- $(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
$(INSTALL) -m 644 sdl2.pc $(DESTDIR)$(libdir)/pkgconfig
-ifeq ($(INSTALL_SDL2_CONFIG),TRUE)
- $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/cmake/SDL2
- $(INSTALL) -m 644 sdl2-config.cmake $(DESTDIR)$(libdir)/cmake/SDL2
- $(INSTALL) -m 644 sdl2-config-version.cmake $(DESTDIR)$(libdir)/cmake/SDL2
-endif

uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data
uninstall-bin:
@@ -204,12 +190,8 @@
uninstall-lib:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(TARGET)
rm -f $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
- rm -f $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
uninstall-data:
- rm -f $(DESTDIR)$(datadir)/aclocal/sdl2.m4
rm -f $(DESTDIR)$(libdir)/pkgconfig/sdl2.pc
- rm -f $(DESTDIR)$(libdir)/cmake/SDL2/sdl2-config.cmake
- rm -f $(DESTDIR)$(libdir)/cmake/SDL2/sdl2-config-version.cmake

clean:
rm -rf $(objects)
13 changes: 1 addition & 12 deletions patches/flite-2.1.0_mingw-w64-fixes.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
--- configure.bak 2020-05-11 18:30:54.909379626 +0000
+++ configure 2020-05-11 18:32:22.906040345 +0000
@@ -4081,7 +4081,7 @@
# http://www.mingw.org
shared=false
CFLAGS="$CFLAGS -DCST_NO_SOCKETS -DUNDER_WINDOWS -DWIN32 -shared"
- MINGWPREF="i386-mingw32-"
+ MINGWPREF="${host_alias}-"
CC="${MINGWPREF}gcc"
RANLIB="${MINGWPREF}ranlib"
AR="${MINGWPREF}ar"
--- main/Makefile.bak 2020-05-11 20:18:26.039219862 +0000
+++ main/Makefile 2020-05-11 20:19:09.207549064 +0000
@@ -133,12 +133,12 @@
Expand Down Expand Up @@ -52,7 +41,7 @@
@@ -267,7 +267,7 @@
}

#ifdef _WIN32
#if defined _WIN32 && !defined(__GNUC__)
- __inline int ts_utf8_sequence_length(char c0)
+ int ts_utf8_sequence_length(char c0)
#else
Expand Down
15 changes: 15 additions & 0 deletions patches/libffi.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/configure b/configure
# Patch for wsl libffi v3.4.7, harmless to non wsl
--- a/configure
+++ b/configure
@@ -3340,7 +3340,7 @@ written by
srcdir=`echo "$ax_enable_builddir" |
sed -e 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g;s,[/]$,,;'`
# going to restart from subdirectory location
- test -f $srcdir/config.log && mv $srcdir/config.log .
+ test -f $srcdir/config.log && cp $srcdir/config.log .
test -f $srcdir/confdefs.h && mv $srcdir/confdefs.h .
test -f $srcdir/conftest.log && mv $srcdir/conftest.log .
test -f $srcdir/$cache_file && mv $srcdir/$cache_file .

# Tjayz
Loading