Skip to content

Commit

Permalink
Fixes build
Browse files Browse the repository at this point in the history
The build now completes successfully with the new layout. Please note AP.exe is not functional yet.

Prior to a275d0b all assemblies that were git checked in were removed. This included our audio-utils. They've now  been added back in as git-lfs objects 😃

This commit also fixes the postbuild hooks that copies config files and audui-utils to the build output.
  • Loading branch information
atruskie committed Feb 13, 2018
1 parent 72aab48 commit 2d94106
Show file tree
Hide file tree
Showing 49 changed files with 2,078 additions and 12 deletions.
10 changes: 9 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Auto detect text files and perform LF normalization
* text=auto

# These files are text and should be normalized (convert crlf => lf)
*.cs text diff=csharp
*.xaml text
Expand All @@ -21,6 +20,11 @@
# (binary is a macro for -text -diff)
*.png binary
*.jpeg binary
*.svg text
# images in docs should be in git-lfs (except for svg)
docs/**/*.png filter=lfs diff=lfs merge=lfs -text
docs/**/*.jpeg filter=lfs diff=lfs merge=lfs -text
docs/**/*.jpg filter=lfs diff=lfs merge=lfs -text
# Audio tracked with git-lfs
*.aac filter=lfs diff=lfs merge=lfs -text
*.m4a filter=lfs diff=lfs merge=lfs -text
Expand All @@ -40,3 +44,7 @@
*.dll binary
*.zip filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text

# all binaries in lib should be tracked by git-lfs
lib/**/*.exe filter=lfs diff=lfs merge=lfs -text
lib/**/*.dll filter=lfs diff=lfs merge=lfs -text
108 changes: 108 additions & 0 deletions lib/audio-utils/ffmpeg/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
This is a FFmpeg win64 shared build by Kyle Schwarz.

Zeranoe's FFmpeg Builds Home Page: <http://ffmpeg.zeranoe.com/builds/>

FFmpeg version: 3.3.1

This FFmpeg build was configured with:
--disable-static
--enable-shared
--enable-gpl
--enable-version3
--enable-cuda
--enable-cuvid
--enable-d3d11va
--enable-dxva2
--enable-libmfx
--enable-nvenc
--enable-avisynth
--enable-bzlib
--enable-fontconfig
--enable-frei0r
--enable-gnutls
--enable-iconv
--enable-libass
--enable-libbluray
--enable-libbs2b
--enable-libcaca
--enable-libfreetype
--enable-libgme
--enable-libgsm
--enable-libilbc
--enable-libmodplug
--enable-libmp3lame
--enable-libopencore-amrnb
--enable-libopencore-amrwb
--enable-libopenh264
--enable-libopenjpeg
--enable-libopus
--enable-librtmp
--enable-libsnappy
--enable-libsoxr
--enable-libspeex
--enable-libtheora
--enable-libtwolame
--enable-libvidstab
--enable-libvo-amrwbenc
--enable-libvorbis
--enable-libvpx
--enable-libwavpack
--enable-libwebp
--enable-libx264
--enable-libx265
--enable-libxavs
--enable-libxvid
--enable-libzimg
--enable-lzma
--enable-zlib

This build was compiled with the following external libraries:
libmfx 1.19 <https://ffmpeg.zeranoe.com>
bzip2 1.0.6 <http://bzip.org/>
Fontconfig 2.12.1 <http://freedesktop.org/wiki/Software/fontconfig>
Frei0r 20130909-git-10d8360 <http://frei0r.dyne.org/>
GnuTLS 3.5.12 <http://gnutls.org/>
libiconv 1.14 <http://gnu.org/software/libiconv/>
libass 0.13.6 <https://github.com/libass/libass>
libbluray 20170403-6dffb7e <http://videolan.org/developers/libbluray.html>
libbs2b 3.1.0 <http://bs2b.sourceforge.net/>
libcaca 0.99.beta19 <http://caca.zoy.org/wiki/libcaca>
FreeType 2.8 <http://freetype.sourceforge.net/>
Game Music Emu 0.6.1 <https://bitbucket.org/mpyne/game-music-emu/wiki/Home>
GSM 1.0.13-4 <http://packages.debian.org/source/squeeze/libgsm>
iLBC 20160404-746f8e2 <https://github.com/dekkers/libilbc/>
Modplug-XMMS 0.8.8.5 <http://modplug-xmms.sourceforge.net/>
LAME 3.99.5 <http://lame.sourceforge.net/>
OpenCORE AMR 0.1.3 <http://sourceforge.net/projects/opencore-amr/>
OpenH264 1.6.0 <https://github.com/cisco/openh264>
OpenJPEG 2.1.2 <https://github.com/uclouvain/openjpeg>
Opus 1.1.4 <http://opus-codec.org/>
RTMPDump 20151223-git-fa8646d <http://rtmpdump.mplayerhq.hu/>
Snappy 20170127-2d99bd1 <https://github.com/google/snappy>
libsoxr 0.1.2 <http://sourceforge.net/projects/soxr/>
Speex 1.2.0 <http://speex.org/>
Theora 1.1.1 <http://theora.org/>
TwoLAME 0.3.13 <http://twolame.org/>
vid.stab 0.98 <http://public.hronopik.de/vid.stab/>
VisualOn AMR-WB 0.1.2 <https://github.com/mstorsjo/vo-amrwbenc>
Vorbis 1.3.5 <http://vorbis.com/>
vpx 1.6.1 <http://webmproject.org/>
WavPack 5.1.0 <http://wavpack.com/>
WebP 0.6.0 <https://developers.google.com/speed/webp/>
x264 20170123-90a61ec <http://videolan.org/developers/x264.html>
x265 2.4 <https://bitbucket.org/multicoreware/x265/wiki/Home>
XAVS svn-r55 <http://xavs.sourceforge.net/>
Xvid 1.3.4 <http://xvid.org/>
z.lib 20170503-b5a1e50 <https://github.com/sekrit-twc/zimg>
XZ Utils 5.2.3 <http://tukaani.org/xz>
zlib 1.2.8 <http://zlib.net/>

