CVS commit: pkgsrc/lang/openjdk11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Jun  4 01:10:38 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk11: Makefile distinfo
Added Files:
        pkgsrc/lang/openjdk11/patches: patch-make_autoconf_libraries.m4
            patch-make_lib_Lib-java.desktop.gmk
            patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c

Log Message:
openjdk11: Enable ALSA audio support for NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk11/patches/patch-make_autoconf_libraries.m4 \
    pkgsrc/lang/openjdk11/patches/patch-make_lib_Lib-java.desktop.gmk \
    pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c

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

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.24 pkgsrc/lang/openjdk11/Makefile:1.25
--- pkgsrc/lang/openjdk11/Makefile:1.24 Fri May 29 10:57:14 2020
+++ pkgsrc/lang/openjdk11/Makefile      Thu Jun  4 01:10:38 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2020/05/29 10:57:14 abs Exp $
+# $NetBSD: Makefile,v 1.25 2020/06/04 01:10:38 ryoon Exp $
 
 DISTNAME=      openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        openjdk-jdk11u
@@ -165,8 +165,9 @@ do-install:
        cd ${BUILDDIR}/images/jdk && pax -rwpp .                \
          ${DESTDIR}${JAVA_HOME}/.
 
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
 .include "../../audio/alsa-lib/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-alsa=${BUILDLINK_PREFIX.alsa-lib}
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.16 pkgsrc/lang/openjdk11/distinfo:1.17
--- pkgsrc/lang/openjdk11/distinfo:1.16 Sat May  9 00:55:44 2020
+++ pkgsrc/lang/openjdk11/distinfo      Thu Jun  4 01:10:38 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2020/05/09 00:55:44 tnn Exp $
+$NetBSD: distinfo,v 1.17 2020/06/04 01:10:38 ryoon Exp $
 
 SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
@@ -22,9 +22,11 @@ SHA1 (patch-make_autoconf_jdk-options.m4
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594
 SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
+SHA1 (patch-make_autoconf_libraries.m4) = 212cea17edcaf9f333bbf1f2f2b7220787c77d10
 SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
+SHA1 (patch-make_lib_Lib-java.desktop.gmk) = db330b3e1820c3423a2334a3e88179c9a69ee342
 SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp) = 70cd073fcc3e84e673228754dd0fb85ce5ae7102
 SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.hpp) = 042ae280b0988c945ed96a2c20e9f1cb356d8efe
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499
@@ -38,5 +40,6 @@ SHA1 (patch-src_java.base_bsd_native_lib
 SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f
 SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1
 SHA1 (patch-src_java.base_unix_native_libjsig_jsig.c) = 82e3a8bad9ca18478cad85ada8544712ff117459
+SHA1 (patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 3bec9153803ae023c655579ac08e39963c352880
 SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 0a78e7e8db513ddc06a75f6e504f8ce6132b97ec
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b

Added files:

Index: pkgsrc/lang/openjdk11/patches/patch-make_autoconf_libraries.m4
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-make_autoconf_libraries.m4:1.1
--- /dev/null   Thu Jun  4 01:10:38 2020
+++ pkgsrc/lang/openjdk11/patches/patch-make_autoconf_libraries.m4      Thu Jun  4 01:10:38 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-make_autoconf_libraries.m4,v 1.1 2020/06/04 01:10:38 ryoon Exp $
+
+* Enable ALSA audio support under NetBSD.
+
+--- make/autoconf/libraries.m4.orig    2020-04-15 22:35:23.000000000 +0000
++++ make/autoconf/libraries.m4
+@@ -73,7 +73,7 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIE
+   fi
+ 
+   # Check if alsa is needed
+-  if test "x$OPENJDK_TARGET_OS" = xlinux -o "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
++  if test "x$OPENJDK_TARGET_OS" = xlinux -o "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd -o "x$OPENJDK_TARGET_OS_ENV" = xbsd.netbsd; then
+     NEEDS_LIB_ALSA=true
+   else
+     NEEDS_LIB_ALSA=false
Index: pkgsrc/lang/openjdk11/patches/patch-make_lib_Lib-java.desktop.gmk
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-make_lib_Lib-java.desktop.gmk:1.1
--- /dev/null   Thu Jun  4 01:10:38 2020
+++ pkgsrc/lang/openjdk11/patches/patch-make_lib_Lib-java.desktop.gmk   Thu Jun  4 01:10:38 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-make_lib_Lib-java.desktop.gmk,v 1.1 2020/06/04 01:10:38 ryoon Exp $
+
+* Enable ALSA audio support under NetBSD.
+
+--- make/lib/Lib-java.desktop.gmk.orig 2020-04-15 22:35:23.000000000 +0000
++++ make/lib/Lib-java.desktop.gmk
+@@ -67,10 +67,6 @@ ifneq ($(OPENJDK_TARGET_OS), aix)
+     LIBJSOUND_EXCLUDE_SRC_PATTERNS := bsd
+   endif
+ 
+-  ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd)
+-    LIBJSOUND_EXCLUDE_SRC_PATTERNS := bsd
+-  endif
+-
+   $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
+       NAME := jsound, \
+       EXCLUDE_SRC_PATTERNS := $(LIBJSOUND_EXCLUDE_SRC_PATTERNS), \
Index: pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c:1.1
--- /dev/null   Thu Jun  4 01:10:38 2020
+++ pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c Thu Jun  4 01:10:38 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c,v 1.1 2020/06/04 01:10:38 ryoon Exp $
+
+* Enable ALSA audio support under NetBSD.
+
+--- src/java.desktop/bsd/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c.orig   2020-04-15 22:35:23.000000000 +0000
++++ src/java.desktop/bsd/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c
+@@ -32,6 +32,10 @@
+ 
+ #if USE_DAUDIO == TRUE
+ 
++#ifndef ESTRPIPE
++#    define ESTRPIPE EPIPE
++#endif
++
+ // GetPosition method 1: based on how many bytes are passed to the kernel driver
+ //                       + does not need much processor resources
+ //                       - not very exact, "jumps"