CVS commit: pkgsrc/audio/libgroove

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Tue Feb 20 05:17:31 UTC 2018

Modified Files:
        pkgsrc/audio/libgroove: Makefile PLIST distinfo

Log Message:
libgroove: Upgrade to 4.3.0

pkgsrc changes:
 - reuse the github framework
 - disable -Werror
 - set -D_NETBSD_SOURCE for NetBSD, this is required for obtaining
   pthread_condattr_setclock(3) and pthread_condattr_getclock(3) on NetBSD
   compiled on version <8.0 (bug in a header)
 - switch from ffmpeg2 to ffmpeg3
 - add a workaround for a detector of ffmpeg in a homegrown dependency
   detector, this hardcodes paths to headers and libraries of ffmpeg3

upstream changelog
==================

Version 4.3.0 (2015-05-25)

    player: Add support for "exact mode" - re-opens the audio device when a buffer is encountered that does not match the open audio device's sound parameters.
    build: Simplify cmake find modules.
    Add const qualifier to some fields and functions.
    metadata example: print the number of channels.
    Add documentation.
    Add more channel layouts.
    build: Compile in Debug mode by default.

Version 4.2.1 (2014-10-07)

    updating metadata: set time_base on stream not the codec
    libav lockmgr: set mutex pointer to NULL on destroy
    fix build on GNU/hurd

Version 4.2.0 (2014-09-25)

    build: remove bundled dependencies
    build: simpler cmake find modules, both code and license
    player: add shim to fix build failure on OSX

Version 4.1.1 (2014-06-20)

    playlist: fix race condition which can cause decoder to hang
    dummy player: fix timing issues

Version 4.1.0 (2014-06-13)

    playlist: added groove_playlist_set_fill_mode. Allows you to choose between buffering until all sinks are full and buffering until any sinks are full.

Version 4.0.4 (2014-06-03)

    Fixed a race condition where seeking to a different playlist item and then back would have a window of time where it could report the wrong position.
    Properly play and pause network streams.

Version 4.0.3 (2014-05-31)

    build: update bundled libav to latest stable 10 release
    build: link player with -lrt for clock_gettime. closes #67
    playlist: fix case where filter graph was not being rebuilt. closes #65
    playlist: fix race condition segfault when attaching a sink
    encoder: properly reset encoding when flush or playlist end is encountered. closes #66

Version 4.0.2 (2014-05-20)

    player: thread cleanup only if thread was initialized - fixes potential crash on player detach
    build: look for includes in the current source tree. Fixes an issue when a previous version of the library is installed.
    build: on unix link with -lm

Version 4.0.1 (2014-05-13)

    groove_playlist_get_position: always set seconds even when item is NULL
    playlist: correct generation of the sink map
        fixes potential error when adding multiple sinks
        optimizes some cases where sinks can share filter graph chain
        dummy player now uses disable_resample optimization
    dummy player: avoid floating point error accumulation

Version 4.0.0 (2014-05-12)

    GrooveBuffer struct contains the presentation time stamp
    move include statements to outside of extern C
    ability to set true peak on playlist items. closes #50
    support per-sink gain adjustment. closes #41
    GroovePlaylist: volume renamed to gain
        groove_playlist_set_gain renamed to groove_playlist_set_item_gain
        groove_playlist_set_volume renamed to groove_playlist_set_gain
    player: specify device by index rather than name. closes #44
    player: ability to attach a dummy player device. closes #60
    fingerprinter: encode/decode return 0 on success, < 0 on error
    fingerprinter: info struct contains raw fingerprint instead of compressed string. closes #61


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/libgroove/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/libgroove/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libgroove/distinfo

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

Modified files:

Index: pkgsrc/audio/libgroove/Makefile
diff -u pkgsrc/audio/libgroove/Makefile:1.17 pkgsrc/audio/libgroove/Makefile:1.18
--- pkgsrc/audio/libgroove/Makefile:1.17        Fri Feb 24 21:54:51 2017
+++ pkgsrc/audio/libgroove/Makefile     Tue Feb 20 05:17:31 2018
@@ -1,32 +1,50 @@
-# $NetBSD: Makefile,v 1.17 2017/02/24 21:54:51 maya Exp $
+# $NetBSD: Makefile,v 1.18 2018/02/20 05:17:31 kamil Exp $
 
-DISTNAME=      3.1.1
-PKGNAME=       libgroove-${DISTNAME}
-PKGREVISION=   14
+DISTNAME=      libgroove-4.3.0
 CATEGORIES=    audio
