Formula for OpenJPH Needs Updating Due to Upstream Refactoring

[OldCrow]

Output of brew config

HOMEBREW_VERSION: 4.6.20-72-g56a5d20
ORIGIN: https://github.com/Homebrew/brew
HEAD: 56a5d20062e6e1e92583eab9475a8e75c45175b7
Last commit: 2 hours ago
Branch: main
Core tap origin: https://github.com/Homebrew/homebrew-core.git
Core tap HEAD: aca90227c41bccb1fe15dfee23e2d29371b87272
Core tap last commit: 51 minutes ago
Core tap JSON: 24 Jul 03:11 UTC
Core cask tap HEAD: b6561fcc73c6874e69612d1e937878871a96521d
Core cask tap last commit: 77 minutes ago
Core cask tap JSON: 24 Jul 03:11 UTC
HOMEBREW_PREFIX: /usr/local
HOMEBREW_CASK_OPTS: []
HOMEBREW_DISPLAY: /private/tmp/com.apple.launchd.p3AFnVXdf7/org.xquartz:0
HOMEBREW_DOWNLOAD_CONCURRENCY: 16
HOMEBREW_EDITOR: vim
HOMEBREW_FORBID_PACKAGES_FROM_PATHS: set
HOMEBREW_MAKE_JOBS: 8
HOMEBREW_NO_INSTALL_FROM_API: set
HOMEBREW_SORBET_RUNTIME: set
Homebrew Ruby: 3.4.5 => /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.4.5/bin/ruby
CPU: octa-core 64-bit ivybridge
Clang: 12.0.0 build 1200
Git: 2.24.3 => /Applications/Xcode.app/Contents/Developer/usr/bin/git
Curl: 7.64.1 => /usr/bin/curl
macOS: 10.15.7-x86_64
CLT: 12.4.0.0.1.1610135815
Xcode: 12.4

Output of brew doctor

Please note that these warnings are just used to help the Homebrew maintainers
with debugging if you file an issue. If everything you use Homebrew for is
working fine: please don't worry or file an issue; just ignore this. Thanks!

Warning: You are using macOS 10.15.
We (and Apple) do not provide support for this old version.

This is a Tier 3 configuration:
  https://docs.brew.sh/Support-Tiers#tier-3
You can report Tier 3 unrelated issues to Homebrew/* repositories!
Read the above document before opening any issues or PRs.

Description of issue

The openjph formula fails to upgrade from version 0.24.3 to 0.25.0 (and also fails when installing from HEAD) due to an outdated patch that targets code that has been refactored in the upstream project.

The reported error is:

==> Patching
Error: Failure while executing; `patch -g 0 -f -p1` exited with 1. Here's the output:
patching file src/core/common/ojph_mem.h
Hunk #1 FAILED at 62.
1 out of 1 hunk FAILED -- saving rejects to file src/core/common/ojph_mem.h.rej

The upstream project appears to have refactored the memory allocation code:
Before (v0.24.3):
• The ojph_aligned_malloc() function was implemented inline in the header file src/core/common/ojph_mem.h (lines 62-66)
• It used aligned_alloc() on non-Windows platforms

After (v0.25.0):
• The function declaration was moved to an extern "C" block in src/core/common/ojph_mem.h
• The implementation was moved to a new file: src/core/others/ojph_mem.c (lines 72-76)
• It still uses aligned_alloc() on non-Windows platforms
The current homebrew patch for v0.25.0 attempts to modify code at the old location.

Current patch:

__END__
--- a/src/core/common/ojph_mem.h
+++ b/src/core/common/ojph_mem.h
@@ -62,7 +62,8 @@
 #else
   inline void* ojph_aligned_malloc(size_t alignment, size_t size)
   {
-    return aligned_alloc(alignment, size);
+    void* ptr = nullptr;
+    return posix_memalign(&ptr, alignment, size) == 0 ? ptr : nullptr;
   }

Required patch:

__END__
--- a/src/core/others/ojph_mem.c
+++ b/src/core/others/ojph_mem.c
@@ -72,7 +72,8 @@
 #else
   void* ojph_aligned_malloc(size_t alignment, size_t size)
   {
-    return aligned_alloc(alignment, size);
+    void* ptr = NULL;
+    return posix_memalign(&ptr, alignment, size) == 0 ? ptr : NULL;
   }

Unfortunately due to work I have no more time to look at a PR myself for at least a week.

[p-linnane]

openjph was successfully bumped to v0.25.0 last week: Homebrew/homebrew-core#252205

[daeho-ro]

There is no patch for now in openjph 0.25.0, do we need that?