Skip to content

Commit

Permalink
Merge remote-tracking branch 'netbsd/trunk' into joyent/release/trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Perkin committed May 4, 2022
2 parents 0b053db + 0303fea commit 56ee70e
Show file tree
Hide file tree
Showing 496 changed files with 7,159 additions and 2,285 deletions.
14 changes: 8 additions & 6 deletions archivers/ocaml-bz2/Makefile
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
# $NetBSD: Makefile,v 1.20 2021/03/08 08:12:45 jaapb Exp $
# $NetBSD: Makefile,v 1.21 2022/05/03 18:29:18 jaapb Exp $

PKGNAME= ocaml-bz2-${VERSION}
DISTNAME= camlbz2-${VERSION}
VERSION= 0.6.0
PKGREVISION= 16
VERSION= 0.7.0
CATEGORIES= archivers
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/72/
MASTER_SITES= http://gitlab.com/irill/camlbz2/-/archive/${VERSION}/

MAINTAINER= [email protected]
COMMENT= OCaml library to manipulate bz2 archives
HOMEPAGE= http://camlbz2.forge.ocamlcore.org/
HOMEPAGE= http://gitlab.com/irill/camlbz2
LICENSE= gnu-lgpl-v2.1

GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_TOOLS+= gmake autoconf
MAKE_JOBS_SAFE= no
OCAML_USE_FINDLIB= yes

pre-configure:
cd ${WRKSRC} && autoconf

.include "../../mk/ocaml.mk"
.include "../../mk/bsd.prefs.mk"

Expand Down
11 changes: 6 additions & 5 deletions archivers/ocaml-bz2/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.4 2021/10/26 09:57:11 nia Exp $
$NetBSD: distinfo,v 1.5 2022/05/03 18:29:18 jaapb Exp $

BLAKE2s (camlbz2-0.6.0.tar.gz) = 262f949178cc52c91248963cac41e6a911b4f98e73975c01d5cb0e15a3fb343d
SHA512 (camlbz2-0.6.0.tar.gz) = 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
Size (camlbz2-0.6.0.tar.gz) = 57771 bytes
SHA1 (patch-Makefile.in) = 461eaf03de4bafca9d174d7ad242b8c496b07742
BLAKE2s (camlbz2-0.7.0.tar.gz) = 18734902bf0adefa59d0a44b799cbca983580626720822db92b4cacb1decf266
SHA512 (camlbz2-0.7.0.tar.gz) = 570901199df4b5ef79e158f5309ff69d2b85babe002a0324244868f4201f0e9d6aeec377b2ec9a6bf657a29857dc13a0f63e05d162f76c7d412fa6c5f3c0e0f6
Size (camlbz2-0.7.0.tar.gz) = 22769 bytes
SHA1 (patch-Makefile.in) = 3178ff69e946d65c793a33aff1eda4fb6f007ae7
SHA1 (patch-configure.in) = ee0798cc92a5796220fb3b176b4508c6d0936825
3 changes: 2 additions & 1 deletion archivers/ocaml-bz2/patches/patch-Makefile.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$NetBSD: patch-Makefile.in,v 1.1 2012/09/16 12:30:46 jaapb Exp $
$NetBSD: patch-Makefile.in,v 1.2 2022/05/03 18:29:18 jaapb Exp $

Install into the right DESTDIR

--- Makefile.in.orig 2008-11-08 11:19:40.000000000 +0000
+++ Makefile.in
@@ -43,10 +43,10 @@ install : findlib-install
Expand Down
13 changes: 13 additions & 0 deletions archivers/ocaml-bz2/patches/patch-configure.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
$NetBSD: patch-configure.in,v 1.1 2022/05/03 18:29:18 jaapb Exp $

Include the ocaml m4 file for autoconf to find

--- configure.in.orig 2021-01-18 16:38:53.000000000 +0000
+++ configure.in
@@ -1,5 +1,5 @@
# autoconf input using ocaml.m4
-
+m4_include([ocaml.m4])
AC_INIT(bz2.mli)

use_findlib=yes
9 changes: 4 additions & 5 deletions archivers/ocaml-decompress/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:46 jaapb Exp $
# $NetBSD: Makefile,v 1.3 2022/05/03 19:45:12 jaapb Exp $