-MASTER_SITES=  https://github.com/andrewrk/libgroove/archive/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=andrewrk/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/andrewrk/libgroove/
 COMMENT=       Audio dispatching library
 LICENSE=       mit
 
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-
 USE_CMAKE=     yes
 USE_TOOLS+=    gmake pkg-config perl:build
 USE_LANGUAGES= c c++
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+SOEXT= dylib
+.else
+SOEXT= so
+.endif
+
+CMAKE_ARGS+=   -DAVFILTER_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.ffmpeg3}/include/ffmpeg3
+CMAKE_ARGS+=   -DAVFILTER_LIBRARIES:PATH=${BUILDLINK_PREFIX.ffmpeg3}/lib/ffmpeg3/libavfilter.${SOEXT}
+
+CMAKE_ARGS+=   -DAVFORMAT_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.ffmpeg3}/include/ffmpeg3
+CMAKE_ARGS+=   -DAVFORMAT_LIBRARIES:PATH=${BUILDLINK_PREFIX.ffmpeg3}/lib/ffmpeg3/libavformat.${SOEXT}
+
+CMAKE_ARGS+=   -DAVCODEC_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.ffmpeg3}/include/ffmpeg3
+CMAKE_ARGS+=   -DAVCODEC_LIBRARIES:PATH=${BUILDLINK_PREFIX.ffmpeg3}/lib/ffmpeg3/libavcodec.${SOEXT}
+
+CMAKE_ARGS+=   -DAVUTIL_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.ffmpeg3}/include/ffmpeg3
+CMAKE_ARGS+=   -DAVUTIL_LIBRARIES:PATH=${BUILDLINK_PREFIX.ffmpeg3}/lib/ffmpeg3/libavutil.${SOEXT}
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=        yasm-[0-9]*:../../devel/yasm
 .endif
 
-DIST_SUBDIR=   libgroove
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
+CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 
 .include "../../audio/chromaprint/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libebur128/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/libgroove/PLIST
diff -u pkgsrc/audio/libgroove/PLIST:1.1 pkgsrc/audio/libgroove/PLIST:1.2
--- pkgsrc/audio/libgroove/PLIST:1.1    Wed Apr 30 23:42:52 2014
+++ pkgsrc/audio/libgroove/PLIST        Tue Feb 20 05:17:31 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/30 23:42:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/02/20 05:17:31 kamil Exp $
 include/groove/encoder.h
 include/groove/groove.h
 include/groove/queue.h
@@ -7,17 +7,17 @@ include/grooveloudness/loudness.h
 include/grooveplayer/player.h
 lib/libgroove.a
 lib/libgroove.so
-lib/libgroove.so.3
+lib/libgroove.so.4
 lib/libgroove.so.${PKGVERSION}
 lib/libgroovefingerprinter.a
 lib/libgroovefingerprinter.so
-lib/libgroovefingerprinter.so.3
+lib/libgroovefingerprinter.so.4
 lib/libgroovefingerprinter.so.${PKGVERSION}
 lib/libgrooveloudness.a
 lib/libgrooveloudness.so
-lib/libgrooveloudness.so.3
+lib/libgrooveloudness.so.4
 lib/libgrooveloudness.so.${PKGVERSION}
 lib/libgrooveplayer.a
 lib/libgrooveplayer.so
-lib/libgrooveplayer.so.3
+lib/libgrooveplayer.so.4
 lib/libgrooveplayer.so.${PKGVERSION}

Index: pkgsrc/audio/libgroove/distinfo
diff -u pkgsrc/audio/libgroove/distinfo:1.3 pkgsrc/audio/libgroove/distinfo:1.4
--- pkgsrc/audio/libgroove/distinfo:1.3 Tue Nov  3 01:12:36 2015
+++ pkgsrc/audio/libgroove/distinfo     Tue Feb 20 05:17:31 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:12:36 agc Exp $
+$NetBSD: distinfo,v 1.4 2018/02/20 05:17:31 kamil Exp $
 
-SHA1 (libgroove/3.1.1.tar.gz) = e73b091eb9e6d81c5a223c216967f2344606a25c
-RMD160 (libgroove/3.1.1.tar.gz) = d494f8010188472dd0716920de760dae2b1fe7e5
-SHA512 (libgroove/3.1.1.tar.gz) = f4bcc53b0a6ce7c9a90bb0ac7bab8fadade9d510c2d49f94f4082c96c2c32cecd0be3c3944578fce659e7794a3d15b20d09263a2e419d5d0472a82d96533dda2
-Size (libgroove/3.1.1.tar.gz) = 8584469 bytes
+SHA1 (libgroove-4.3.0.tar.gz) = 3d64b6bb5ba14043ae1924b8e8f96bb0716f469d
+RMD160 (libgroove-4.3.0.tar.gz) = af4b30b7fbc887bc030d3bb18f34576ce7a0a16f
+SHA512 (libgroove-4.3.0.tar.gz) = 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
+Size (libgroove-4.3.0.tar.gz) = 48857 bytes