The source code for this FFmpeg build can be found at: <http://ffmpeg.zeranoe.com/builds/source/>

This build was compiled on Ubuntu 16.04.2 LTS: <https://www.ubuntu.com/>

GCC 6.3.0 was used to compile this FFmpeg build: <http://gcc.gnu.org/>

This build was compiled using the MinGW-w64 toolchain: <http://mingw-w64.sourceforge.net/>

Licenses for each library can be found in the 'licenses' folder.
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/avcodec-57.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/avdevice-57.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/avfilter-6.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/avformat-57.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/avutil-55.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/ffmpeg.exe
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/ffplay.exe
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/ffprobe.exe
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/postproc-54.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/swresample-2.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/ffmpeg/swscale-4.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/iconv.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libFLAC.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libid3tag.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libintl-8.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libltdl-7.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libmad-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libmp3splt-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libogg-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libsplt_flac-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libsplt_mp3-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libsplt_ogg-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libvorbis-0.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libvorbisenc-2.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/libvorbisfile-3.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/mp3splt.exe
Git LFS file not shown
Binary file added lib/audio-utils/mp3splt/mp3splt.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/pcre3.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/mp3splt/zlib1.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/shntool/shntool.exe
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/lame_enc.dll
Git LFS file not shown
55 changes: 55 additions & 0 deletions lib/audio-utils/sox/lame_enc.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[lame_enc]
LamePreset=V2.00
b=0
B=0
q=-1
Stereo=JS
Scale=0.0
Resample=0
Lowpass=0
ExperimentalY=0
ExperimentalX=0,0

REM LamePreset is specified as follows:
REM For VBR settings V0.00 to V9.00, specify LamePreset=Vn.nnn.
REM The specified value will be chacked and defaulted to V2.0 if invalid.
REM
REM For ABR settings, specify LamePreset=ABRnnn, where nnn = desired bitrate.
REM The specified value will be checked and limited to within 8 - 320.
REM
REM Similarly, for CBR, specify LamePreset=CBRnnn, where nnn = desired bitrate.
REM For CBR, the indicated bitrate will be checked and will be adjusted to
REM the nearest valid CBR bitrate.
REM
REM If the 'LamePreset' line is invalid, or blank (LamePreset=),
REM it will default to 128kbps CBR, as normal, unless 'b' below is set.
REM
REM b is specified as per the normal codeline option.
REM Set to 0 for default.
REM
REM B is specified as per the normal codeline option.
REM Set to 0 for default.
REM
REM q is specified as per the normal codeline option.
REM Set to -1 for default.
REM
REM To specify Mono, specify Stereo=Mono
REM Please Note: In order for downmixing to Mono to work correctly, you will
REM need to select a setting on the CDex Settings page that allows you to
REM select Mono. Failure to do this will result in incorrect encoding.
REM
REM To specify Joint Stereo, specify Stereo=JS
REM The default is Joint Stereo.
REM
REM Scale can be used to apply the ReplayGain factor to scale the samples
REM as floating point numbers within LAME before encoding.
REM Valid values are > 0.0 and less than 1.0, default = 0.0.
REM
REM ExperimentalY is used to toggle the switch ON or OFF. Set to 1 if you want
REM it changed to ON or OFF, depending whether it is already set.
REM If set to anything other than 1,it will be ignored.
REM
REM ExperimentalX may take one, or two values.
REM Defaults are 0,0. If you don't know what they do - don't use them!
REM
REM NOTE: ONLY the FIRST 10 lines of this file are read and used.
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/libgomp-1.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/libmad.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/libmp3lame.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/pthreadgc2.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/sox.exe
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/sox/zlib1.dll
Git LFS file not shown
Loading

0 comments on commit 2d94106

Please sign in to comment.