[packages/libsndfile] fix include directory issues in octave makefile

[atler]

commit 03037c48859e0bac77f599e8b65ba03ec6616572
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Feb 14 18:05:16 2025 +0100

    fix include directory issues in octave makefile
    
    3 issues solved:
    - INCLUDES still used in mkoctfile invocation after it was renamed to
      AM_CPPFLAGS in 1.0.26
    - "include" directory not added after it was created in 1.0.31
    - top_srcdir should be used instead of top_builddir

 libsndfile.spec          |  2 ++
 octave-include-dir.patch | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
---
diff --git a/libsndfile.spec b/libsndfile.spec
index d3569e9..5e6e4fd 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -18,6 +18,7 @@ Group:		Libraries
 Source0:	https://github.com/libsndfile/libsndfile/releases/download/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	04e2e6f726da7c5dc87f8cf72f250d04
 Patch0:		octave32.patch
+Patch1:		octave-include-dir.patch
 URL:		http://www.mega-nerd.com/libsndfile/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.69
@@ -125,6 +126,7 @@ dźwiękowych.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 %if %{without tests}
 %{__sed} -i 's, tests$,,' Makefile.am
diff --git a/octave-include-dir.patch b/octave-include-dir.patch
new file mode 100644
index 0000000..7c8d5fa
--- /dev/null
+++ b/octave-include-dir.patch
@@ -0,0 +1,24 @@
+--- libsndfile-1.2.2/Octave/Makefile.am.orig	2022-11-24 15:04:49.000000000 +0100
++++ libsndfile-1.2.2/Octave/Makefile.am	2025-02-14 17:56:28.054195607 +0100
+@@ -21,7 +21,7 @@
+ OCT_LIBS = @OCT_LIBS@
+ 
+ SNDFILEDIR = $(top_builddir)/src
+-AM_CPPFLAGS = -I$(SNDFILEDIR)
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+ 
+ oct_module_srcs = sndfile.cc
+ oct_module_files = sndfile.oct PKG_ADD
+@@ -39,10 +39,10 @@
+ # Use Octave's mkoctfile to do all the heavy lifting. Unfortunately, its
+ # a little dumb so we need to guide it carefully.
+ sndfile.oct : sndfile.o
+-	$(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null
++	$(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null
+ 
+ sndfile.o : sndfile.cc
+-	$(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null
++	$(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null
+ 
+ # Allow for the test being run in the build dir, but the test script
+ # being located in the source dir.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsndfile.git/commitdiff/03037c48859e0bac77f599e8b65ba03ec6616572