From 27ddfd144a04bfa48cecffe39a88c8d07d87edfd Mon Sep 17 00:00:00 2001 From: Stevie Clifton Date: Fri, 6 Mar 2020 22:36:50 -0500 Subject: [PATCH] Removed libimagequant, tweaked build script. --- Formula/vips.rb | 1 - package.sh | 3 +-- setup.sh | 7 ++++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Formula/vips.rb b/Formula/vips.rb index 5e664d8..e36c1af 100644 --- a/Formula/vips.rb +++ b/Formula/vips.rb @@ -17,7 +17,6 @@ class Vips < Formula depends_on "libde265" depends_on "libgsf" depends_on "libheif" - depends_on "libimagequant" depends_on "libpng" depends_on "librsvg" depends_on "libtiff" diff --git a/package.sh b/package.sh index 7a3b5df..bef6239 100755 --- a/package.sh +++ b/package.sh @@ -49,7 +49,7 @@ chmod 644 lib/*.dylib printf "{\n\ \"cairo\": \"$(pkg-config --modversion cairo)\",\n\ \"croco\": \"$(pkg-config --modversion libcroco-0.6)\",\n\ - \"de265\": \"$(pkg-config --modversion libde265)\",\n\ + \"de265\": \"$(pkg-config --modversion libde265)\",\n\ \"exif\": \"$(pkg-config --modversion libexif)\",\n\ \"fontconfig\": \"$(pkg-config --modversion fontconfig)\",\n\ \"freetype\": \"$(pkg-config --modversion freetype2)\",\n\ @@ -60,7 +60,6 @@ printf "{\n\ \"gsf\": \"$(pkg-config --modversion libgsf-1)\",\n\ \"harfbuzz\": \"$(pkg-config --modversion harfbuzz)\",\n\ \"heif\": \"$(pkg-config --modversion libheif)\",\n\ - \"imagequant\": \"$(pkg-config --modversion libimagequant)\",\n\ \"jpeg\": \"$(pkg-config --modversion libjpeg)\",\n\ \"lcms\": \"$(pkg-config --modversion lcms2)\",\n\ \"orc\": \"$(pkg-config --modversion orc-0.4)\",\n\ diff --git a/setup.sh b/setup.sh index c365a33..299366e 100755 --- a/setup.sh +++ b/setup.sh @@ -5,14 +5,15 @@ REPO_LOCATION=steviec/package-libvips-darwin HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 -brew tap lovell/package-libvips-darwin https://github.com/$REPO_LOCATION.git +brew tap $REPO_LOCATION https://github.com/$REPO_LOCATION.git KEEP_DEPENDENCIES=$(brew deps --include-build $REPO_LOCATION/vips) echo "$KEEP_DEPENDENCIES" + brew update brew cleanup -brew list -1 | grep -Ev ${KEEP_DEPENDENCIES// /|} | xargs brew rm -f -brew rm -f libtiff gdk-pixbuf +brew list -1 | grep -Ev ${KEEP_DEPENDENCIES// /|} | xargs brew uninstall --force --ignore-dependencies +brew uninstall --force --ignore-dependencies libtiff gdk-pixbuf brew upgrade brew install advancecomp