From owner-svn-ports-head@freebsd.org Sun Oct 23 10:51:32 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F6EBC1B82D; Sun, 23 Oct 2016 10:51:32 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C0C71DD; Sun, 23 Oct 2016 10:51:32 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9NApV9i031950; Sun, 23 Oct 2016 10:51:31 GMT (envelope-from mva@FreeBSD.org) Received: (from mva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9NApUrE031945; Sun, 23 Oct 2016 10:51:30 GMT (envelope-from mva@FreeBSD.org) Message-Id: <201610231051.u9NApUrE031945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mva set sender to mva@FreeBSD.org using -f From: Marcus von Appen Date: Sun, 23 Oct 2016 10:51:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424510 - in head/audio/openal-soft: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2016 10:51:32 -0000 Author: mva Date: Sun Oct 23 10:51:30 2016 New Revision: 424510 URL: https://svnweb.freebsd.org/changeset/ports/424510 Log: - Update to version 1.17.2 - New option JACK for Jack audio server support PR: 213392 Submitted by: kdrakehp@zoho.com Modified: head/audio/openal-soft/Makefile head/audio/openal-soft/distinfo head/audio/openal-soft/files/patch-CMakeLists.txt head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c head/audio/openal-soft/pkg-plist Modified: head/audio/openal-soft/Makefile ============================================================================== --- head/audio/openal-soft/Makefile Sun Oct 23 10:12:39 2016 (r424509) +++ head/audio/openal-soft/Makefile Sun Oct 23 10:51:30 2016 (r424510) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.16.0 -PORTREVISION= 4 +PORTVERSION= 1.17.2 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/openal-releases/ @@ -15,16 +14,18 @@ CONFLICTS= openal-200[0-9]* USES= tar:bzip2 cmake compiler:c11 USE_LDCONFIG= yes -CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS:BOOL=ON \ +CMAKE_ARGS+= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \ + -DALSOFT_REQUIRE_OSS:BOOL=ON \ -DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \ -DALSOFT_REQUIRE_SNDIO:BOOL=OFF \ -DALSOFT_REQUIRE_QSA:BOOL=OFF \ -DALSOFT_BACKEND_ALSA:BOOL=OFF \ + -DALSOFT_BACKEND_JACK:BOOL=OFF \ -DALSOFT_BACKEND_WAVE:BOOL=ON \ -DALSOFT_UTILS:BOOL=ON \ -DALSOFT_EXAMPLES:BOOL=OFF -OPTIONS_DEFINE= FLUIDSYNTH CONFIG PORTAUDIO PULSEAUDIO SNDIO +OPTIONS_DEFINE= FLUIDSYNTH CONFIG JACK PORTAUDIO PULSEAUDIO SNDIO OPTIONS_SUB= yes CONFIG_DESC= Install configuration utility (needs Qt 4.x) @@ -37,6 +38,9 @@ CONFIG_USE= QT4=corelib,gui,qmake_build FLUIDSYNTH_CMAKE_ON= -DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON FLUIDSYNTH_CMAKE_OFF= -DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +JACK_CMAKE_ON= -DALSOFT_REQUIRE_JACK:BOOL=ON +JACK_CMAKE_OFF= -DALSOFT_REQUIRE_JACK:BOOL=OFF +JACK_LIB_DEPENDS= libjack.so:audio/jack PORTAUDIO_CMAKE_ON= -DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio @@ -49,9 +53,8 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/snd post-patch: @${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \ - ${WRKSRC}/Alc/alcConfig.c \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} 's|share/openal|${ETCDIR}|' \ + ${WRKSRC}/Alc/alcConfig.c + @${REINPLACE_CMD} 's|$${SHARE_INSTALL_DIR}/openal|${ETCDIR}|' \ ${WRKSRC}/CMakeLists.txt .include Modified: head/audio/openal-soft/distinfo ============================================================================== --- head/audio/openal-soft/distinfo Sun Oct 23 10:12:39 2016 (r424509) +++ head/audio/openal-soft/distinfo Sun Oct 23 10:51:30 2016 (r424510) @@ -1,2 +1,3 @@ -SHA256 (openal-soft-1.16.0.tar.bz2) = 2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 +TIMESTAMP = 1474007361 +SHA256 (openal-soft-1.17.2.tar.bz2) = a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 Modified: head/audio/openal-soft/files/patch-CMakeLists.txt ============================================================================== --- head/audio/openal-soft/files/patch-CMakeLists.txt Sun Oct 23 10:12:39 2016 (r424509) +++ head/audio/openal-soft/files/patch-CMakeLists.txt Sun Oct 23 10:51:30 2016 (r424510) @@ -1,26 +1,6 @@ ---- CMakeLists.txt.orig 2014-08-15 07:06:59 UTC +--- CMakeLists.txt.orig 2016-01-25 03:12:39 UTC +++ CMakeLists.txt -@@ -62,8 +62,8 @@ ELSE() - SET(LIBNAME openal) - - # These are needed on non-Windows systems for extra features -- ADD_DEFINITIONS(-D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700) -- SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700") -+ ADD_DEFINITIONS(-D_GNU_SOURCE=1) -+ SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1") - ENDIF() - - # Set defines for large file support -@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) - # Check if we have C11 _Atomic - CHECK_C_SOURCE_COMPILES( - "#include -- int _Atomic foo; -+ const int _Atomic foo = ATOMIC_VAR_INIT(~0); - int main() - { - return atomic_load(&foo); -@@ -523,10 +523,6 @@ IF(NOT HAVE_WINDOWS_H) +@@ -582,10 +582,6 @@ int main() CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK) @@ -31,12 +11,12 @@ ENDIF() # Check for a 64-bit type -@@ -1108,7 +1104,7 @@ INSTALL(FILES include/AL/al.h - DESTINATION include/AL - ) - INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc" -- DESTINATION "lib${LIB_SUFFIX}/pkgconfig") -+ DESTINATION "libdata/pkgconfig") +@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL) + DESTINATION include/AL + ) + INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc" +- DESTINATION "lib${LIB_SUFFIX}/pkgconfig") ++ DESTINATION "libdata/pkgconfig") + ENDIF() - MESSAGE(STATUS "") Modified: head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c ============================================================================== --- head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Sun Oct 23 10:12:39 2016 (r424509) +++ head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Sun Oct 23 10:51:30 2016 (r424510) @@ -1,8 +1,8 @@ ---- OpenAL32/alBuffer.c.orig 2014-08-15 07:06:59 UTC +--- OpenAL32/alBuffer.c.orig 2016-01-25 03:12:39 UTC +++ OpenAL32/alBuffer.c -@@ -1179,7 +1179,7 @@ static ALboolean DecomposeFormat(ALenum - { AL_7POINT1_16_SOFT, FmtX71, FmtShort }, - { AL_7POINT1_32F_SOFT, FmtX71, FmtFloat }, +@@ -1209,7 +1209,7 @@ static ALboolean DecomposeFormat(ALenum + { AL_FORMAT_BFORMAT3D_16, FmtBFormat3D, FmtShort }, + { AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat }, }; - ALuint i; + volatile ALuint i; Modified: head/audio/openal-soft/pkg-plist ============================================================================== --- head/audio/openal-soft/pkg-plist Sun Oct 23 10:12:39 2016 (r424509) +++ head/audio/openal-soft/pkg-plist Sun Oct 23 10:51:30 2016 (r424510) @@ -1,3 +1,5 @@ +bin/altonegen +bin/bsincgen bin/makehrtf %%CONFIG%%bin/alsoft-config bin/openal-info @@ -10,7 +12,7 @@ include/AL/alext.h include/AL/efx.h include/AL/efx-creative.h include/AL/efx-presets.h -lib/libopenal.so.1.16.0 +lib/libopenal.so.1.17.2 lib/libopenal.so.1 lib/libopenal.so libdata/pkgconfig/openal.pc