build(mac): Add -system-libs flag for Homebrew compatibility

2026-02-04 05:44:53 +00:00 · 2025-12-20 18:20:59 +01:00
parent 67e560d288 eda489265d
commit bf271de52c
2 changed files with 101 additions and 48 deletions
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -42,6 +42,19 @@ jobs:
      with:
        name: CCExtractor mac build
        path: ./mac/artifacts
+  build_shell_system_libs:
+    # Test building with system libraries via pkg-config (for Homebrew formula compatibility)
+    runs-on: macos-latest
+    steps:
+    - name: Install dependencies
+      run: brew install pkg-config autoconf automake libtool tesseract leptonica gpac freetype libpng protobuf-c utf8proc zlib
+    - uses: actions/checkout@v6
+    - name: build with system libs
+      run: ./build.command -system-libs
+      working-directory: ./mac
+    - name: Display version information
+      run: ./ccextractor --version
+      working-directory: ./mac
  build_autoconf:
    runs-on: macos-latest
    steps:
--- a/mac/build.command
+++ b/mac/build.command
@@ -29,6 +29,12 @@ while [[ $# -gt 0 ]]; do
      fi
      shift
      ;;
+    -system-libs)
+      # Use system-installed libraries via pkg-config instead of bundled ones
+      # This is required for Homebrew formula compatibility
+      USE_SYSTEM_LIBS=true
+      shift
+      ;;
    -*)
      echo "Unknown option $1"
      exit 1
