diff --git a/CREDITS.md b/CREDITS.md index 910e6612b..bbfc59e36 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -33,21 +33,30 @@ https://curl.haxx.se FFmpeg \ https://ffmpeg.org -FreeType \ -https://www.freetype.org - FreeImage \ http://www.freeimage.sourceforge.net +FreeType \ +https://www.freetype.org + GLEW \ http://glew.sourceforge.net GLM \ https://github.com/g-truc/glm +libvpx \ +https://github.com/webmproject/libvpx + nanosvg \ https://github.com/memononen/nanosvg +Ogg \ +https://github.com/xiph/ogg + +Opus \ +https://gitlab.xiph.org/xiph/opus + pugixml \ https://pugixml.org @@ -60,6 +69,8 @@ https://github.com/Samsung/rlottie SDL \ https://www.libsdl.org +Vorbis \ +https://gitlab.xiph.org/xiph/vorbis # Code diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 7018fa207..6491e7885 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -201,8 +201,6 @@ elseif(APPLE) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libswscale.5.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libfdk-aac.2.dylib - PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libvorbis.0.4.9.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libvorbisenc.2.0.12.dylib diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.emulationstation-de.yml index 324838b0a..b30288cad 100644 --- a/es-app/assets/org.es_de.emulationstation-de.yml +++ b/es-app/assets/org.es_de.emulationstation-de.yml @@ -32,13 +32,6 @@ cleanup: - /lib/libvpx.a modules: - - name: fdk-aac - buildsystem: cmake - sources: - - type: git - url: https://git.code.sf.net/p/opencore-amr/fdk-aac.git - tag: v2.0.2 - - name: libvpx config-opts: - --disable-examples @@ -84,11 +77,9 @@ modules: - --disable-programs - --disable-doc - --enable-gpl - - --enable-nonfree - --enable-shared - --enable-libvorbis - --enable-libopus - - --enable-libfdk-aac - --enable-libvpx - --enable-postproc sources: diff --git a/licenses/Ogg b/licenses/Ogg new file mode 100644 index 000000000..6111c6c5a --- /dev/null +++ b/licenses/Ogg @@ -0,0 +1,28 @@ +Copyright (c) 2002, Xiph.org Foundation + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/Opus b/licenses/Opus new file mode 100644 index 000000000..bc88efa6c --- /dev/null +++ b/licenses/Opus @@ -0,0 +1,22 @@ +Contributions to the collaboration shall not be considered confidential. + +Each contributor represents and warrants that it has the right and +authority to license copyright in its contributions to the collaboration. + +Each contributor agrees to license the copyright in the contributions +under the Modified (2-clause or 3-clause) BSD License or the Clear BSD License. + +Please see the IPR statements submitted to the IETF for the complete +patent licensing details: + +Xiph.Org Foundation: +https://datatracker.ietf.org/ipr/1524/ + +Microsoft Corporation: +https://datatracker.ietf.org/ipr/1914/ + +Skype Limited: +https://datatracker.ietf.org/ipr/1602/ + +Broadcom Corporation: +https://datatracker.ietf.org/ipr/1526/ diff --git a/licenses/Vorbis b/licenses/Vorbis new file mode 100644 index 000000000..fb456a87b --- /dev/null +++ b/licenses/Vorbis @@ -0,0 +1,28 @@ +Copyright (c) 2002-2020 Xiph.org Foundation + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/libvpx b/licenses/libvpx new file mode 100644 index 000000000..1ce44343c --- /dev/null +++ b/licenses/libvpx @@ -0,0 +1,31 @@ +Copyright (c) 2010, The WebM Project authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of Google, nor the WebM Project, nor the names + of its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index 595449533..02021bd3a 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -80,16 +80,6 @@ make -j${JOBS} cp libSDL2-2.0.dylib ../../.. cd ../.. -echo "\nBuilding FDK AAC" -cd fdk-aac -rm -f CMakeCache.txt -cmake -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install . -make clean -make -j${JOBS} -make install -cp libfdk-aac.2.0.2.dylib ../../libfdk-aac.2.dylib -cd .. - echo "\nBuilding libvpx" cd libvpx ./configure --disable-examples --disable-docs --enable-pic --enable-vp9-highbitdepth --prefix=$(pwd)/../local_install @@ -129,7 +119,8 @@ cd .. echo "\nBuilding FFmpeg" cd FFmpeg -PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig ./configure --prefix=/usr/local --enable-rpath --install-name-dir=@rpath --disable-doc --enable-gpl --enable-nonfree --enable-shared --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libvpx --enable-postproc +PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig ./configure --prefix=/usr/local --enable-rpath --install-name-dir=@rpath --disable-doc --enable-gpl --enable-shared --enable-libvorbis --enable-libopus --enable-libvpx --enable-postproc + make clean make -j${JOBS} install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.58.dylib diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index 205248547..b987e6d18 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -162,13 +162,6 @@ ln -s include SDL2 mkdir build cd .. -echo "\nSetting up FDK AAC" -rm -rf fdk-aac -git clone https://git.code.sf.net/p/opencore-amr/fdk-aac.git -cd fdk-aac -git checkout v2.0.2 -cd .. - echo "\nSetting up libvpx" rm -rf libvpx git clone https://github.com/webmproject/libvpx.git