Sat Sep 29 18:23:06 2018 UTC ()
alure: backport upstream commit reported to help Solaris

Do not use --version-script for Solaris

From Bastian Germann in PR pkg/53641


(maya)
diff -r1.1 -r1.2 pkgsrc/audio/alure/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/alure/patches/patch-CMakeLists.txt
cvs diff -r1.1 -r1.2 pkgsrc/audio/alure/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/alure/distinfo 2018/09/21 13:24:34 1.1
+++ pkgsrc/audio/alure/distinfo 2018/09/29 18:23:06 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1 2018/09/21 13:24:34 maya Exp $ 1$NetBSD: distinfo,v 1.2 2018/09/29 18:23:06 maya Exp $
2 2
3SHA1 (alure-1.2.tar.gz) = 82c40fe01c22c4869130b29d26139720401a5313 3SHA1 (alure-1.2.tar.gz) = 82c40fe01c22c4869130b29d26139720401a5313
4RMD160 (alure-1.2.tar.gz) = 900120da54efa87aca9bae460f9f4d7d7b23aa3f 4RMD160 (alure-1.2.tar.gz) = 900120da54efa87aca9bae460f9f4d7d7b23aa3f
5SHA512 (alure-1.2.tar.gz) = 77c3064deeb0ae9a04c13895648d4c57dd6af803868c4db7489366dd698dbca2d162be84ec581df76417e99eb4b96c38032d690eb33f9fe1b7b352b4aa1c84c1 5SHA512 (alure-1.2.tar.gz) = 77c3064deeb0ae9a04c13895648d4c57dd6af803868c4db7489366dd698dbca2d162be84ec581df76417e99eb4b96c38032d690eb33f9fe1b7b352b4aa1c84c1
6Size (alure-1.2.tar.gz) = 85331 bytes 6Size (alure-1.2.tar.gz) = 85331 bytes
7SHA1 (patch-CMakeLists.txt) = 06f86259498a723ce8c159774aa2afbb7418a2ae 7SHA1 (patch-CMakeLists.txt) = 766ae666155c1ac5c9fe3e3aa9e0a4dc912bb0f3
8SHA1 (patch-src_codec__fluidsynth.cpp) = 7042da99b93d722c3241094d7bb941250cb135f6 8SHA1 (patch-src_codec__fluidsynth.cpp) = 7042da99b93d722c3241094d7bb941250cb135f6
cvs diff -r1.1 -r1.2 pkgsrc/audio/alure/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/audio/alure/patches/patch-CMakeLists.txt 2018/09/21 13:24:34 1.1
+++ pkgsrc/audio/alure/patches/patch-CMakeLists.txt 2018/09/29 18:23:06 1.2
@@ -1,24 +1,35 @@ @@ -1,24 +1,35 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2018/09/21 13:24:34 maya Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2018/09/29 18:23:06 maya Exp $
2 2
3Link FLAC correctly (from http://repo.or.cz/alure.git/commit/6934c17f9ace7fc19ea94623dab0a4b37d11a879) 3Link FLAC correctly (from http://repo.or.cz/alure.git/commit/6934c17f9ace7fc19ea94623dab0a4b37d11a879)
4 4
 5Do not use --version-script for Solaris
 6
5--- CMakeLists.txt.orig 2011-07-29 08:37:48.000000000 +0000 7--- CMakeLists.txt.orig 2011-07-29 08:37:48.000000000 +0000
6+++ CMakeLists.txt 8+++ CMakeLists.txt
7@@ -286,7 +286,7 @@ IF(FLAC) 9@@ -286,7 +286,7 @@ IF(FLAC)
8 SET(ALURE_OBJS ${ALURE_OBJS} src/codec_flac.cpp) 10 SET(ALURE_OBJS ${ALURE_OBJS} src/codec_flac.cpp)
9 ENDIF(HAS_FLAC) 11 ENDIF(HAS_FLAC)
10 ELSE(FLAC) 12 ELSE(FLAC)
11- SET(LIBFLAC_LIBRARIES "") 13- SET(LIBFLAC_LIBRARIES "")
12+ SET(FLAC_LIBRARIES "") 14+ SET(FLAC_LIBRARIES "")
13 ENDIF(FLAC) 15 ENDIF(FLAC)
14  16
15 # MPG123 support 17 # MPG123 support
16@@ -387,7 +387,7 @@ ENDIF(FLUIDSYNTH) 18@@ -387,7 +387,7 @@ ENDIF(FLUIDSYNTH)
17  19
18  20
19 IF(NOT DYNLOAD) 21 IF(NOT DYNLOAD)
20- SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${LIBFLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS}) 22- SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${LIBFLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS})
21+ SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${FLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS}) 23+ SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${FLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS})
22 ELSE(NOT DYNLOAD) 24 ELSE(NOT DYNLOAD)
23 ADD_DEFINITIONS(-DDYNLOAD=1) 25 ADD_DEFINITIONS(-DDYNLOAD=1)
24 ENDIF(NOT DYNLOAD) 26 ENDIF(NOT DYNLOAD)
 27@@ -429,7 +429,7 @@ IF(BUILD_SHARED)
 28 SOVERSION ${LIB_MAJOR_VERSION})
 29 IF(WIN32)
 30 SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES PREFIX "")
 31- ELSEIF(NOT APPLE)
 32+ ELSEIF(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
 33 SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES LINK_FLAGS "-Wl,--version-script=${ALURE_SOURCE_DIR}/libalure.map")
 34 ENDIF(WIN32)
 35 TARGET_LINK_LIBRARIES(${LIBNAME} ${OPENAL_LIBRARIES} ${EXTRA_LIBS})