diff options
-rw-r--r-- | patches/ffmpeg-4.1_pre.local.patch | 16 | ||||
-rw-r--r-- | vars/build.vars | 7 |
2 files changed, 22 insertions, 1 deletions
diff --git a/patches/ffmpeg-4.1_pre.local.patch b/patches/ffmpeg-4.1_pre.local.patch new file mode 100644 index 00000000..4c8dbc8a --- /dev/null +++ b/patches/ffmpeg-4.1_pre.local.patch @@ -0,0 +1,16 @@ +diff -ru ffmpeg-4.1.orig/configure ffmpeg-4.1/configure +--- ffmpeg-4.1.orig/configure 2018-11-06 00:22:33.000000000 +0100 ++++ ffmpeg-4.1/configure 2019-01-13 20:49:35.764790185 +0100 +@@ -5268,6 +5268,12 @@ + ranlib=: + enable dos_paths + ;; ++ midipix*) ++ target_os=midipx ++ disable symver ++ enabled x86_64 && objformat="win64" || objformat="win32" ++ enable shared ++ ;; + cygwin*) + target_os=cygwin + shlibdir_default="$bindir_default" diff --git a/vars/build.vars b/vars/build.vars index bb1e58af..46d5f23a 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1208,7 +1208,7 @@ bdwgc bison chicken cparser diffutils flex lunix m4 make mandoc patch patchutils # # Packages list native_packages_etc NATIVE_PACKAGES_ETC_PACKAGES=" -ca_certificates cron dante debianutils emacs fetchmail gnuchess hexcurse htop icecast isync infounzip +ca_certificates cron dante debianutils emacs fetchmail ffmpeg gnuchess hexcurse htop icecast isync infounzip infozip jamvm classpath john less mlogin mc mintty nano ncdu p7zip procps_ng qpdf rdesktop rw rxvt_unicode st tmux tzdb vim xcowsay xeyes xorriso xterm xwd"; : ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"}; @@ -1240,6 +1240,11 @@ tmux tzdb vim xcowsay xeyes xorriso xterm xwd"; : ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4}; : ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz}; : ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"}; +: ${PKG_FFMPEG_SHA256SUM:=b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5}; +: ${PKG_FFMPEG_VERSION:=4.1}; +: ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.bz2}; +: ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-inline-asm --disable-x86asm --enable-cross-compile --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-openssl --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix"}; +: ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"}; : ${PKG_GNUCHESS_SHA256SUM:=9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802}; : ${PKG_GNUCHESS_VERSION:=6.2.5}; : ${PKG_GNUCHESS_URL:=http://ftp.gnu.org/gnu/chess/gnuchess-${PKG_GNUCHESS_VERSION}.tar.gz}; |