Skip to content

Commit 54a2197

Browse files
bsdelfbsdelf
committed
Fix for FreeBSD
1 parent c6664e1 commit 54a2197

File tree

3 files changed

+29
-12
lines changed

3 files changed

+29
-12
lines changed

‎CMakeLists.txt‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ include_directories(BEFORE deps)
2222
set(THREADS_PREFER_PTHREAD_FLAG ON)
2323
find_package(Threads REQUIRED)
2424

25-
SET(CMAKE_INSTALL_RPATH "\${CMAKE_INSTALL_PREFIX}/lib:\${CMAKE_INSTALL_PREFIX}/bin")
26-
2725
#==== OS Check ====#
2826
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
2927
set(FREEBSD true)
@@ -42,6 +40,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
4240
endif()
4341

4442
set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install path prefix")
43+
set(CMAKE_INSTALL_RPATH "\${CMAKE_INSTALL_PREFIX}/lib:\${CMAKE_INSTALL_PREFIX}/bin")
4544
add_definitions(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
4645

4746
#==== Detect ====#
@@ -259,29 +258,34 @@ if(WITH_PLUGIN_SNDIO)
259258
file(GLOB PLUGIN_SNDIO_SRC plugins/sndio/*)
260259
add_library(SndioOutput SHARED ${PLUGIN_SNDIO_SRC})
261260
target_link_libraries(SndioOutput -lsndio)
261+
install(TARGETS SndioOutput LIBRARY DESTINATION lib/mous)
262262
endif()
263263

264264
if(WITH_PLUGIN_OSS)
265265
file(GLOB PLUGIN_OSS_SRC plugins/oss/*)
266266
add_library(OssRenderer SHARED ${PLUGIN_OSS_SRC})
267+
install(TARGETS OssRenderer LIBRARY DESTINATION lib/mous)
267268
endif()
268269

269270
if(WITH_PLUGIN_ALSA)
270271
file(GLOB PLUGIN_ALSA_SRC plugins/alsa/*)
271272
add_library(AlsaRenderer SHARED ${PLUGIN_ALSA_SRC})
272273
target_link_libraries(AlsaRenderer -lasound)
274+
install(TARGETS AlsaRenderer LIBRARY DESTINATION lib/mous)
273275
endif()
274276

275277
if(WITH_PLUGIN_COREAUDIO)
276278
file(GLOB_RECURSE PLUGIN_COREAUDIO_SRC plugins/coreaudio/*)
277279
add_library(CoreAudioRenderer SHARED ${PLUGIN_COREAUDIO_SRC})
278280
target_link_libraries(CoreAudioRenderer ${LIB_AUDIO_UNIT} ${LIB_AUDIO_TOOLBOX} ${LIB_CORE_AUDIO})
281+
install(TARGETS CoreAudioRenderer LIBRARY DESTINATION lib/mous)
279282
endif()
280283

281284
if(WITH_PLUGIN_LIBAO)
282285
file(GLOB PLUGIN_LIBAO_SRC plugins/libao/*)
283286
add_library(AoRenderer SHARED ${PLUGIN_LIBAO_SRC})
284287
target_link_libraries(AoRenderer ${LIB_AO})
288+
install(TARGETS AoRenderer LIBRARY DESTINATION lib/mous)
285289
endif()
286290

287291
# TODO: merge decoder and encoder to stand-alone plugin
@@ -290,18 +294,21 @@ if(WITH_PLUGIN_WAV)
290294
add_library(WavDecoder SHARED ${WAV_DECODER_SRC})
291295
file(GLOB WAV_ENCODER_SRC plugins/wav/encoder/*)
292296
add_library(WavEncoder SHARED ${WAV_ENCODER_SRC})
297+
install(TARGETS WavDecoder WavEncoder LIBRARY DESTINATION lib/mous)
293298
endif()
294299

295300
if(WITH_PLUGIN_MPG123)
296301
file(GLOB PLUGIN_MPG123_SRC plugins/mpg123/*)
297302
add_library(Mpg123Decoder SHARED ${PLUGIN_MPG123_SRC})
298303
target_link_libraries(Mpg123Decoder ${LIB_MPG123})
304+
install(TARGETS Mpg123Decoder LIBRARY DESTINATION lib/mous)
299305
endif()
300306

301307
if(WITH_PLUGIN_LAME)
302308
file(GLOB PLUGIN_LAME_SRC plugins/lame/*)
303309
add_library(LameEncoder SHARED ${PLUGIN_LAME_SRC})
304310
target_link_libraries(LameEncoder ${LIB_LAME})
311+
install(TARGETS LameEncoder LIBRARY DESTINATION lib/mous)
305312
endif()
306313

307314
# TODO: merge decoder and encoder to stand-alone plugin
@@ -312,6 +319,7 @@ if(WITH_PLUGIN_OGG_VORBIS)
312319
file(GLOB VORBIS_ENCODER_SRC plugins/vorbis/encoder/*)
313320
add_library(VorbisEncoder SHARED ${VORBIS_ENCODER_SRC})
314321
target_link_libraries(VorbisEncoder ${LIB_OGG} ${LIB_VORBIS} ${LIB_VORBISFILE} ${LIB_VORBISENC})
322+
install(TARGETS VorbisDecoder VorbisEncoder LIBRARY DESTINATION lib/mous)
315323
endif()
316324

317325
if(WITH_PLUGIN_MAC)
@@ -328,38 +336,44 @@ if(WITH_PLUGIN_MAC)
328336
set_target_properties(MacDecoder PROPERTIES
329337
COMPILE_FLAGS "-DPLATFORM_LINUX -I${PROJECT_SOURCE_DIR}/deps/MAC_SDK/Source/Shared")
330338
target_link_libraries(MacDecoder)
339+
install(TARGETS MacDecoder LIBRARY DESTINATION lib/mous)
331340
endif()
332341

333342
if(WITH_PLUGIN_FLAC)
334343
file(GLOB PLUGIN_FLAC_SRC plugins/flac/*)
335344
add_library(FlacDecoder SHARED ${PLUGIN_FLAC_SRC})
336345
target_link_libraries(FlacDecoder ${LIB_FLAC})
346+
install(TARGETS FlacDecoder LIBRARY DESTINATION lib/mous)
337347
endif()
338348

339349
if(WITH_PLUGIN_WAVPACK)
340350
file(GLOB PLUGIN_WAVPACK_SRC plugins/wavpack/*)
341351
add_library(WvDecoder SHARED ${PLUGIN_WAVPACK_SRC})
342352
target_link_libraries(WvDecoder ${LIB_WAVPACK})
353+
install(TARGETS WvDecoder LIBRARY DESTINATION lib/mous)
343354
endif()
344355

345356
if(WITH_PLUGIN_FDK_AAC)
346357
file(GLOB PLUGIN_FDK_AAC_SRC plugins/fdk-aac/decoder/*)
347358
add_library(FdkDecoder SHARED ${PLUGIN_FDK_AAC_SRC})
348359
target_link_libraries(FdkDecoder ${LIB_FDK_AAC} ${LIB_MP4V2})
360+
install(TARGETS FdkDecoder LIBRARY DESTINATION lib/mous)
349361
endif()
350362

351363
# FIXME: broken
352364
if(WITH_PLUGIN_FAAD AND FALSE)
353365
file(GLOB PLUGIN_FAAD_SRC plugins/faad/*)
354366
add_library(FaadDecoder SHARED ${PLUGIN_FAAD_SRC})
355367
target_link_libraries(FaadDecoder ${LIB_FAAD} ${LIB_MP4FF})
368+
install(TARGETS FaadDecoder LIBRARY DESTINATION lib/mous)
356369
endif()
357370

358371
# FIXME: broken
359372
if(WITH_PLUGIN_FAAC AND FALSE)
360373
file(GLOB PLUGIN_FAAC_SRC plugins/faac/*)
361374
add_library(FaacEncoder SHARED ${PLUGIN_FAAC_SRC})
362375
target_link_libraries(FaacEncoder ${LIB_FAAC} ${LIB_MP4V2})
376+
install(TARGETS FaacEncoder LIBRARY DESTINATION lib/mous)
363377
endif()
364378

365379
# FIXME: broken
@@ -370,30 +384,34 @@ if(WITH_PLUGIN_WMA AND FALSE)
370384
set_target_properties(WmaDecoder PROPERTIES
371385
COMPILE_FLAGS "-fno-strict-aliasing -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE")
372386
target_link_libraries(WmaDecoder)
387+
install(TARGETS WmaDecoder LIBRARY DESTINATION lib/mous)
373388
endif()
374389

375390
if(WITH_PLUGIN_TAGLIB)
376391
file(GLOB PLUGIN_TAGLIB_SRC plugins/taglib/*)
377392
add_library(TagLibParser SHARED ${PLUGIN_TAGLIB_SRC})
378393
target_link_libraries(TagLibParser ${LIB_TAGLIB} ${LIB_ICONV})
394+
install(TARGETS TagLibParser LIBRARY DESTINATION lib/mous)
379395
endif()
380396

381397
if(WITH_PLUGIN_LIBCUE)
382398
file(GLOB PLUGIN_LIBCUE_SRC plugins/libcue/*)
383399
add_library(CueParser SHARED ${PLUGIN_LIBCUE_SRC})
384400
target_link_libraries(CueParser ${LIB_CUE})
401+
install(TARGETS CueParser LIBRARY DESTINATION lib/mous)
385402
endif()
386403

387404
# FIXME: broken
388405
if(WITH_PLUGIN_STATS AND FALSE)
389406
file(GLOB PLUGIN_STATS_SRC plugins/stats/*)
390407
add_library(Stats SHARED ${PLUGIN_STATS_SRC})
408+
install(TARGETS Stats LIBRARY DESTINATION lib/mous)
391409
endif()
392410

393-
install(
394-
CODE "file(GLOB PLUGIN_FILES \"${PROJECT_BINARY_DIR}/plugins/*\")"
395-
CODE "file(INSTALL \${PLUGIN_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/mous)"
396-
)
411+
#install(
412+
# CODE "file(GLOB PLUGIN_FILES \"${PROJECT_BINARY_DIR}/plugins/*\")"
413+
# CODE "file(INSTALL \${PLUGIN_FILES} TYPE SHARED_LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/mous)"
414+
#)
397415

398416
if(WITH_SDK)
399417
file(GLOB HEAD_FILES "${PROJECT_SOURCE_DIR}/sdk/*")

‎port/freebsd/Makefile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# $FreeBSD: head/audio/mous/Makefile $
22

33
PORTNAME= mous
4-
PORTVERSION= 2.0.0
4+
PORTVERSION= 2.0.1
55
DISTVERSIONPREFIX= v
66
CATEGORIES= audio
77
MASTER_SITES= GH
@@ -12,7 +12,7 @@ COMMENT= Simple yet powerful audio player
1212
LICENSE= BSD2CLAUSE
1313
LICENSE_FILE= ${WRKSRC}/LICENSE
1414

15-
USES= cmake:outsource compiler:c++14-lang
15+
USES= cmake:outsource,noninja compiler:c++14-lang
1616

1717
USE_LDCONFIG= yes
1818
USE_GITHUB= yes
@@ -108,9 +108,6 @@ WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
108108
WAVPACK_CMAKE_ON= -DWITH_PLUGIN_WAVPACK=1
109109
WAVPACK_CMAKE_OFF= -DWITH_PLUGIN_WAVPACK=0
110110

111-
#post-patch:
112-
# @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
113-
# -e 's|/usr/local|${LOCALBASE}|g' \
114-
# ${WRKSRC}/CMakeLists.txt
111+
INSTALL_TARGET= install/strip
115112

116113
.include <bsd.port.mk>

‎port/freebsd/pkg-plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ lib/libMousCore.so
88
%%LAME%%lib/mous/libLameEncoder.so
99
%%MAC%%lib/mous/libMacDecoder.so
1010
%%VORBIS%%lib/mous/libVorbisDecoder.so
11+
%%VORBIS%%lib/mous/libVorbisEncoder.so
1112
%%MPG123%%lib/mous/libMpg123Decoder.so
1213
%%OSS%%lib/mous/libOssRenderer.so
1314
%%SNDIO%%lib/mous/libSndioOutput.so
1415
%%TAGLIB%%lib/mous/libTagLibParser.so
1516
%%WAV%%lib/mous/libWavDecoder.so
1617
%%WAV%%lib/mous/libWavEncoder.so
18+
%%WAVPACK%%lib/mous/libWvDecoder.so

0 commit comments

Comments
 (0)