Add FAAD CLI to CMake/Bazel (#142)

Drive-by: remove automake/msvc build files

Author: eustas

.github/workflows/build.yaml

@@ -33,43 +33,6 @@ on:
     branches: [ master ]
 
 jobs:
-  BuildWithAutomake:
-    runs-on: ubuntu-latest
-
-    strategy:
-     fail-fast: false
-     matrix:
-       include:
-         - name: clang
-           cc: clang
-           cxx: clang++
-           cflags: -Wall -fcolor-diagnostics -fansi-escape-codes
-         - name: gcc
-           cc: gcc
-           cxx: g++
-           cflags: -Wall -fdiagnostics-color=always
-
-    env:
-      CC: ${{ matrix.cc || 'cc' }}
-      CXX: ${{ matrix.cxx || 'cxx' }}
-      CFLAGS: ${{ matrix.cflags || '-Wall' }}
-      CXXFLAGS: ${{ matrix.cflags || '-Wall' }}
-
-    steps:
-    - name: Checkout the source
-      uses: actions/checkout@v2
-      with:
-        submodules: false
-        fetch-depth: 1
-    - name: Configure and build
-      run: |
-        ./bootstrap
-        mkdir -p $RUNNER_TEMP/usrlocal
-        ./configure --prefix=$RUNNER_TEMP/usrlocal
-        make clean -j `nproc`
-        make -j `nproc`
-        make install-strip -j `nproc`
-
   BuildWithBazel:
     runs-on: ubuntu-latest
 
@@ -91,6 +54,28 @@ jobs:
 
     strategy:
      fail-fast: false
+     matrix:
+       include:
+         - name: Clang Shared
+           cc: clang
+           cxx: clang++
+           cflags: -Wall -fcolor-diagnostics -fansi-escape-codes
+           shared: 'true'
+         - name: Clang Static
+           cc: clang
+           cxx: clang++
+           cflags: -Wall -fcolor-diagnostics -fansi-escape-codes
+         - name: GCC Static
+           cc: gcc
+           cxx: g++
+           cflags: -Wall -fdiagnostics-color=always
+
+    env:
+      CC: ${{ matrix.cc || 'cc' }}
+      CXX: ${{ matrix.cxx || 'cxx' }}
+      CFLAGS: ${{ matrix.cflags || '-Wall' }}
+      CXXFLAGS: ${{ matrix.cflags || '-Wall' }}
+      SHARED: ${{matrix.shared || 'false'}}
 
     steps:
     - name: Checkout the source
@@ -100,6 +85,8 @@ jobs:
         fetch-depth: 1
     - name: Configure and build
       run: |
-        cmake -B build . -DCMAKE_INSTALL_PREFIX=$RUNNER_TEMP/usrlocal
+        cmake -B build . \
+            -DCMAKE_INSTALL_PREFIX=$RUNNER_TEMP/usrlocal \
+            -DBUILD_SHARED_LIBS=${SHARED}
         cmake --build build -j `nproc`
         cmake --install build

.gitignore

@@ -1,43 +1 @@
-*.o
-*.so
-*.a
-*.ncb
-*.plg
-*.aps
-*.opt
-*.aac
-*.wav
-*.lo
-*.in
-Makefile
-*.libs
-*.deps
-*.la
-*.log
-project/msvc/.vs/
-project/msvc/bin/
-project/msvc/intermediate/
-*.user
-*~
-*.bak
-/libfaad/faad2.pc
 bazel-*
-
-# Automake garbage created by bootstrap
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.sub
-config.status
-configure
-depcomp
-faad2.spec
-include/faad.h
-INSTALL
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1

BUILD.bazel

@@ -2,13 +2,14 @@ load("@rules_fuzzing//fuzzing:cc_defs.bzl", "cc_fuzz_test")
 
 # Unless building for embedded systems all headers / functions should exist.
 FAAD_DEFINES = [
+    "APPLY_DRC",
+    "HAVE_GETOPT_H=1",
     "HAVE_INTTYPES_H=1",
+    "HAVE_MEMCPY=1",
     "HAVE_STRINGS_H=1",
     "HAVE_SYS_STAT_H=1",
     "HAVE_SYS_TYPES_H=1",
-    "HAVE_MEMCPY=1",
     "STDC_HEADERS=1",
-    "APPLY_DRC",
 ]
 
 FAAD_SOURCES = glob([
@@ -21,10 +22,25 @@ FAAD_FLAGS = [
     "-pedantic",
 ]
 
-DRM_AFFIX = ["", "_drm"]
-DRM_DEFINES = [[], ["DRM_SUPPORT"]]
-FIXED_AFFIX = ["", "_fixed"]
-FIXED_DEFINES = [[], ["FIXED_POINT"]]
+DRM_AFFIX = [
+    "",
+    "_drm",
+]
+
+DRM_DEFINES = [
+    [],
+    ["DRM_SUPPORT"],
+]
+
+FIXED_AFFIX = [
+    "",
+    "_fixed",
+]
+
+FIXED_DEFINES = [
+    [],
+    ["FIXED_POINT"],
+]
 
 [cc_library(
     name = "faad" + DRM_AFFIX[drm] + FIXED_AFFIX[fixed],
@@ -50,3 +66,13 @@ cc_fuzz_test(
     local_defines = DRM_DEFINES[drm],
     deps = [":faad" + DRM_AFFIX[drm] + FIXED_AFFIX[fixed]],
 ) for drm in range(2) for fixed in range(2)]
+
+CLI_SOURCES = glob(["frontend/**/*.c", "frontend/**/*.h"], exclude = ["frontend/**/getopt.*"])
+
+[cc_binary(
+    name = "faad_cli" + DRM_AFFIX[drm] + FIXED_AFFIX[fixed],
+    srcs = CLI_SOURCES,
+    includes = ["frontend"],
+    local_defines = FAAD_DEFINES + DRM_DEFINES[drm] + FIXED_DEFINES[fixed],
+    deps = [":faad"],
+) for drm in range(2) for fixed in range(2)]

CMakeLists.txt

@@ -21,6 +21,8 @@ if(NOT DEFINED FAAD_BUNDLED_MODE)
 endif()
 mark_as_advanced(FAAD_BUNDLED_MODE)
 
+find_library(MATH_LIBRARY m)
+
 include(GNUInstallDirs)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -41,19 +43,12 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/include/faad.h ${FAAD_H_SRC})
 
 # Read sources list
 
-function(transform_sources_list INPUT_FILE OUTPUT_FILE)
-  file(READ ${INPUT_FILE} TEXT)
-  string(REGEX REPLACE "\\\\\n" "~continuation~" TEXT ${TEXT})
-  string(REGEX REPLACE "([a-zA-Z_][a-zA-Z0-9_]*)[\t ]*=[\t ]*([^\n]*)" "SET(\\1 \\2)" TEXT ${TEXT})
-  string(REPLACE "~continuation~" "\n" TEXT ${TEXT})
-  file(WRITE ${OUTPUT_FILE} ${TEXT})
-endfunction()
-
-transform_sources_list("libfaad/sources.lst" "${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake")
-include("${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake")
-list(TRANSFORM LIBFAAD_SOURCES PREPEND "libfaad/")
+file(GLOB_RECURSE LIBFAAD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} libfaad/*.c libfaad/*.h)
 mark_as_advanced(LIBFAAD_SOURCES)
 
+file(GLOB_RECURSE FAAD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} frontend/*.c frontend/*.h)
+list(FILTER FAAD_SOURCES EXCLUDE REGEX ".*getopt\\.[ch]$")
+
 # Build
 
 # Lets stick to predefined config, until more flexibility is actually requested.
@@ -79,8 +74,11 @@ endif()  # GCC
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/include/neaacdec.h
      DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include)
 
-foreach(LIB in faad faad_drm faad_fixed faad_drm_fixed)
+foreach(LIB faad faad_drm faad_fixed faad_drm_fixed)
   add_library(${LIB} ${LIBFAAD_SOURCES})
+  if(MATH_LIBRARY)
+    target_link_libraries(${LIB} PUBLIC ${MATH_LIBRARY})
+  endif()
   target_include_directories(${LIB} PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/include
   )
@@ -95,14 +93,14 @@ foreach(LIB in faad faad_drm faad_fixed faad_drm_fixed)
   )
 endforeach()
 
-foreach(LIB in faad_drm faad_drm_fixed)
-target_compile_definitions(faad_drm PRIVATE
+foreach(LIB faad_drm faad_drm_fixed)
+target_compile_definitions(${LIB} PRIVATE
   DRM_SUPPORT
 )
 endforeach()
 
-foreach(LIB in faad_fixed faad_drm_fixed)
-target_compile_definitions(faad_drm PRIVATE
+foreach(LIB faad_fixed faad_drm_fixed)
+target_compile_definitions(${LIB} PRIVATE
   FIXED_POINT
 )
 endforeach()
@@ -172,14 +170,21 @@ endfunction()
 
 transform_pc_file("libfaad/faad2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/faad2.pc" "${FAAD_VERSION}")
 
+# CLI
+
+add_executable(faad_cli ${FAAD_SOURCES})
+target_link_libraries(faad_cli faad)
+target_compile_definitions(faad_cli PRIVATE ${FAAD_DEFINES})
+set_target_properties(faad_cli PROPERTIES OUTPUT_NAME faad)
+
 # Installation
 
 if(NOT FAAD_BUNDLED_MODE)
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/faad2.pc"
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 
   install(
-    TARGETS faad faad_drm
+    TARGETS faad faad_cli faad_drm
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"