GITHUB_PROJECT= decompress
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.8.1
DISTNAME= ${GITHUB_PROJECT}-1.4.3
PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
GITHUB_PROJECT= decompress
GITHUB_TAG= v${PKGVERSION_NOREV}

MAINTAINER= [email protected]
HOMEPAGE= https://github.com/mirage/decompress/
Expand Down
113 changes: 52 additions & 61 deletions archivers/ocaml-decompress/PLIST
Original file line number Diff line number Diff line change
@@ -1,67 +1,58 @@
@comment $NetBSD: PLIST,v 1.1 2019/03/12 18:00:02 jaapb Exp $
bin/decompress.dpipe
bin/decompress.easy
@comment $NetBSD: PLIST,v 1.2 2022/05/03 19:45:12 jaapb Exp $
bin/decompress.pipe
${OCAML_SITELIB}/decompress/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/decompress.a
${OCAML_SITELIB}/decompress/decompress.cma
${OCAML_SITELIB}/decompress/decompress.cmi
${OCAML_SITELIB}/decompress/decompress.cmt
${OCAML_SITELIB}/decompress/decompress.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/decompress.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/decompress.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/decompress.cmxs
${OCAML_SITELIB}/decompress/decompress.ml
${OCAML_SITELIB}/decompress/decompress.mli
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/de/de.a
${OCAML_SITELIB}/decompress/de/de.cma
${OCAML_SITELIB}/decompress/de/de.cmi
${OCAML_SITELIB}/decompress/de/de.cmt
${OCAML_SITELIB}/decompress/de/de.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/de/de.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/de/de.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/de/de.cmxs
${OCAML_SITELIB}/decompress/de/de.ml
${OCAML_SITELIB}/decompress/de/de.mli
${OCAML_SITELIB}/decompress/dune-package
${OCAML_SITELIB}/decompress/impl/decompress_b.ml
${OCAML_SITELIB}/decompress/impl/decompress_bigstring.ml
${OCAML_SITELIB}/decompress/impl/decompress_bytes.ml
${OCAML_SITELIB}/decompress/impl/decompress_hunk.ml
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl.a
${OCAML_SITELIB}/decompress/impl/decompress_impl.cma
${OCAML_SITELIB}/decompress/impl/decompress_impl.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl.cmxs
${OCAML_SITELIB}/decompress/impl/decompress_impl.ml
${OCAML_SITELIB}/decompress/impl/decompress_impl__.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__.ml
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_b.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_b.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_b.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_bigstring.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_bigstring.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_bigstring.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_bytes.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_bytes.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_bytes.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_hunk.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_hunk.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_hunk.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_lz77.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_lz77.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_lz77.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_q.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_q.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_q.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_safe.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_safe.cmt
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_safe.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_safe.cmx
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_seq.cmi
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_seq.cmt
${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_seq.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/impl/decompress_impl__Decompress_seq.cmx
${OCAML_SITELIB}/decompress/impl/decompress_lz77.ml
${OCAML_SITELIB}/decompress/impl/decompress_q.ml
${OCAML_SITELIB}/decompress/impl/decompress_safe.ml
${OCAML_SITELIB}/decompress/impl/decompress_safe.mli
${OCAML_SITELIB}/decompress/impl/decompress_seq.ml
${OCAML_SITELIB}/decompress/impl/decompress_seq.mli
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/gz/gz.a
${OCAML_SITELIB}/decompress/gz/gz.cma
${OCAML_SITELIB}/decompress/gz/gz.cmi
${OCAML_SITELIB}/decompress/gz/gz.cmt
${OCAML_SITELIB}/decompress/gz/gz.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/gz/gz.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/gz/gz.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/gz/gz.cmxs
${OCAML_SITELIB}/decompress/gz/gz.ml
${OCAML_SITELIB}/decompress/gz/gz.mli
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lz/lz.a
${OCAML_SITELIB}/decompress/lz/lz.cma
${OCAML_SITELIB}/decompress/lz/lz.cmi
${OCAML_SITELIB}/decompress/lz/lz.cmt
${OCAML_SITELIB}/decompress/lz/lz.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lz/lz.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lz/lz.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lz/lz.cmxs
${OCAML_SITELIB}/decompress/lz/lz.ml
${OCAML_SITELIB}/decompress/lz/lz.mli
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lzo/lzo.a
${OCAML_SITELIB}/decompress/lzo/lzo.cma
${OCAML_SITELIB}/decompress/lzo/lzo.cmi
${OCAML_SITELIB}/decompress/lzo/lzo.cmt
${OCAML_SITELIB}/decompress/lzo/lzo.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lzo/lzo.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lzo/lzo.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/lzo/lzo.cmxs
${OCAML_SITELIB}/decompress/lzo/lzo.ml
${OCAML_SITELIB}/decompress/lzo/lzo.mli
${OCAML_SITELIB}/decompress/opam
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/zl/zl.a
${OCAML_SITELIB}/decompress/zl/zl.cma
${OCAML_SITELIB}/decompress/zl/zl.cmi
${OCAML_SITELIB}/decompress/zl/zl.cmt
${OCAML_SITELIB}/decompress/zl/zl.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/zl/zl.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/zl/zl.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/decompress/zl/zl.cmxs
${OCAML_SITELIB}/decompress/zl/zl.ml
${OCAML_SITELIB}/decompress/zl/zl.mli
share/doc/decompress/CHANGES.md
share/doc/decompress/LICENSE.md
share/doc/decompress/README.md
5 changes: 3 additions & 2 deletions archivers/ocaml-decompress/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 22:54:27 rillig Exp $
# $NetBSD: buildlink3.mk,v 1.3 2022/05/03 19:45:12 jaapb Exp $

BUILDLINK_TREE+= ocaml-decompress

.if !defined(OCAML_DECOMPRESS_BUILDLINK3_MK)
OCAML_DECOMPRESS_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.ocaml-decompress+= ocaml-decompress>=0.8.1
BUILDLINK_API_DEPENDS.ocaml-decompress+= ocaml-decompress>=1.4.1
BUILDLINK_API_DEPENDS.ocaml-decompress+= ocaml-decompress>=1.4.3
BUILDLINK_PKGSRCDIR.ocaml-decompress?= ../../archivers/ocaml-decompress

.endif # OCAML_DECOMPRESS_BUILDLINK3_MK
Expand Down
8 changes: 4 additions & 4 deletions archivers/ocaml-decompress/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.3 2021/10/26 09:57:11 nia Exp $
$NetBSD: distinfo,v 1.4 2022/05/03 19:45:12 jaapb Exp $

BLAKE2s (decompress-0.8.1.tar.gz) = 55e1c8842c0a62bdd52175b916d197b9b99d0e8932575c946fc91a9b0e1676fe
SHA512 (decompress-0.8.1.tar.gz) = e928e1ccea4ab6987074df76787da62ea1376604d1ea98faad041a5cd0ff2e5d3cd90f511a2c90cce8cebc8df7c686cf1e67ad089ca4e580410fde6440fc96fb
Size (decompress-0.8.1.tar.gz) = 45845 bytes
BLAKE2s (decompress-1.4.3.tar.gz) = 08e926cee62450bbd0bf197792d008acc845b559fe629c748b08940dcbb94421
SHA512 (decompress-1.4.3.tar.gz) = 0bdb09cc41fde25edd61578295dd1859c149861ff73d6719d76ad4ba409a765c42d3e0f0ee76cc5cccd9624150bff786dba065444b16270fe41924729936db68
Size (decompress-1.4.3.tar.gz) = 1173917 bytes
5 changes: 2 additions & 3 deletions archivers/ocaml-zip/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.26 2021/03/08 08:12:46 jaapb Exp $
# $NetBSD: Makefile,v 1.27 2022/05/03 09:27:09 jaapb Exp $
#

VERSION= 1.07
VERSION= 1.11
GITHUB_PROJECT= camlzip
GITHUB_TAG= rel${VERSION:S/.//}
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-zip-${VERSION}
PKGREVISION= 6
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=xavierleroy/}
LICENSE= gnu-lgpl-v2.1
Expand Down
8 changes: 7 additions & 1 deletion archivers/ocaml-zip/PLIST
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
@comment $NetBSD: PLIST,v 1.6 2017/07/11 10:00:51 jaapb Exp $
@comment $NetBSD: PLIST,v 1.7 2022/05/03 09:27:09 jaapb Exp $
${OCAML_SITELIB}/camlzip/META
${OCAML_SITELIB}/zip/META
${OCAML_SITELIB}/zip/dllcamlzip.so
${OCAML_SITELIB}/zip/gzip.cmi
${OCAML_SITELIB}/zip/gzip.cmt
${OCAML_SITELIB}/zip/gzip.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/gzip.cmx
${OCAML_SITELIB}/zip/gzip.mli
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/libcamlzip.a
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.a
${OCAML_SITELIB}/zip/zip.cma
${OCAML_SITELIB}/zip/zip.cmi
${OCAML_SITELIB}/zip/zip.cmt
${OCAML_SITELIB}/zip/zip.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.cmxs
${OCAML_SITELIB}/zip/zip.mli
${OCAML_SITELIB}/zip/zlib.cmi
${OCAML_SITELIB}/zip/zlib.cmt
${OCAML_SITELIB}/zip/zlib.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zlib.cmx
${OCAML_SITELIB}/zip/zlib.mli
4 changes: 2 additions & 2 deletions archivers/ocaml-zip/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.6 2018/07/19 15:15:20 jaapb Exp $
# $NetBSD: buildlink3.mk,v 1.7 2022/05/03 09:27:09 jaapb Exp $

BUILDLINK_TREE+= ocaml-zip

.if !defined(OCAML_ZIP_BUILDLINK3_MK)
OCAML_ZIP_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.ocaml-zip+= ocaml-zip>=1.05nb6
BUILDLINK_ABI_DEPENDS.ocaml-zip+= ocaml-zip>=1.07nb4
BUILDLINK_ABI_DEPENDS.ocaml-zip+= ocaml-zip>=1.11
BUILDLINK_PKGSRCDIR.ocaml-zip?= ../../archivers/ocaml-zip

.include "../../devel/zlib/buildlink3.mk"
Expand Down
8 changes: 4 additions & 4 deletions archivers/ocaml-zip/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.13 2021/10/26 09:57:11 nia Exp $
$NetBSD: distinfo,v 1.14 2022/05/03 09:27:09 jaapb Exp $

BLAKE2s (camlzip-1.07.tar.gz) = f5d75f3e1716febe1e2d4dcf86940031d6d1f46ad00d2792b268fc173e3266e6
SHA512 (camlzip-1.07.tar.gz) = b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
Size (camlzip-1.07.tar.gz) = 26652 bytes
BLAKE2s (camlzip-1.11.tar.gz) = 5f349eebac193485d2e9c06b34663640a89032ad0f0df31c28da1526577ac86c
SHA512 (camlzip-1.11.tar.gz) = 4d69ef900437e66e00cd345497ec70f407f28cd8344ee5f2fad685d3bfe356924597d1854b752f2841b4007f96d6e0307cfae7e13cfb6f74951ae3eba5198a06
Size (camlzip-1.11.tar.gz) = 28483 bytes
8 changes: 5 additions & 3 deletions audio/openal-soft/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.23 2022/03/28 10:43:37 tnn Exp $
# $NetBSD: Makefile,v 1.25 2022/05/04 16:31:30 tnn Exp $

DISTNAME= openal-soft-1.21.1
PKGREVISION= 4
DISTNAME= openal-soft-1.22.0
CATEGORIES= audio
MASTER_SITES= https://openal-soft.org/openal-releases/
EXTRACT_SUFX= .tar.bz2
Expand All @@ -22,12 +21,15 @@ PKGCONFIG_OVERRIDE+= openal.pc.in
PKG_SYSCONFSUBDIR= openal

CMAKE_ARGS+= -DALSOFT_EXAMPLES=OFF
CMAKE_ARGS+= -DALSOFT_UTILS=ON
CMAKE_ARGS+= -DALSOFT_NO_CONFIG_UTIL=ON

CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\""
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
CFLAGS.SunOS+= -D__EXTENSIONS__

BUILDLINK_TRANSFORM+= rm:-Wall

CONF_FILES+= ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf

.include "../../mk/bsd.prefs.mk"
Expand Down
7 changes: 4 additions & 3 deletions audio/openal-soft/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.6 2021/03/21 20:05:17 adam Exp $
@comment $NetBSD: PLIST,v 1.7 2022/05/04 06:53:06 wiz Exp $
bin/makemhr
bin/openal-info
include/AL/al.h
Expand All @@ -7,11 +7,12 @@ include/AL/alext.h
include/AL/efx-creative.h
include/AL/efx-presets.h
include/AL/efx.h
lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake
lib/cmake/OpenAL/OpenALConfig.cmake
lib/cmake/OpenAL/OpenALTargets-relwithdebinfo.cmake
lib/cmake/OpenAL/OpenALTargets.cmake
lib/libopenal.so
lib/libopenal.so.${PKGVERSION}
lib/libopenal.so.1
lib/libopenal.so.${PKGVERSION}
lib/pkgconfig/openal.pc
share/openal/alsoftrc.sample
share/openal/hrtf/Default HRTF.mhr
Expand Down
11 changes: 5 additions & 6 deletions audio/openal-soft/distinfo
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
$NetBSD: distinfo,v 1.11 2021/10/26 09:59:19 nia Exp $
$NetBSD: distinfo,v 1.14 2022/05/04 17:23:35 tnn Exp $

BLAKE2s (openal-soft-1.21.1.tar.bz2) = 021fc93ac926531a947a1e0a2ee9aa341cf809a6b6ff35664d9b82817cfcb694
SHA512 (openal-soft-1.21.1.tar.bz2) = 420eec18149a9b784daaabe8a2865de3b87d5550cf2e8e06569464d0b5ba6e51d904c18f1461af08676bf8c8b76ef270e860008d79545a5f85131299e89bffd4
Size (openal-soft-1.21.1.tar.bz2) = 524787 bytes
SHA1 (patch-CMakeLists.txt) = 5469748347d548838b8e4650e1ecbabacae1f30a
BLAKE2s (openal-soft-1.22.0.tar.bz2) = 3c0deba1498ec857a3f0bbca856723796caf356db40af4ea55a9cbd72b81a727
SHA512 (openal-soft-1.22.0.tar.bz2) = 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd
Size (openal-soft-1.22.0.tar.bz2) = 606420 bytes
SHA1 (patch-CMakeLists.txt) = 906d46ec5a71dc93a05a94985568b22ab67e60a2
SHA1 (patch-alc_alconfig.cpp) = 0539016dadf1827e5a86700c2db5a96479a8b70d
SHA1 (patch-alc_backends_alsa.cpp) = 3ee7f86e544d9b33ccbe9422eb87b9540623053a
SHA1 (patch-alc_backends_solaris.cpp) = 62e7a5bddb5c4ed7f7e4c4889b2234dd778be960
SHA1 (patch-include_AL_al.h) = 5545de5f606320b64ddd713569c9a86c8552eb46
SHA1 (patch-utils_makemhr_loadsofa.cpp) = 907727c5e4a93b879bc840663b51a6bae2bb1230
24 changes: 21 additions & 3 deletions audio/openal-soft/patches/patch-CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: patch-CMakeLists.txt,v 1.3 2021/03/21 20:05:17 adam Exp $
$NetBSD: patch-CMakeLists.txt,v 1.5 2022/05/04 17:23:35 tnn Exp $

Fix building.

--- CMakeLists.txt.orig 2021-03-21 19:49:33.000000000 +0000
--- CMakeLists.txt.orig 2022-04-23 01:46:14.000000000 +0000
+++ CMakeLists.txt
@@ -1136,9 +1136,9 @@ if(ALSOFT_EMBED_HRTF_DATA)
@@ -1206,9 +1206,9 @@ if(ALSOFT_EMBED_HRTF_DATA)

add_custom_command(OUTPUT "${outfile}"
COMMAND ${CMAKE_COMMAND} -D "INPUT_FILE=${infile}" -D "OUTPUT_FILE=${outfile}"
Expand All @@ -16,3 +16,21 @@ Fix building.
VERBATIM
)
set(ALC_OBJS ${ALC_OBJS} "${outfile}")
@@ -1522,7 +1522,7 @@ if(ALSOFT_UTILS)
set(EXTRA_INSTALLS ${EXTRA_INSTALLS} openal-info)
endif()

- if(SNDFILE_FOUND)
+ if(SNDFILE_FOUND AND False)
add_executable(uhjdecoder utils/uhjdecoder.cpp)
target_compile_definitions(uhjdecoder PRIVATE ${CPP_DEFS})
target_include_directories(uhjdecoder
@@ -1608,7 +1608,7 @@ if(ALSOFT_EXAMPLES)

message(STATUS "Building example programs")

- if(SNDFILE_FOUND)
+ if(SNDFILE_FOUND AND False)
add_executable(alplay examples/alplay.c)
target_link_libraries(alplay PRIVATE ${LINKER_FLAGS} SndFile::SndFile ex-common
${UNICODE_FLAG})
Loading

0 comments on commit 56ee70e

Please sign in to comment.