From 426c5e6294a97a4cb8c25a5594d758a2b2b3f46c Mon Sep 17 00:00:00 2001 From: nros Date: Mon, 7 Mar 2016 19:36:57 +0000 Subject: Update opusfile to version 0.7. Changelog: - Add API to access and preserve binary metadata. - Add support for R128_ALBUM_GAIN metadata tag. - Better seeking with continued packets and multiplexed streams. - Portability and build fixes. --- audio/opusfile/Makefile | 7 +- audio/opusfile/PLIST | 150 +++++++++++++++++++++++++++++++- audio/opusfile/buildlink3.mk | 4 +- audio/opusfile/distinfo | 12 +-- audio/opusfile/patches/patch-src_http.c | 17 +--- 5 files changed, 163 insertions(+), 27 deletions(-) (limited to 'audio') diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile index 5a52a744ef5..737af40e9a3 100644 --- a/audio/opusfile/Makefile +++ b/audio/opusfile/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2016/03/05 11:27:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/07 19:36:57 nros Exp $ -DISTNAME= opusfile-0.6 -PKGREVISION= 2 +DISTNAME= opusfile-0.7 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ @@ -17,7 +16,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= opusfile.pc.in PKGCONFIG_OVERRIDE+= opusurl.pc.in -.include "../../security/openssl/buildlink3.mk" .include "../../audio/libopus/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/opusfile/PLIST b/audio/opusfile/PLIST index d9926e15a84..1f957a0c384 100644 --- a/audio/opusfile/PLIST +++ b/audio/opusfile/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2014/04/12 06:39:34 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/07 19:36:57 nros Exp $ include/opus/opusfile.h lib/libopusfile.la lib/libopusurl.la @@ -7,3 +7,151 @@ lib/pkgconfig/opusurl.pc share/doc/opusfile/AUTHORS share/doc/opusfile/COPYING share/doc/opusfile/README.txt +share/doc/opusfile/html/annotated.html +share/doc/opusfile/html/arrowdown.png +share/doc/opusfile/html/arrowright.png +share/doc/opusfile/html/bc_s.png +share/doc/opusfile/html/bdwn.png +share/doc/opusfile/html/classes.html +share/doc/opusfile/html/closed.png +share/doc/opusfile/html/dir_000000.html +share/doc/opusfile/html/doc.png +share/doc/opusfile/html/doxygen.css +share/doc/opusfile/html/doxygen.png +share/doc/opusfile/html/dynsections.js +share/doc/opusfile/html/files.html +share/doc/opusfile/html/folderclosed.png +share/doc/opusfile/html/folderopen.png +share/doc/opusfile/html/functions.html +share/doc/opusfile/html/functions_vars.html +share/doc/opusfile/html/group__error__codes.html +share/doc/opusfile/html/group__header__info.html +share/doc/opusfile/html/group__stream__callbacks.html +share/doc/opusfile/html/group__stream__decoding.html +share/doc/opusfile/html/group__stream__info.html +share/doc/opusfile/html/group__stream__open__close.html +share/doc/opusfile/html/group__stream__seeking.html +share/doc/opusfile/html/group__url__options.html +share/doc/opusfile/html/index.html +share/doc/opusfile/html/jquery.js +share/doc/opusfile/html/modules.html +share/doc/opusfile/html/nav_f.png +share/doc/opusfile/html/nav_g.png +share/doc/opusfile/html/nav_h.png +share/doc/opusfile/html/open.png +share/doc/opusfile/html/opus_logo.svg +share/doc/opusfile/html/opusfile_8h_source.html +share/doc/opusfile/html/search/all_0.html +share/doc/opusfile/html/search/all_0.js +share/doc/opusfile/html/search/all_1.html +share/doc/opusfile/html/search/all_1.js +share/doc/opusfile/html/search/all_10.html +share/doc/opusfile/html/search/all_10.js +share/doc/opusfile/html/search/all_11.html +share/doc/opusfile/html/search/all_11.js +share/doc/opusfile/html/search/all_12.html +share/doc/opusfile/html/search/all_12.js +share/doc/opusfile/html/search/all_2.html +share/doc/opusfile/html/search/all_2.js +share/doc/opusfile/html/search/all_3.html +share/doc/opusfile/html/search/all_3.js +share/doc/opusfile/html/search/all_4.html +share/doc/opusfile/html/search/all_4.js +share/doc/opusfile/html/search/all_5.html +share/doc/opusfile/html/search/all_5.js +share/doc/opusfile/html/search/all_6.html +share/doc/opusfile/html/search/all_6.js +share/doc/opusfile/html/search/all_7.html +share/doc/opusfile/html/search/all_7.js +share/doc/opusfile/html/search/all_8.html +share/doc/opusfile/html/search/all_8.js +share/doc/opusfile/html/search/all_9.html +share/doc/opusfile/html/search/all_9.js +share/doc/opusfile/html/search/all_a.html +share/doc/opusfile/html/search/all_a.js +share/doc/opusfile/html/search/all_b.html +share/doc/opusfile/html/search/all_b.js +share/doc/opusfile/html/search/all_c.html +share/doc/opusfile/html/search/all_c.js +share/doc/opusfile/html/search/all_d.html +share/doc/opusfile/html/search/all_d.js +share/doc/opusfile/html/search/all_e.html +share/doc/opusfile/html/search/all_e.js +share/doc/opusfile/html/search/all_f.html +share/doc/opusfile/html/search/all_f.js +share/doc/opusfile/html/search/classes_0.html +share/doc/opusfile/html/search/classes_0.js +share/doc/opusfile/html/search/close.png +share/doc/opusfile/html/search/functions_0.html +share/doc/opusfile/html/search/functions_0.js +share/doc/opusfile/html/search/groups_0.html +share/doc/opusfile/html/search/groups_0.js +share/doc/opusfile/html/search/groups_1.html +share/doc/opusfile/html/search/groups_1.js +share/doc/opusfile/html/search/groups_2.html +share/doc/opusfile/html/search/groups_2.js +share/doc/opusfile/html/search/groups_3.html +share/doc/opusfile/html/search/groups_3.js +share/doc/opusfile/html/search/groups_4.html +share/doc/opusfile/html/search/groups_4.js +share/doc/opusfile/html/search/groups_5.html +share/doc/opusfile/html/search/groups_5.js +share/doc/opusfile/html/search/groups_6.html +share/doc/opusfile/html/search/groups_6.js +share/doc/opusfile/html/search/mag_sel.png +share/doc/opusfile/html/search/nomatches.html +share/doc/opusfile/html/search/search.css +share/doc/opusfile/html/search/search.js +share/doc/opusfile/html/search/search_l.png +share/doc/opusfile/html/search/search_m.png +share/doc/opusfile/html/search/search_r.png +share/doc/opusfile/html/search/searchdata.js +share/doc/opusfile/html/search/typedefs_0.html +share/doc/opusfile/html/search/typedefs_0.js +share/doc/opusfile/html/search/variables_0.html +share/doc/opusfile/html/search/variables_0.js +share/doc/opusfile/html/search/variables_1.html +share/doc/opusfile/html/search/variables_1.js +share/doc/opusfile/html/search/variables_10.html +share/doc/opusfile/html/search/variables_10.js +share/doc/opusfile/html/search/variables_2.html +share/doc/opusfile/html/search/variables_2.js +share/doc/opusfile/html/search/variables_3.html +share/doc/opusfile/html/search/variables_3.js +share/doc/opusfile/html/search/variables_4.html +share/doc/opusfile/html/search/variables_4.js +share/doc/opusfile/html/search/variables_5.html +share/doc/opusfile/html/search/variables_5.js +share/doc/opusfile/html/search/variables_6.html +share/doc/opusfile/html/search/variables_6.js +share/doc/opusfile/html/search/variables_7.html +share/doc/opusfile/html/search/variables_7.js +share/doc/opusfile/html/search/variables_8.html +share/doc/opusfile/html/search/variables_8.js +share/doc/opusfile/html/search/variables_9.html +share/doc/opusfile/html/search/variables_9.js +share/doc/opusfile/html/search/variables_a.html +share/doc/opusfile/html/search/variables_a.js +share/doc/opusfile/html/search/variables_b.html +share/doc/opusfile/html/search/variables_b.js +share/doc/opusfile/html/search/variables_c.html +share/doc/opusfile/html/search/variables_c.js +share/doc/opusfile/html/search/variables_d.html +share/doc/opusfile/html/search/variables_d.js +share/doc/opusfile/html/search/variables_e.html +share/doc/opusfile/html/search/variables_e.js +share/doc/opusfile/html/search/variables_f.html +share/doc/opusfile/html/search/variables_f.js +share/doc/opusfile/html/splitbar.png +share/doc/opusfile/html/structOpusFileCallbacks.html +share/doc/opusfile/html/structOpusHead.html +share/doc/opusfile/html/structOpusPictureTag.html +share/doc/opusfile/html/structOpusServerInfo.html +share/doc/opusfile/html/structOpusTags.html +share/doc/opusfile/html/sync_off.png +share/doc/opusfile/html/sync_on.png +share/doc/opusfile/html/tab_a.png +share/doc/opusfile/html/tab_b.png +share/doc/opusfile/html/tab_h.png +share/doc/opusfile/html/tab_s.png +share/doc/opusfile/html/tabs.css diff --git a/audio/opusfile/buildlink3.mk b/audio/opusfile/buildlink3.mk index 6c976353e1e..97484c0423f 100644 --- a/audio/opusfile/buildlink3.mk +++ b/audio/opusfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/03/05 11:27:40 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2016/03/07 19:36:57 nros Exp $ BUILDLINK_TREE+= opusfile @@ -6,7 +6,7 @@ BUILDLINK_TREE+= opusfile OPUSFILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.opusfile+= opusfile>=0.5 -BUILDLINK_ABI_DEPENDS.opusfile?= opusfile>=0.6nb2 +BUILDLINK_ABI_DEPENDS.opusfile?= opusfile>=0.7 BUILDLINK_PKGSRCDIR.opusfile?= ../../audio/opusfile .include "../../security/openssl/buildlink3.mk" diff --git a/audio/opusfile/distinfo b/audio/opusfile/distinfo index 3374ef26276..729b513429c 100644 --- a/audio/opusfile/distinfo +++ b/audio/opusfile/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2015/11/20 14:28:02 joerg Exp $ +$NetBSD: distinfo,v 1.8 2016/03/07 19:36:57 nros Exp $ -SHA1 (opusfile-0.6.tar.gz) = 2422e3c7bf6105a832226850b19053ec5ac41293 -RMD160 (opusfile-0.6.tar.gz) = a5d036100ecb561ad00b43f276585f3b6440f950 -SHA512 (opusfile-0.6.tar.gz) = 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02 -Size (opusfile-0.6.tar.gz) = 437980 bytes +SHA1 (opusfile-0.7.tar.gz) = 69dfca2092172f0837bb8b54dacfcb44fec6bd6f +RMD160 (opusfile-0.7.tar.gz) = 4acf7a9bf07e72c8e85e332724c410d767c00fa6 +SHA512 (opusfile-0.7.tar.gz) = 13ad627e314c0f35f987d8170e090e0683d898f8c553f53a37b66a4401ff1843069e0adc35b32ef6f838d86a2a333bf11a37b4cf99161d34d5a7530619a3ade6 +Size (opusfile-0.7.tar.gz) = 463581 bytes SHA1 (patch-configure) = e66accedd8adbc6177b0abbec43b2d48b4a154c5 SHA1 (patch-configure.ac) = d8384babab6d2e3e1fcf61380a8c3db70accf59d -SHA1 (patch-src_http.c) = 631e7304c825baf5537c871b39e75bfb1f04da8a +SHA1 (patch-src_http.c) = 87aaa20b5fc6e7c07f40da47e47baee2833674f3 diff --git a/audio/opusfile/patches/patch-src_http.c b/audio/opusfile/patches/patch-src_http.c index a509323fad3..28400bb1320 100644 --- a/audio/opusfile/patches/patch-src_http.c +++ b/audio/opusfile/patches/patch-src_http.c @@ -1,13 +1,11 @@ -$NetBSD: patch-src_http.c,v 1.4 2014/07/16 21:50:24 jperkin Exp $ +$NetBSD: patch-src_http.c,v 1.5 2016/03/07 19:36:57 nros Exp $ * Avoid using the obsolete ftime() function. https://trac.xiph.org/ticket/2014 -* Not only Win32 lacks AI_NUMERICSERV. Some version of Darwin (at least Darwin 9) lacks it too. - * Need sys/filio.h on SunOS for FIONREAD. ---- src/http.c.orig 2013-12-05 16:49:13.000000000 +0000 +--- src/http.c.orig 2015-12-31 18:29:53.000000000 +0000 +++ src/http.c @@ -14,6 +14,9 @@ #endif @@ -28,15 +26,6 @@ https://trac.xiph.org/ticket/2014 # include /*The maximum number of simultaneous connections. -@@ -721,7 +724,7 @@ static struct addrinfo *op_resolve(const - char service[6]; - memset(&hints,0,sizeof(hints)); - hints.ai_socktype=SOCK_STREAM; --#if !defined(_WIN32) -+#if defined(AI_NUMERICSERV) - hints.ai_flags=AI_NUMERICSERV; - #endif - OP_ASSERT(_port<=65535U); @@ -788,7 +791,7 @@ struct OpusHTTPConn{ /*The next connection in either the LRU or free list.*/ OpusHTTPConn *next; @@ -90,7 +79,7 @@ https://trac.xiph.org/ticket/2014 read_delta_ms=op_time_diff_ms(&read_time,&_conn->read_time); read_rate=_conn->read_rate; read_delta_ms=OP_MAX(read_delta_ms,1); -@@ -1902,7 +1905,7 @@ static int op_sock_connect_next(op_sock +@@ -1902,7 +1905,7 @@ static int op_sock_connect_next(op_sock # define OP_NPROTOS (2) static int op_http_connect_impl(OpusHTTPStream *_stream,OpusHTTPConn *_conn, -- cgit v1.2.3