CVS commit: pkgsrc/audio/alure

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Sep 29 18:23:06 UTC 2018

Modified Files:
        pkgsrc/audio/alure: distinfo
        pkgsrc/audio/alure/patches: patch-CMakeLists.txt

Log Message:
alure: backport upstream commit reported to help Solaris

Do not use --version-script for Solaris

>From Bastian Germann in PR pkg/53641


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/alure/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/alure/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/alure/distinfo
diff -u pkgsrc/audio/alure/distinfo:1.1 pkgsrc/audio/alure/distinfo:1.2
--- pkgsrc/audio/alure/distinfo:1.1     Fri Sep 21 13:24:34 2018
+++ pkgsrc/audio/alure/distinfo Sat Sep 29 18:23:06 2018
@@ -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

Index: pkgsrc/audio/alure/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/alure/patches/patch-CMakeLists.txt:1.1 pkgsrc/audio/alure/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/audio/alure/patches/patch-CMakeLists.txt:1.1 Fri Sep 21 13:24:34 2018
+++ pkgsrc/audio/alure/patches/patch-CMakeLists.txt     Sat Sep 29 18:23:06 2018
@@ -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
 -    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})