<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ef37aa786f5164f45799ad5f897e288fe7026982">https://github.com/macports/macports-ports/commit/ef37aa786f5164f45799ad5f897e288fe7026982</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ef37aa786f5 stk: Update to 4.6.2
</span>ef37aa786f5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ef37aa786f5164f45799ad5f897e288fe7026982
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 18 03:31:56 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> stk: Update to 4.6.2
</span>---
audio/stk/Portfile | 15 ++++----
audio/stk/files/CXXFLAGS.patch | 6 ++--
audio/stk/files/LDFLAGS.patch | 72 --------------------------------------
audio/stk/files/RtAudio.cpp.patch | 22 ------------
audio/stk/files/library-name.patch | 50 +++++++-------------------
5 files changed, 22 insertions(+), 143 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/stk/Portfile b/audio/stk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c59c2c84a02..9ee4d91d433 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/stk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/stk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,14 +6,13 @@ PortGroup github 1.0
</span> # configure script checks endianness.
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup thestk stk 4.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup thestk stk 4.6.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 27623960139c126ab0c34feab6bf4e0e12ddc2f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e77ba3c80cdd93ca02c34098b9b7f918df3d648c87f1ed5d94fe854debd6d101 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2593348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c72434e680761fc531650a376fc9a3946134383c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 573e26ccf72ce436a1dc4ee3bea05fd35e0a8e742c339c7f5b85225502238083 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2618125
</span>
categories audio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +35,7 @@ long_description The Synthesis ToolKit in C++ (STK) is a set of open source \
</span> In fact, the ToolKit has been working continuously for \
nearly 20 years now. \
STK currently runs with realtime support (audio and MIDI) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- on Linux, OS X, and Windows computer platforms. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on Linux, macOS, and Windows computer platforms. \
</span> Generic, non-realtime support has been tested under \
NeXTStep, Sun, and other platforms and should work with \
any standard C++ compiler.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +50,7 @@ post-extract {
</span> }
patchfiles library-name.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RtAudio.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS.patch
</span>
# Rebuild configure after patching configure.ac above.
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/stk/files/CXXFLAGS.patch b/audio/stk/files/CXXFLAGS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 56fa4d523b5..75ab83cfb05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/stk/files/CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/stk/files/CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> Use MacPorts CXXFLAGS.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2020-04-27 00:43:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,8 +99,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2021-11-17 20:08:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2023-01-18 03:27:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,8 +103,6 @@
</span> # For -I and -D flags
CPPFLAGS="$CPPFLAGS $cppflag"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/stk/files/LDFLAGS.patch b/audio/stk/files/LDFLAGS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e43fc05f693..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/stk/files/LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use MacPorts LDFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Submitted upstream: https://github.com/thestk/stk/pull/96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- projects/demo/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ projects/demo/Makefile.in 2020-04-27 00:51:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -I$(INCLUDE) -I$(INCLUDE)/../src/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- projects/ragamatic/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ projects/ragamatic/Makefile.in 2020-04-27 00:51:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -I$(INCLUDE) -I$(INCLUDE)/../src/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- projects/examples/libMakefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ projects/examples/libMakefile.in 2020-04-27 00:50:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -I$(INCLUDE) -Iinclude
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- projects/examples/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ projects/examples/Makefile.in 2020-04-27 00:50:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -I$(INCLUDE) -I$(INCLUDE)/../src/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- projects/effects/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ projects/effects/Makefile.in 2020-04-27 00:50:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -I$(INCLUDE) -I$(INCLUDE)/../src/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- projects/eguitar/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ projects/eguitar/Makefile.in 2020-04-27 00:50:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -I$(INCLUDE) -I$(INCLUDE)/../src/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2020-04-27 00:50:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS += @byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += $(INCLUDE) -Iinclude -fPIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REALTIME = @realtime@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/stk/files/RtAudio.cpp.patch b/audio/stk/files/RtAudio.cpp.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3818c17fe6f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/stk/files/RtAudio.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Include <unistd.h> to fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RtAudio.cpp:1128:21: error: use of undeclared identifier 'getpid'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( hog_pid != getpid() ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RtAudio.cpp:1129:17: error: use of undeclared identifier 'getpid'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hog_pid = getpid();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RtAudio.cpp:1177:7: error: use of undeclared identifier 'usleep'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usleep( 5000 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-3 errors generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/RtAudio.cpp.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/RtAudio.cpp 2020-07-03 06:40:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <climits>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Static variable definitions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/stk/files/library-name.patch b/audio/stk/files/library-name.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fe9f00778ce..6d4c277441b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/stk/files/library-name.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/stk/files/library-name.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,7 @@
</span> Name the library files correctly.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Set the library's install_name. Submitted upstream:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/thestk/stk/pull/99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use autoconf variables prefix, exec_prefix, bindir, libdir, includedir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-correctly. Submitted upstream: https://github.com/thestk/stk/pull/97
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2020-04-27 02:00:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,16 +111,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2021-11-17 20:08:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2023-01-18 03:27:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,16 +115,16 @@
</span>
AC_CANONICAL_HOST
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +17,15 @@ correctly. Submitted upstream: https://github.com/thestk/stk/pull/97
</span> *-apple*)
AC_SUBST( sharedlib, ["libstk.dylib"] )
- AC_SUBST( sharedname, ["${basesharedname}.dylib"] )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_SUBST( libflags, ["-dynamiclib -o ${basesharedname}.dylib"] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_SUBST( libflags, ["-dynamiclib -install_name \$(libdir)/${basesharedname}.dylib -o ${basesharedname}.dylib"] )
</span> + AC_SUBST( sharedname, ["libstk.\$(MAJOR).dylib"] )
+ AC_SUBST( sharedrelease, ["libstk.\$(RELEASE).dylib"] )
+ AC_SUBST( libflags, ["-dynamiclib -install_name \$(libdir)/\$(SHAREDNAME)"] )
esac
if test $realtime = yes; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2019-04-18 08:27:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2020-04-27 02:21:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2021-11-17 20:08:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2023-01-18 03:27:50.000000000 -0600
</span> @@ -3,6 +3,8 @@
STATICLIB = libstk.a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,22 +35,7 @@ correctly. Submitted upstream: https://github.com/thestk/stk/pull/97
</span> MAJOR = 4
RELEASE = @PACKAGE_VERSION@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,9 +12,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = /bin/rm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN = /bin/ln
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJECT_PATH = @object_path@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBDIR = @libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = @prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDEDIR = @includedir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix = @prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exec_prefix = @exec_prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bindir = @bindir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libdir = @libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+includedir = @includedir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vpath %.o $(OBJECT_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJECTS = Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,18 +92,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,9 +93,7 @@
</span> $(AR) $(STATICLIB) $(OBJECT_PATH)/*.o
$(SHAREDLIB) : $(OBJECTS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,23 +45,20 @@ correctly. Submitted upstream: https://github.com/thestk/stk/pull/97
</span> + $(CC) $(LDFLAGS) -fPIC @libflags@ -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
install-headers:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -R ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(includedir)/stk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -R ../include/*.h $(DESTDIR)$(includedir)/stk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -d $(DESTDIR)$(includedir)/stk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,8 +101,9 @@
</span>
install: $(SHAREDLIB) install-headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -d $(DESTDIR)$(libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install -m 644 @sharedname@ $(DESTDIR)$(libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -sf @sharedname@ $(DESTDIR)$(libdir)/$(SHAREDLIB)
</span> + install -m 644 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDRELEASE)
+ $(LN) -sf $(SHAREDRELEASE) $(DESTDIR)$(libdir)/$(SHAREDNAME)
+ $(LN) -sf $(SHAREDRELEASE) $(DESTDIR)$(libdir)/$(SHAREDLIB)
$(OBJECTS) : Stk.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +111,7 @@
</span> clean :
$(RM) -f $(OBJECT_PATH)/*.o
$(RM) -f $(STATICLIB)
</pre><pre style='margin:0'>
</pre>