@@ -36,7 +42,12 @@ while [[ $# -gt 0 ]]; do
  esac
 done

-BLD_FLAGS="-std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP"
+BLD_FLAGS="-std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek"
+
+# Add flags for bundled libraries (not needed when using system libs)
+if [[ "$USE_SYSTEM_LIBS" != "true" ]]; then
+    BLD_FLAGS="$BLD_FLAGS -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP"
+fi

 # Add debug flags if needed
 if [[ "$DEBUG" == "true" ]]; then
@@ -53,7 +64,21 @@ if [[ "$HARDSUBX" == "true" ]]; then
    BLD_FLAGS="$BLD_FLAGS -DENABLE_HARDSUBX"
 fi

-BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/lib_hash -I../src/thirdparty/libpng -I../src/thirdparty -I../src/thirdparty/zlib -I../src/thirdparty/freetype/include `pkg-config --cflags --silence-errors gpac`"
+# Set up include paths based on whether we're using system libs or bundled
+if [[ "$USE_SYSTEM_LIBS" == "true" ]]; then
+    # Use system libraries via pkg-config (for Homebrew compatibility)
+    # Note: -I../src/thirdparty/lib_hash is needed so that "../lib_hash/sha2.h" resolves correctly
+    # (the .. goes up from lib_hash to thirdparty, then lib_hash/sha2.h finds the file)
+    BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/thirdparty/lib_hash -I../src/thirdparty"
+    BLD_INCLUDE="$BLD_INCLUDE $(pkg-config --cflags --silence-errors freetype2)"
+    BLD_INCLUDE="$BLD_INCLUDE $(pkg-config --cflags --silence-errors gpac)"
+    BLD_INCLUDE="$BLD_INCLUDE $(pkg-config --cflags --silence-errors libpng)"
+    BLD_INCLUDE="$BLD_INCLUDE $(pkg-config --cflags --silence-errors libprotobuf-c)"
+    BLD_INCLUDE="$BLD_INCLUDE $(pkg-config --cflags --silence-errors libutf8proc)"
+else
+    # Use bundled libraries (default for standalone builds)
+    BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/thirdparty/lib_hash -I../src/thirdparty/libpng -I../src/thirdparty -I../src/thirdparty/zlib -I../src/thirdparty/freetype/include $(pkg-config --cflags --silence-errors gpac)"
+fi

 # Add FFmpeg include path for Mac
 if [[ -d "/opt/homebrew/Cellar/ffmpeg" ]]; then
@@ -108,54 +133,69 @@ fi

 SRC_CCX="$(find ../src/lib_ccx -name '*.c')"
 SRC_LIB_HASH="$(find ../src/thirdparty/lib_hash -name '*.c')"
-SRC_LIBPNG="$(find ../src/thirdparty/libpng -name '*.c')"
-SRC_UTF8="../src/thirdparty/utf8proc/utf8proc.c"
-SRC_ZLIB="$(find ../src/thirdparty/zlib -name '*.c')"
-SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c \
-   ../src/thirdparty/freetype/base/ftbase.c \
-   ../src/thirdparty/freetype/base/ftbbox.c \
-   ../src/thirdparty/freetype/base/ftbdf.c \
-   ../src/thirdparty/freetype/base/ftbitmap.c \
-   ../src/thirdparty/freetype/base/ftcid.c \
-   ../src/thirdparty/freetype/base/ftfntfmt.c \
-   ../src/thirdparty/freetype/base/ftfstype.c \
-   ../src/thirdparty/freetype/base/ftgasp.c \
-   ../src/thirdparty/freetype/base/ftglyph.c \
-   ../src/thirdparty/freetype/base/ftgxval.c \
-   ../src/thirdparty/freetype/base/ftinit.c \
-   ../src/thirdparty/freetype/base/ftlcdfil.c \
-   ../src/thirdparty/freetype/base/ftmm.c \
-   ../src/thirdparty/freetype/base/ftotval.c \
-   ../src/thirdparty/freetype/base/ftpatent.c \
-   ../src/thirdparty/freetype/base/ftpfr.c \
-   ../src/thirdparty/freetype/base/ftstroke.c \
-   ../src/thirdparty/freetype/base/ftsynth.c \
-   ../src/thirdparty/freetype/base/ftsystem.c \
-   ../src/thirdparty/freetype/base/fttype1.c \
-   ../src/thirdparty/freetype/base/ftwinfnt.c \
-   ../src/thirdparty/freetype/bdf/bdf.c \
-   ../src/thirdparty/freetype/bzip2/ftbzip2.c \
-   ../src/thirdparty/freetype/cache/ftcache.c \
-   ../src/thirdparty/freetype/cff/cff.c \
-   ../src/thirdparty/freetype/cid/type1cid.c \
-   ../src/thirdparty/freetype/gzip/ftgzip.c \
-   ../src/thirdparty/freetype/lzw/ftlzw.c \
-   ../src/thirdparty/freetype/pcf/pcf.c \
-   ../src/thirdparty/freetype/pfr/pfr.c \
-   ../src/thirdparty/freetype/psaux/psaux.c \
-   ../src/thirdparty/freetype/pshinter/pshinter.c \
-   ../src/thirdparty/freetype/psnames/psnames.c \
-   ../src/thirdparty/freetype/raster/raster.c \
-   ../src/thirdparty/freetype/sfnt/sfnt.c \
-   ../src/thirdparty/freetype/smooth/smooth.c \
-   ../src/thirdparty/freetype/truetype/truetype.c \
-   ../src/thirdparty/freetype/type1/type1.c \
-   ../src/thirdparty/freetype/type42/type42.c \
-   ../src/thirdparty/freetype/winfonts/winfnt.c"

-BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_LIB_HASH $SRC_LIBPNG $SRC_UTF8 $SRC_ZLIB $SRC_FREETYPE"
+# Set up sources and linker based on whether we're using system libs or bundled
+if [[ "$USE_SYSTEM_LIBS" == "true" ]]; then
+    # Use system libraries - don't compile bundled sources
+    BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_LIB_HASH"

-BLD_LINKER="-lm -liconv -lpthread -ldl `pkg-config --libs --silence-errors gpac`"
+    BLD_LINKER="-lm -liconv -lpthread -ldl"
+    BLD_LINKER="$BLD_LINKER $(pkg-config --libs --silence-errors freetype2)"
+    BLD_LINKER="$BLD_LINKER $(pkg-config --libs --silence-errors gpac)"
+    BLD_LINKER="$BLD_LINKER $(pkg-config --libs --silence-errors libpng)"
+    BLD_LINKER="$BLD_LINKER $(pkg-config --libs --silence-errors libprotobuf-c)"
+    BLD_LINKER="$BLD_LINKER $(pkg-config --libs --silence-errors libutf8proc)"
+    BLD_LINKER="$BLD_LINKER $(pkg-config --libs --silence-errors zlib)"
+else
+    # Use bundled libraries (default)
+    SRC_LIBPNG="$(find ../src/thirdparty/libpng -name '*.c')"
+    SRC_UTF8="../src/thirdparty/utf8proc/utf8proc.c"
+    SRC_ZLIB="$(find ../src/thirdparty/zlib -name '*.c')"
+    SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c \
+       ../src/thirdparty/freetype/base/ftbase.c \
+       ../src/thirdparty/freetype/base/ftbbox.c \
+       ../src/thirdparty/freetype/base/ftbdf.c \
+       ../src/thirdparty/freetype/base/ftbitmap.c \
+       ../src/thirdparty/freetype/base/ftcid.c \
+       ../src/thirdparty/freetype/base/ftfntfmt.c \
+       ../src/thirdparty/freetype/base/ftfstype.c \
+       ../src/thirdparty/freetype/base/ftgasp.c \
+       ../src/thirdparty/freetype/base/ftglyph.c \
+       ../src/thirdparty/freetype/base/ftgxval.c \
+       ../src/thirdparty/freetype/base/ftinit.c \
+       ../src/thirdparty/freetype/base/ftlcdfil.c \
+       ../src/thirdparty/freetype/base/ftmm.c \
+       ../src/thirdparty/freetype/base/ftotval.c \
+       ../src/thirdparty/freetype/base/ftpatent.c \
+       ../src/thirdparty/freetype/base/ftpfr.c \
+       ../src/thirdparty/freetype/base/ftstroke.c \
+       ../src/thirdparty/freetype/base/ftsynth.c \
+       ../src/thirdparty/freetype/base/ftsystem.c \
+       ../src/thirdparty/freetype/base/fttype1.c \
+       ../src/thirdparty/freetype/base/ftwinfnt.c \
+       ../src/thirdparty/freetype/bdf/bdf.c \
+       ../src/thirdparty/freetype/bzip2/ftbzip2.c \
+       ../src/thirdparty/freetype/cache/ftcache.c \
+       ../src/thirdparty/freetype/cff/cff.c \
+       ../src/thirdparty/freetype/cid/type1cid.c \
+       ../src/thirdparty/freetype/gzip/ftgzip.c \
+       ../src/thirdparty/freetype/lzw/ftlzw.c \
+       ../src/thirdparty/freetype/pcf/pcf.c \
+       ../src/thirdparty/freetype/pfr/pfr.c \
+       ../src/thirdparty/freetype/psaux/psaux.c \
+       ../src/thirdparty/freetype/pshinter/pshinter.c \
+       ../src/thirdparty/freetype/psnames/psnames.c \
+       ../src/thirdparty/freetype/raster/raster.c \
+       ../src/thirdparty/freetype/sfnt/sfnt.c \
+       ../src/thirdparty/freetype/smooth/smooth.c \
+       ../src/thirdparty/freetype/truetype/truetype.c \
+       ../src/thirdparty/freetype/type1/type1.c \
+       ../src/thirdparty/freetype/type42/type42.c \
+       ../src/thirdparty/freetype/winfonts/winfnt.c"
+
+    BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_LIB_HASH $SRC_LIBPNG $SRC_UTF8 $SRC_ZLIB $SRC_FREETYPE"
+    BLD_LINKER="-lm -liconv -lpthread -ldl $(pkg-config --libs --silence-errors gpac)"
+fi

 if [[ "$ENABLE_OCR" == "true" ]]; then
    BLD_LINKER="$BLD_LINKER `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors lept`"