Skip to content

Commit d296706

Browse files
author
dsward2
committed
For macOS Catalina, address build issues for the Xcode Archive command - mainly in fix_rtl_fm_localradio.sh and import_dylibs2.sh - and the ordering of LocalRadio project build phases.
1 parent 8e6f71a commit d296706

8 files changed

Lines changed: 449 additions & 416 deletions

File tree

‎LocalRadio.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7228,8 +7228,8 @@
72287228
buildPhases = (
72297229
0E4ECFB71EAB633B00D2157B /* Sources */,
72307230
0E9B3CB521DC4BEE004A91E6 /* Run import_dylibs2.sh Script */,
7231-
0E4ECFB81EAB633B00D2157B /* Frameworks */,
72327231
0E4ED0121EAB65E900D2157B /* Copy Libraries */,
7232+
0E4ECFB81EAB633B00D2157B /* Frameworks */,
72337233
0E4ECFB91EAB633B00D2157B /* Resources */,
72347234
0E4ED21E1EABDC6900D2157B /* Copy Tools */,
72357235
0E0C693D1F1C9D4800A7EE5E /* Run Fix stereodemux Script */,

‎LocalRadio/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.18</string>
20+
<string>1.20</string>
2121
<key>CFBundleVersion</key>
22-
<string>19</string>
22+
<string>20</string>
2323
<key>ITSAppUsesNonExemptEncryption</key>
2424
<false/>
2525
<key>LSApplicationCategoryType</key>

‎LocalRadio/Scripts/fix_rtl_fm_localradio.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ echo install_name_tool -change /opt/local/lib/libusb-1.0.0.dylib @executable_pat
2020

2121
install_name_tool -change /opt/local/lib/libusb-1.0.0.dylib @executable_path/../Frameworks/libusb-1.0.0.dylib ${BUILT_PRODUCTS_DIR}/rtl_fm_localradio
2222

23+
exit
24+
25+
# moved to import_dylibs2.sh
2326
echo "Modify executable_path to libltdl in sox and libsox.3.dylib"
2427

2528
echo install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/sox

‎LocalRadio/Scripts/import_dylibs2.sh‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,21 @@ install_name_tool -id @executable_path/../Frameworks/libsox.3.dylib ${BUILT_PROD
7272

7373
# fix sox library loading paths
7474

75+
echo "fix sox library loading paths"
76+
77+
echo install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${SOXPATH}
78+
79+
install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${SOXPATH}
80+
81+
echo install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/Libraries_Modified/libsox.3.dylib
82+
83+
install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/Libraries_Modified/libsox.3.dylib
84+
7585
echo install_name_tool -change /usr/local/lib/libsox.3.dylib @executable_path/../Frameworks/libsox.3.dylib ${SOXPATH}
7686
install_name_tool -change /usr/local/lib/libsox.3.dylib @executable_path/../Frameworks/libsox.3.dylib ${SOXPATH}
7787

88+
89+
7890
echo install_name_tool -change /opt/local/lib/libvorbisenc.2.dylib @executable_path/../Frameworks/libvorbisenc.2.dylib ${SOXPATH}
7991
install_name_tool -change /opt/local/lib/libvorbisenc.2.dylib @executable_path/../Frameworks/libvorbisenc.2.dylib ${SOXPATH}
8092

@@ -134,6 +146,8 @@ install_name_tool -change /opt/local/lib/liblzma.5.dylib /usr/lib/liblzma.dylib
134146

135147
#####################################################################
136148

149+
echo Copy libraries to Libraries_Modified folder
150+
137151
# Now fix the libraries copied from MacPorts to load other interdependent libraries from the app bundle instead
138152

139153
cd ${BUILT_PRODUCTS_DIR}
@@ -147,7 +161,7 @@ echo /opt/local/bin/dylibbundler -b -x "${EXECFILE}" -d "${MODIFIEDLIBPATH}" -p
147161

148162
# TARGETS should list the same files in Project Navigator in the Libraries_Modified folder, except for libsox
149163

150-
TARGETS="libao.4.dylib libfftw3f.3.dylib libFLAC.8.dylib libicudata.58.2.dylib libicui18n.58.2.dylib libicuuc.58.2.dylib libliquid.dylib libogg.0.dylib libopus.0.dylib libopusfile.0.dylib librtlsdr.0.6git.dylib libsndfile.1.dylib libtheora.0.dylib libusb-1.0.0.dylib libvorbis.0.dylib libvorbisenc.2.dylib libvorbisfile.3.dylib"
164+
TARGETS="libao.4.dylib libfftw3f.3.dylib libFLAC.8.dylib libicudata.58.2.dylib libicui18n.58.2.dylib libicuuc.58.2.dylib libliquid.dylib libltdl.7.dylib libogg.0.dylib libopus.0.dylib libopusfile.0.dylib librtlsdr.0.6git.dylib libsndfile.1.dylib libtheora.0.dylib libusb-1.0.0.dylib libvorbis.0.dylib libvorbisenc.2.dylib libvorbisfile.3.dylib"
151165

152166
for TARGET in ${TARGETS[*]} ; do
153167

‎LocalRadio/rtl-sdr-master/src/librtlsdr.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,6 +1634,10 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index)
16341634
return 0;
16351635
err:
16361636
if (dev) {
1637+
// dsward https://github.com/osmocom/rtl-sdr/commit/be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7
1638+
if (dev->devh) // dsward avoid memory leak
1639+
libusb_close(dev->devh); // dsward
1640+
16371641
if (dev->ctx)
16381642
libusb_exit(dev->ctx);
16391643

‎wfm-tools/stereodemux/.deps/stereodemux-stereodemux.Po‎

Lines changed: 346 additions & 334 deletions
Large diffs are not rendered by default.

‎wfm-tools/stereodemux/autom4te.cache/requests‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -34,47 +34,47 @@
3434
'configure.ac'
3535
],
3636
{
37-
'_AM_SET_OPTION' => 1,
38-
'AM_RUN_LOG' => 1,
39-
'AM_SET_DEPDIR' => 1,
40-
'AM_PROG_CC_C_O' => 1,
41-
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
37+
'AM_SET_LEADING_DOT' => 1,
38+
'_AM_MANGLE_OPTION' => 1,
4239
'AU_DEFUN' => 1,
43-
'AM_CONDITIONAL' => 1,
44-
'AM_SANITY_CHECK' => 1,
40+
'AM_AUTOMAKE_VERSION' => 1,
41+
'AM_SUBST_NOTMAKE' => 1,
42+
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
43+
'AM_AUX_DIR_EXPAND' => 1,
4544
'AM_DEP_TRACK' => 1,
46-
'AM_SET_LEADING_DOT' => 1,
47-
'_m4_warn' => 1,
48-
'AM_INIT_AUTOMAKE' => 1,
45+
'm4_pattern_allow' => 1,
46+
'AC_CONFIG_MACRO_DIR' => 1,
47+
'AM_PROG_INSTALL_STRIP' => 1,
48+
'AM_RUN_LOG' => 1,
49+
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
50+
'AM_PROG_INSTALL_SH' => 1,
51+
'_AM_SET_OPTION' => 1,
52+
'_AM_DEPENDENCIES' => 1,
53+
'AM_MAKE_INCLUDE' => 1,
54+
'AM_CONDITIONAL' => 1,
4955
'AM_MISSING_HAS_RUN' => 1,
5056
'_AM_PROG_TAR' => 1,
51-
'm4_pattern_forbid' => 1,
52-
'AM_AUX_DIR_EXPAND' => 1,
53-
'_AM_IF_OPTION' => 1,
54-
'AM_SUBST_NOTMAKE' => 1,
5557
'_AM_CONFIG_MACRO_DIRS' => 1,
56-
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
58+
'_m4_warn' => 1,
59+
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
60+
'm4_include' => 1,
5761
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
58-
'AC_CONFIG_MACRO_DIR' => 1,
62+
'include' => 1,
5963
'_AM_SUBST_NOTMAKE' => 1,
60-
'_AM_SET_OPTIONS' => 1,
61-
'AC_DEFUN_ONCE' => 1,
62-
'AM_PROG_INSTALL_SH' => 1,
63-
'AM_PROG_INSTALL_STRIP' => 1,
64-
'_AM_AUTOCONF_VERSION' => 1,
65-
'_AM_MANGLE_OPTION' => 1,
64+
'AM_PROG_CC_C_O' => 1,
6665
'_AM_PROG_CC_C_O' => 1,
67-
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
68-
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
69-
'AM_SILENT_RULES' => 1,
70-
'm4_pattern_allow' => 1,
71-
'AM_AUTOMAKE_VERSION' => 1,
72-
'_AM_DEPENDENCIES' => 1,
73-
'include' => 1,
74-
'AM_MAKE_INCLUDE' => 1,
7566
'AM_MISSING_PROG' => 1,
76-
'm4_include' => 1,
77-
'AC_DEFUN' => 1
67+
'AM_SILENT_RULES' => 1,
68+
'AM_SANITY_CHECK' => 1,
69+
'm4_pattern_forbid' => 1,
70+
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
71+
'AC_DEFUN_ONCE' => 1,
72+
'AM_SET_DEPDIR' => 1,
73+
'AC_DEFUN' => 1,
74+
'_AM_SET_OPTIONS' => 1,
75+
'_AM_IF_OPTION' => 1,
76+
'_AM_AUTOCONF_VERSION' => 1,
77+
'AM_INIT_AUTOMAKE' => 1
7878
}
7979
], 'Autom4te::Request' ),
8080
bless( [
@@ -89,64 +89,64 @@
8989
'configure.ac'
9090
],
9191
{
92-
'm4_pattern_forbid' => 1,
92+
'AM_CONDITIONAL' => 1,
93+
'AC_LIBSOURCE' => 1,
94+
'AC_CONFIG_LINKS' => 1,
95+
'AM_PROG_MKDIR_P' => 1,
96+
'AC_PROG_LIBTOOL' => 1,
97+
'sinclude' => 1,
98+
'AC_CANONICAL_SYSTEM' => 1,
99+
'LT_SUPPORTED_TAG' => 1,
100+
'AM_XGETTEXT_OPTION' => 1,
93101
'AC_FC_SRCEXT' => 1,
94102
'_AM_MAKEFILE_INCLUDE' => 1,
103+
'AM_GNU_GETTEXT' => 1,
104+
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
105+
'AM_POT_TOOLS' => 1,
106+
'AM_PROG_FC_C_O' => 1,
95107
'AC_CANONICAL_TARGET' => 1,
96-
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
97-
'AM_INIT_AUTOMAKE' => 1,
98-
'AM_MAINTAINER_MODE' => 1,
108+
'AC_SUBST_TRACE' => 1,
99109
'AH_OUTPUT' => 1,
100-
'AC_SUBST' => 1,
101-
'AM_PROG_MKDIR_P' => 1,
110+
'_AM_COND_IF' => 1,
111+
'LT_INIT' => 1,
102112
'_AM_COND_ELSE' => 1,
113+
'm4_pattern_allow' => 1,
114+
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
115+
'AC_CONFIG_SUBDIRS' => 1,
103116
'AC_FC_PP_DEFINE' => 1,
104117
'AC_FC_PP_SRCEXT' => 1,
105-
'AM_CONDITIONAL' => 1,
106-
'AC_CANONICAL_SYSTEM' => 1,
107-
'AM_PROG_CC_C_O' => 1,
108-
'AC_DEFINE_TRACE_LITERAL' => 1,
109-
'_AM_COND_IF' => 1,
110-
'_m4_warn' => 1,
111-
'AC_CONFIG_LIBOBJ_DIR' => 1,
112-
'AC_CANONICAL_HOST' => 1,
113-
'sinclude' => 1,
114-
'AC_CONFIG_HEADERS' => 1,
115-
'm4_pattern_allow' => 1,
116118
'AM_PROG_F77_C_O' => 1,
117-
'AC_LIBSOURCE' => 1,
118-
'AC_FC_FREEFORM' => 1,
119-
'AM_SILENT_RULES' => 1,
120-
'AM_PROG_MOC' => 1,
121-
'AC_CONFIG_SUBDIRS' => 1,
122-
'AM_POT_TOOLS' => 1,
123-
'LT_INIT' => 1,
119+
'AM_PATH_GUILE' => 1,
120+
'AC_REQUIRE_AUX_FILE' => 1,
121+
'_AM_COND_ENDIF' => 1,
122+
'AM_PROG_CXX_C_O' => 1,
123+
'AM_AUTOMAKE_VERSION' => 1,
124+
'm4_pattern_forbid' => 1,
124125
'AM_NLS' => 1,
125-
'AC_CONFIG_FILES' => 1,
126-
'AM_GNU_GETTEXT' => 1,
127-
'AM_PROG_FC_C_O' => 1,
128-
'AC_PROG_LIBTOOL' => 1,
129-
'm4_include' => 1,
130-
'AC_CONFIG_LINKS' => 1,
126+
'AC_CANONICAL_BUILD' => 1,
131127
'AC_CONFIG_AUX_DIR' => 1,
128+
'AC_SUBST' => 1,
129+
'AC_CONFIG_LIBOBJ_DIR' => 1,
130+
'AM_INIT_AUTOMAKE' => 1,
131+
'AM_ENABLE_MULTILIB' => 1,
132132
'include' => 1,
133-
'AM_PATH_GUILE' => 1,
134-
'AM_AUTOMAKE_VERSION' => 1,
135133
'_AM_SUBST_NOTMAKE' => 1,
134+
'AM_PROG_CC_C_O' => 1,
135+
'AC_CONFIG_FILES' => 1,
136136
'm4_sinclude' => 1,
137+
'AM_SILENT_RULES' => 1,
138+
'AM_PROG_MOC' => 1,
139+
'AC_DEFINE_TRACE_LITERAL' => 1,
140+
'AC_INIT' => 1,
137141
'LT_CONFIG_LTDL_DIR' => 1,
138-
'AM_XGETTEXT_OPTION' => 1,
139142
'AM_PROG_AR' => 1,
140-
'AC_CANONICAL_BUILD' => 1,
141-
'AM_ENABLE_MULTILIB' => 1,
142-
'LT_SUPPORTED_TAG' => 1,
143+
'm4_include' => 1,
143144
'_LT_AC_TAGCONFIG' => 1,
144-
'AC_REQUIRE_AUX_FILE' => 1,
145-
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
146-
'AC_INIT' => 1,
147-
'AC_SUBST_TRACE' => 1,
148-
'_AM_COND_ENDIF' => 1,
149-
'AM_PROG_CXX_C_O' => 1,
145+
'AC_CANONICAL_HOST' => 1,
146+
'_m4_warn' => 1,
147+
'AM_MAINTAINER_MODE' => 1,
148+
'AC_CONFIG_HEADERS' => 1,
149+
'AC_FC_FREEFORM' => 1,
150150
'AM_MAKEFILE_INCLUDE' => 1
151151
}
152152
], 'Autom4te::Request' )

