From a2d21601bcdbef8971488aa6da74539cb9ef6b5e Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 1 Jun 2022 21:33:36 +0800
Subject: [PATCH 1/5] Minor release.

---
 CMakeLists.txt                    | 14 ++++++++------
 scripts/conda/kaldifeat/meta.yaml |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 380338b..9e94f4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,17 +6,19 @@ project(kaldifeat)
 
 # remember to change the version in
 # scripts/conda/kaldifeat/meta.yaml
-set(kaldifeat_VERSION "1.15")
+set(kaldifeat_VERSION "1.15.1")
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(BUILD_RPATH_USE_ORIGIN TRUE)
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-set(CMAKE_INSTALL_RPATH "$ORIGIN")
-set(CMAKE_BUILD_RPATH "$ORIGIN")
+if(NOT APPLE)
+  set(CMAKE_SKIP_BUILD_RPATH FALSE)
+  set(BUILD_RPATH_USE_ORIGIN TRUE)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  set(CMAKE_INSTALL_RPATH "$ORIGIN")
+  set(CMAKE_BUILD_RPATH "$ORIGIN")
+endif()
 
 set(BUILD_SHARED_LIBS ON)
 if(WIN32)
diff --git a/scripts/conda/kaldifeat/meta.yaml b/scripts/conda/kaldifeat/meta.yaml
index 916cbaf..5bebec7 100644
--- a/scripts/conda/kaldifeat/meta.yaml
+++ b/scripts/conda/kaldifeat/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: kaldifeat
-  version: "1.15"
+  version: "1.15.1"
 
 source:
   path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"

From febd091b246bca7d536dde4e6632bae5df463846 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 1 Jun 2022 21:42:59 +0800
Subject: [PATCH 2/5] Fix release.

---
 CMakeLists.txt                    | 2 +-
 scripts/conda/kaldifeat/meta.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e94f4d..806e0f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(kaldifeat)
 
 # remember to change the version in
 # scripts/conda/kaldifeat/meta.yaml
-set(kaldifeat_VERSION "1.15.1")
+set(kaldifeat_VERSION "1.15.2")
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
diff --git a/scripts/conda/kaldifeat/meta.yaml b/scripts/conda/kaldifeat/meta.yaml
index 5bebec7..61bd455 100644
--- a/scripts/conda/kaldifeat/meta.yaml
+++ b/scripts/conda/kaldifeat/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: kaldifeat
-  version: "1.15.1"
+  version: "1.15.2"
 
 source:
   path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"

From 88627631b6491fe9621c5384d01119eda69b8820 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 1 Jun 2022 23:01:59 +0800
Subject: [PATCH 3/5] Minor release.

---
 CMakeLists.txt                    | 14 +++++++++-----
 scripts/conda/kaldifeat/meta.yaml |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 806e0f8..84fdbe0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,22 @@ project(kaldifeat)
 
 # remember to change the version in
 # scripts/conda/kaldifeat/meta.yaml
-set(kaldifeat_VERSION "1.15.2")
+set(kaldifeat_VERSION "1.15.3")
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(BUILD_RPATH_USE_ORIGIN TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_BUILD_RPATH "$ORIGIN")
+
 if(NOT APPLE)
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)
-  set(BUILD_RPATH_USE_ORIGIN TRUE)
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
   set(CMAKE_INSTALL_RPATH "$ORIGIN")
-  set(CMAKE_BUILD_RPATH "$ORIGIN")
+else()
+  set(CMAKE_MACOSX_RPATH ON)
+  set(CMAKE_INSTALL_RPATH "@loader_path")
 endif()
 
 set(BUILD_SHARED_LIBS ON)
diff --git a/scripts/conda/kaldifeat/meta.yaml b/scripts/conda/kaldifeat/meta.yaml
index 61bd455..e375897 100644
--- a/scripts/conda/kaldifeat/meta.yaml
+++ b/scripts/conda/kaldifeat/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: kaldifeat
-  version: "1.15.2"
+  version: "1.15.3"
 
 source:
   path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"

From 46535d5e6d3917987550a3e118d8175bb02ef64a Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 1 Jun 2022 23:37:33 +0800
Subject: [PATCH 4/5] Fix installation on macOS.

---
 CMakeLists.txt                       |  8 +-------
 kaldifeat/python/csrc/CMakeLists.txt | 11 +++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84fdbe0..31a5470 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,15 +15,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(BUILD_RPATH_USE_ORIGIN TRUE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_RPATH "$ORIGIN")
 set(CMAKE_BUILD_RPATH "$ORIGIN")
 
-if(NOT APPLE)
-  set(CMAKE_INSTALL_RPATH "$ORIGIN")
-else()
-  set(CMAKE_MACOSX_RPATH ON)
-  set(CMAKE_INSTALL_RPATH "@loader_path")
-endif()
-
 set(BUILD_SHARED_LIBS ON)
 if(WIN32)
   message(STATUS "Set BUILD_SHARED_LIBS to OFF for Windows")
diff --git a/kaldifeat/python/csrc/CMakeLists.txt b/kaldifeat/python/csrc/CMakeLists.txt
index c80637c..1403e6d 100644
--- a/kaldifeat/python/csrc/CMakeLists.txt
+++ b/kaldifeat/python/csrc/CMakeLists.txt
@@ -10,6 +10,17 @@ pybind11_add_module(_kaldifeat
   online-feature.cc
   utils.cc
 )
+
+if(APPLE)
+  execute_process(
+    COMMAND "${PYTHON_EXECUTABLE}" -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    OUTPUT_VARIABLE PYTHON_SITE_PACKAGE_DIR
+  )
+  message(STATUS "PYTHON_SITE_PACKAGE_DIR: ${PYTHON_SITE_PACKAGE_DIR}")
+  target_link_libraries(_kaldifeat PRIVATE "-Wl,-rpath,${PYTHON_SITE_PACKAGE_DIR}")
+endif()
+
 target_link_libraries(_kaldifeat PRIVATE kaldifeat_core)
 if(UNIX AND NOT APPLE)
   target_link_libraries(_kaldifeat PUBLIC ${TORCH_DIR}/lib/libtorch_python.so)

From 0c0e24298c379726b7f7cfbb9fc5e0030b06c256 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 1 Jun 2022 23:38:20 +0800
Subject: [PATCH 5/5] Minor release.

---
 CMakeLists.txt                    | 2 +-
 scripts/conda/kaldifeat/meta.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31a5470..238c3a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(kaldifeat)
 
 # remember to change the version in
 # scripts/conda/kaldifeat/meta.yaml
-set(kaldifeat_VERSION "1.15.3")
+set(kaldifeat_VERSION "1.15.4")
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
diff --git a/scripts/conda/kaldifeat/meta.yaml b/scripts/conda/kaldifeat/meta.yaml
index e375897..4deb67e 100644
--- a/scripts/conda/kaldifeat/meta.yaml
+++ b/scripts/conda/kaldifeat/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: kaldifeat
-  version: "1.15.3"
+  version: "1.15.4"
 
 source:
   path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"