diff options
| author | maya <maya@pkgsrc.org> | 2018-09-29 18:23:06 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-09-29 18:23:06 +0000 |
| commit | de41b6fb3726701658b326bbbb1de1d320f47f59 (patch) | |
| tree | cfa30057bde6fcbc4204aa87c2b5328c1d2ad1b3 /audio/alure | |
| parent | 64e4d8460ff02bda7b62013ed0a25a189ea2aad1 (diff) | |
| download | pkgsrc-de41b6fb3726701658b326bbbb1de1d320f47f59.tar.gz | |
alure: backport upstream commit reported to help Solaris
Do not use --version-script for Solaris
From Bastian Germann in PR pkg/53641
Diffstat (limited to 'audio/alure')
| -rw-r--r-- | audio/alure/distinfo | 4 | ||||
| -rw-r--r-- | audio/alure/patches/patch-CMakeLists.txt | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/audio/alure/distinfo b/audio/alure/distinfo index d20b303ad2b..f8a42d1a81f 100644 --- a/audio/alure/distinfo +++ b/audio/alure/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1 2018/09/21 13:24:34 maya Exp $ +$NetBSD: distinfo,v 1.2 2018/09/29 18:23:06 maya Exp $ SHA1 (alure-1.2.tar.gz) = 82c40fe01c22c4869130b29d26139720401a5313 RMD160 (alure-1.2.tar.gz) = 900120da54efa87aca9bae460f9f4d7d7b23aa3f SHA512 (alure-1.2.tar.gz) = 77c3064deeb0ae9a04c13895648d4c57dd6af803868c4db7489366dd698dbca2d162be84ec581df76417e99eb4b96c38032d690eb33f9fe1b7b352b4aa1c84c1 Size (alure-1.2.tar.gz) = 85331 bytes -SHA1 (patch-CMakeLists.txt) = 06f86259498a723ce8c159774aa2afbb7418a2ae +SHA1 (patch-CMakeLists.txt) = 766ae666155c1ac5c9fe3e3aa9e0a4dc912bb0f3 SHA1 (patch-src_codec__fluidsynth.cpp) = 7042da99b93d722c3241094d7bb941250cb135f6 diff --git a/audio/alure/patches/patch-CMakeLists.txt b/audio/alure/patches/patch-CMakeLists.txt index 14e4027e648..5bc75816d9a 100644 --- a/audio/alure/patches/patch-CMakeLists.txt +++ b/audio/alure/patches/patch-CMakeLists.txt @@ -1,7 +1,9 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2018/09/21 13:24:34 maya Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2018/09/29 18:23:06 maya Exp $ Link FLAC correctly (from http://repo.or.cz/alure.git/commit/6934c17f9ace7fc19ea94623dab0a4b37d11a879) +Do not use --version-script for Solaris + --- CMakeLists.txt.orig 2011-07-29 08:37:48.000000000 +0000 +++ CMakeLists.txt @@ -286,7 +286,7 @@ IF(FLAC) @@ -11,14 +13,23 @@ Link FLAC correctly (from http://repo.or.cz/alure.git/commit/6934c17f9ace7fc19ea - SET(LIBFLAC_LIBRARIES "") + SET(FLAC_LIBRARIES "") ENDIF(FLAC) - + # MPG123 support @@ -387,7 +387,7 @@ ENDIF(FLUIDSYNTH) - - + + IF(NOT DYNLOAD) - SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${LIBFLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS}) + SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${FLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS}) ELSE(NOT DYNLOAD) ADD_DEFINITIONS(-DDYNLOAD=1) ENDIF(NOT DYNLOAD) +@@ -429,7 +429,7 @@ IF(BUILD_SHARED) + SOVERSION ${LIB_MAJOR_VERSION}) + IF(WIN32) + SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES PREFIX "") +- ELSEIF(NOT APPLE) ++ ELSEIF(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") + SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES LINK_FLAGS "-Wl,--version-script=${ALURE_SOURCE_DIR}/libalure.map") + ENDIF(WIN32) + TARGET_LINK_LIBRARIES(${LIBNAME} ${OPENAL_LIBRARIES} ${EXTRA_LIBS}) |