‎wfm-tools/stereodemux/config.log‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ hostname = Dell.local
1414
uname -m = x86_64
1515
uname -r = 18.7.0
1616
uname -s = Darwin
17-
uname -v = Darwin Kernel Version 18.7.0: Thu Jun 20 18:42:21 PDT 2019; root:xnu-4903.270.47~4/RELEASE_X86_64
17+
uname -v = Darwin Kernel Version 18.7.0: Tue Aug 20 16:57:14 PDT 2019; root:xnu-4903.271.2~2/RELEASE_X86_64
1818

1919
/usr/bin/uname -p = i386
2020
/bin/uname -X = unknown
@@ -23,15 +23,15 @@ uname -v = Darwin Kernel Version 18.7.0: Thu Jun 20 18:42:21 PDT 2019; root:xnu-
2323
/usr/bin/arch -k = unknown
2424
/usr/convex/getsysinfo = unknown
2525
/usr/bin/hostinfo = Mach kernel version:
26-
Darwin Kernel Version 18.7.0: Thu Jun 20 18:42:21 PDT 2019; root:xnu-4903.270.47~4/RELEASE_X86_64
26+
Darwin Kernel Version 18.7.0: Tue Aug 20 16:57:14 PDT 2019; root:xnu-4903.271.2~2/RELEASE_X86_64
2727
Kernel configured for up to 12 processors.
2828
6 processors are physically available.
2929
12 processors are logically available.
3030
Processor type: i486 (Intel 80486)
3131
Processors active: 0 1 2 3 4 5 6 7 8 9 10 11
3232
Primary memory available: 16.00 gigabytes
33-
Default processor set: 416 tasks, 1786 threads, 12 processors
34-
Load average: 2.38, Mach factor: 9.61
33+
Default processor set: 585 tasks, 1865 threads, 12 processors
34+
Load average: 3.54, Mach factor: 8.48
3535
/bin/machine = unknown
3636
/usr/bin/oslevel = unknown
3737
/bin/universe = unknown

0 commit comments

Comments
 (0)