[fdk-aac] Update to version 2.0.2. (#18549)

* [fdkaac] Update to version 2.0.2.

* [fdk-aac] Remove unused files.

* Update fdk-aac.json

* Update ports/fdk-aac/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* test uwp|arm compilation.

* Update fdk-aac.json

* Convert to json.

* Update vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

7 files changed, 21 insertions, 238 deletions

diff --git a/ports/fdk-aac/CMakeLists.txt b/ports/fdk-aac/CMakeLists.txt
deleted file mode 100644
index 67db1b323..000000000
--- a/ports/fdk-aac/CMakeLists.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-cmake_minimum_required(VERSION 3.8.0)
-
-project(fdk-aac)
-
-set(AACDEC_SRC
-  libAACdec/src/aacdec_drc.cpp
-  libAACdec/src/aacdec_hcr.cpp
-  libAACdec/src/aacdecoder.cpp
-  libAACdec/src/aacdec_pns.cpp
-  libAACdec/src/aac_ram.cpp
-  libAACdec/src/block.cpp
-  libAACdec/src/channelinfo.cpp
-  libAACdec/src/ldfiltbank.cpp
-  libAACdec/src/rvlcbit.cpp
-  libAACdec/src/rvlc.cpp
-  libAACdec/src/aacdec_hcr_bit.cpp
-  libAACdec/src/aacdec_hcrs.cpp
-  libAACdec/src/aacdecoder_lib.cpp
-  libAACdec/src/aacdec_tns.cpp
-  libAACdec/src/aac_rom.cpp
-  libAACdec/src/channel.cpp
-  libAACdec/src/conceal.cpp
-  libAACdec/src/pulsedata.cpp
-  libAACdec/src/rvlcconceal.cpp
-  libAACdec/src/stereo.cpp
-)
-
-set(AACENC_SRC
-  libAACenc/src/aacenc.cpp
-  libAACenc/src/aacEnc_ram.cpp
-  libAACenc/src/band_nrg.cpp
-  libAACenc/src/block_switch.cpp
-  libAACenc/src/grp_data.cpp
-  libAACenc/src/metadata_main.cpp
-  libAACenc/src/pre_echo_control.cpp
-  libAACenc/src/quantize.cpp
-  libAACenc/src/tonality.cpp
-  libAACenc/src/aacEnc_rom.cpp
-  libAACenc/src/bandwidth.cpp
-  libAACenc/src/channel_map.cpp
-  libAACenc/src/intensity.cpp
-  libAACenc/src/ms_stereo.cpp
-  libAACenc/src/psy_configuration.cpp
-  libAACenc/src/sf_estim.cpp
-  libAACenc/src/transform.cpp
-  libAACenc/src/aacenc_lib.cpp
-  libAACenc/src/aacenc_tns.cpp
-  libAACenc/src/bit_cnt.cpp
-  libAACenc/src/chaosmeasure.cpp
-  libAACenc/src/line_pe.cpp
-  libAACenc/src/noisedet.cpp
-  libAACenc/src/psy_main.cpp
-  libAACenc/src/spreading.cpp
-  libAACenc/src/aacenc_pns.cpp
-  libAACenc/src/adj_thr.cpp
-  libAACenc/src/bitenc.cpp
-  libAACenc/src/dyn_bits.cpp
-  libAACenc/src/metadata_compressor.cpp
-  libAACenc/src/pnsparam.cpp
-  libAACenc/src/qc_main.cpp
-)
-
-set(FDK_SRC
-  libFDK/src/autocorr2nd.cpp
-  libFDK/src/dct.cpp
-  libFDK/src/FDK_bitbuffer.cpp
-  libFDK/src/FDK_core.cpp
-  libFDK/src/FDK_crc.cpp
-  libFDK/src/FDK_hybrid.cpp
-  libFDK/src/FDK_tools_rom.cpp
-  libFDK/src/FDK_trigFcts.cpp
-  libFDK/src/fft.cpp
-  libFDK/src/fft_rad2.cpp
-  libFDK/src/fixpoint_math.cpp
-  libFDK/src/mdct.cpp
-  libFDK/src/qmf.cpp
-  libFDK/src/scale.cpp
-)
-
-set(MPEGTPDEC_SRC
-  libMpegTPDec/src/tpdec_adif.cpp
-  libMpegTPDec/src/tpdec_adts.cpp
-  libMpegTPDec/src/tpdec_asc.cpp
-  libMpegTPDec/src/tpdec_drm.cpp
-  libMpegTPDec/src/tpdec_latm.cpp
-  libMpegTPDec/src/tpdec_lib.cpp
-)
-
-set(  MPEGTPENC_SRC
-  libMpegTPEnc/src/tpenc_adif.cpp
-  libMpegTPEnc/src/tpenc_adts.cpp
-  libMpegTPEnc/src/tpenc_asc.cpp
-  libMpegTPEnc/src/tpenc_latm.cpp
-  libMpegTPEnc/src/tpenc_lib.cpp
-)
-
-set(  PCMUTILS_SRC
-  libPCMutils/src/limiter.cpp
-  libPCMutils/src/pcmutils_lib.cpp
-)
-
-set(SBRDEC_SRC
-  libSBRdec/src/env_calc.cpp
-  libSBRdec/src/env_dec.cpp
-  libSBRdec/src/env_extr.cpp
-  libSBRdec/src/huff_dec.cpp
-  libSBRdec/src/lpp_tran.cpp
-  libSBRdec/src/psbitdec.cpp
-  libSBRdec/src/psdec.cpp
-  libSBRdec/src/psdec_hybrid.cpp
-  libSBRdec/src/sbr_crc.cpp
-  libSBRdec/src/sbr_deb.cpp
-  libSBRdec/src/sbr_dec.cpp
-  libSBRdec/src/sbrdec_drc.cpp
-  libSBRdec/src/sbrdec_freq_sca.cpp
-  libSBRdec/src/sbrdecoder.cpp
-  libSBRdec/src/sbr_ram.cpp
-  libSBRdec/src/sbr_rom.cpp
-)
-
-set(SBRENC_SRC
-  libSBRenc/src/bit_sbr.cpp
-  libSBRenc/src/env_bit.cpp
-  libSBRenc/src/fram_gen.cpp
-  libSBRenc/src/mh_det.cpp
-  libSBRenc/src/ps_bitenc.cpp
-  libSBRenc/src/ps_encode.cpp
-  libSBRenc/src/resampler.cpp
-  libSBRenc/src/sbr_encoder.cpp
-  libSBRenc/src/sbr_ram.cpp
-  libSBRenc/src/ton_corr.cpp
-  libSBRenc/src/code_env.cpp
-  libSBRenc/src/env_est.cpp
-  libSBRenc/src/invf_est.cpp
-  libSBRenc/src/nf_est.cpp
-  libSBRenc/src/ps_main.cpp
-  libSBRenc/src/sbrenc_freq_sca.cpp
-  libSBRenc/src/sbr_misc.cpp
-  libSBRenc/src/sbr_rom.cpp
-  libSBRenc/src/tran_det.cpp
-)
-
-set(SYS_SRC
-  libSYS/src/cmdl_parser.cpp
-  libSYS/src/conv_string.cpp
-  libSYS/src/genericStds.cpp
-  libSYS/src/wav_file.cpp
-)
-
-set(
-  libfdk_aac_SOURCES
-  ${AACDEC_SRC} ${AACENC_SRC}
-  ${MPEGTPDEC_SRC} ${MPEGTPENC_SRC}
-  ${SBRDEC_SRC} ${SBRENC_SRC}
-  ${PCMUTILS_SRC} ${FDK_SRC} ${SYS_SRC}
-  fdk-aac.def
-)
-
-include_directories(
-  .
-  win32
-  libAACdec/include
-  libAACenc/include
-  libSBRdec/include
-  libSBRenc/include
-  libMpegTPDec/include
-  libMpegTPEnc/include
-  libSYS/include
-  libFDK/include
-  libPCMutils/include
-)
-
-add_library(fdk-aac ${libfdk_aac_SOURCES})
-
-add_executable(aac-enc aac-enc.c wavreader.c)
-
-target_link_libraries(aac-enc fdk-aac)
-
-install(
-  TARGETS  fdk-aac
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-if(NOT DISABLE_INSTALL_TOOLS)
-  install (
-    TARGETS aac-enc
-    RUNTIME DESTINATION tools/fdk-aac
-  )
-endif()
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(
-    FILES
-    libAACdec/include/aacdecoder_lib.h
-    libAACenc/include/aacenc_lib.h
-    libSYS/include/FDK_audio.h
-    libSYS/include/genericStds.h
-    libSYS/include/machine_type.h
-    DESTINATION include/fdk-aac
-  )
-endif()
diff --git a/ports/fdk-aac/CONTROL b/ports/fdk-aac/CONTROL
deleted file mode 100644
index 3afcf5ff0..000000000
--- a/ports/fdk-aac/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: fdk-aac

-Version: 2018-07-08

-Port-Version: 3

-Homepage: https://github.com/mstorsjo/fdk-aac

-Description: A standalone library of the Fraunhofer FDK AAC code

-Supports: !(uwp | arm)

diff --git a/ports/fdk-aac/fdk-aac.def b/ports/fdk-aac/fdk-aac.def
deleted file mode 100644
index 8690b69b6..000000000
--- a/ports/fdk-aac/fdk-aac.def
+++ /dev/null
@@ -1,19 +0,0 @@
-EXPORTS
-aacDecoder_AncDataGet
-aacDecoder_AncDataInit
-aacDecoder_Close
-aacDecoder_ConfigRaw
-aacDecoder_DecodeFrame
-aacDecoder_Fill
-aacDecoder_GetFreeBytes
-aacDecoder_GetLibInfo
-aacDecoder_GetStreamInfo
-aacDecoder_Open
-aacDecoder_SetParam
-aacEncClose
-aacEncEncode
-aacEncGetLibInfo
-aacEncInfo
-aacEncOpen
-aacEncoder_GetParam
-aacEncoder_SetParam
diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake
index 90c4ba546..5a6119724 100644
--- a/ports/fdk-aac/portfile.cmake
+++ b/ports/fdk-aac/portfile.cmake
@@ -3,21 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO mstorsjo/fdk-aac
-  REF e45ae429b9ca8f234eb861338a75b2d89cde206a
-  SHA512 e4d0ec632a67642312bd0c812849601452d4ba45b31bc2f2a9392bba5fe2320b2099c5c7077c9571ea270804979039182060dc1acacdc397ca2a9b8ca43301a3
+  REF v2.0.2
+  SHA512 616207e85035d1659a2b7808ca6ec02ef53c1c4b39eb280fe861f82a4cf548e5db2ac381c496bad37dfc2b8c6677fe704d9fd8449e43d1f93d3e636239e0191b
   HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/fdk-aac.def DESTINATION ${SOURCE_PATH})
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+    OPTIONS_RELEASE -DBUILD_PROGRAMS=OFF
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fdk-aac)
-file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fdk-aac RENAME copyright)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/fdk-aac/vcpkg.json b/ports/fdk-aac/vcpkg.json
new file mode 100644
index 000000000..4f3cbf723
--- /dev/null
+++ b/ports/fdk-aac/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "fdk-aac",
+  "version-semver": "2.0.2",
+  "description": "A standalone library of the Fraunhofer FDK AAC code",
+  "homepage": "https://github.com/mstorsjo/fdk-aac"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index d11e695b9..b274cadd8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1973,8 +1973,8 @@
       "port-version": 0
     },
     "fdk-aac": {
-      "baseline": "2018-07-08",
-      "port-version": 3
+      "baseline": "2.0.2",
+      "port-version": 0
     },
     "fdlibm": {
       "baseline": "5.3-4",
diff --git a/versions/f-/fdk-aac.json b/versions/f-/fdk-aac.json
index d6a76e6b9..7af5ccc08 100644
--- a/versions/f-/fdk-aac.json
+++ b/versions/f-/fdk-aac.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "01ec3a3ac30a2128fb45b82c526e9fcf4d87de9a",
+      "version-semver": "2.0.2",
+      "port-version": 0
+    },
+    {
       "git-tree": "671b0954f5fe51fd11991f77f710901c26a8bd8b",
       "version-string": "2018-07-08",
       "port-version": 3