From 0d698e101b9086c64d23b2c20ebf8d752962f1cd Mon Sep 17 00:00:00 2001 From: JCount Date: Sun, 10 Sep 2017 15:18:52 -0400 Subject: [PATCH] exiftran 2.14, rename from fbida rename formula because fbida is the name of a much larger project, and this is considered a "small tool" in that project; also improve description accuracy, move patch to formula-patches Closes #17901. Signed-off-by: JCount --- Formula/exiftran.rb | 33 ++++++++++++++++++++++++++++++++ Formula/fbida.rb | 45 -------------------------------------------- formula_renames.json | 1 + 3 files changed, 34 insertions(+), 45 deletions(-) create mode 100644 Formula/exiftran.rb delete mode 100644 Formula/fbida.rb diff --git a/Formula/exiftran.rb b/Formula/exiftran.rb new file mode 100644 index 0000000000..29d1239579 --- /dev/null +++ b/Formula/exiftran.rb @@ -0,0 +1,33 @@ +class Exiftran < Formula + desc "Transform digital camera jpegs and their EXIF data" + homepage "https://www.kraxel.org/blog/linux/fbida/" + url "https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz" + sha256 "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" + + bottle do + cellar :any + sha256 "93406f2444f68f31a202ad8c1a6de5f5bf6b49a5578557e7a84966694b7eda2e" => :sierra + sha256 "a995d8758481ecfea43cb0b750c3fb55a2fd5245c05e9a4fa8c7678f24557715" => :el_capitan + sha256 "217a0619bff984cd675945199d6e8fb438265541a298109051e3ab6508226fd5" => :yosemite + end + + depends_on "pkg-config" => :build + depends_on "jpeg" + depends_on "libexif" + depends_on "pixman" + + # Fix build on Darwin + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/185c281/exiftran/fix-build.diff" + sha256 "017268a3195fb52df08ed75827fa40e8179aff0d9e54c926b0ace5f8e60702bf" + end + + def install + system "make" + system "make", "prefix=#{prefix}", "install" + end + + test do + system "#{bin}/exiftran", "-9", "-o", "out.jpg", test_fixtures("test.jpg") + end +end diff --git a/Formula/fbida.rb b/Formula/fbida.rb deleted file mode 100644 index 695f099f62..0000000000 --- a/Formula/fbida.rb +++ /dev/null @@ -1,45 +0,0 @@ -class Fbida < Formula - desc "View and edit photo images" - homepage "https://linux.bytesex.org/fbida/" - url "https://dl.bytesex.org/releases/fbida/fbida-2.13.tar.gz" - sha256 "a887195dcd189055ee9b787eb03c8b7954df3aec540a1f90d8e92f873126db07" - - bottle do - cellar :any - sha256 "93406f2444f68f31a202ad8c1a6de5f5bf6b49a5578557e7a84966694b7eda2e" => :sierra - sha256 "a995d8758481ecfea43cb0b750c3fb55a2fd5245c05e9a4fa8c7678f24557715" => :el_capitan - sha256 "217a0619bff984cd675945199d6e8fb438265541a298109051e3ab6508226fd5" => :yosemite - end - - depends_on "libexif" - depends_on "jpeg" - - # Fix issue in detection of jpeg library - patch :DATA - - def install - ENV.append "LDFLAGS", "-liconv" - system "make" - bin.install "exiftran" - man1.install "exiftran.man" => "exiftran.1" - end - - test do - system "#{bin}/exiftran", "-9", "-o", "out.jpg", test_fixtures("test.jpg") - end -end - -__END__ -diff --git a/GNUmakefile b/GNUmakefile -index 2d18ab4..5b409fb 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -30,7 +30,7 @@ include $(srcdir)/mk/Autoconf.mk - - ac_jpeg_ver = $(shell \ - $(call ac_init,for libjpeg version);\ -- $(call ac_s_cmd,echo JPEG_LIB_VERSION \ -+ $(call ac_s_cmd,printf JPEG_LIB_VERSION \ - | cpp -include jpeglib.h | tail -n 1);\ - $(call ac_fini)) - diff --git a/formula_renames.json b/formula_renames.json index de43ba3b92..c50d678f24 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -37,6 +37,7 @@ "elasticsearch24": "elasticsearch@2.4", "eris": "monax", "erlang-r18": "erlang@18", + "fbida": "exiftran", "ffmpeg28": "ffmpeg@2.8", "fig": "docker-compose", "freetds091": "freetds@0.91",