Thu Jun 4 01:10:38 2020 UTC ()
openjdk11: Enable ALSA audio support for NetBSD


(ryoon)
diff -r1.24 -r1.25 pkgsrc/lang/openjdk11/Makefile
diff -r1.16 -r1.17 pkgsrc/lang/openjdk11/distinfo
diff -r0 -r1.1 pkgsrc/lang/openjdk11/patches/patch-make_autoconf_libraries.m4
diff -r0 -r1.1 pkgsrc/lang/openjdk11/patches/patch-make_lib_Lib-java.desktop.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c
cvs diff -r1.24 -r1.25 pkgsrc/lang/openjdk11/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2020/05/29 10:57:14 1.24
+++ pkgsrc/lang/openjdk11/Makefile 2020/06/04 01:10:38 1.25
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2020/05/29 10:57:14 abs Exp $ 1# $NetBSD: Makefile,v 1.25 2020/06/04 01:10:38 ryoon Exp $
2 2
3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} 4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
8GITHUB_PROJECT= openjdk-jdk11u 8GITHUB_PROJECT= openjdk-jdk11u
9GITHUB_TAG= jdk-11.0.7+10-2 9GITHUB_TAG= jdk-11.0.7+10-2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://openjdk.java.net/ 12HOMEPAGE= https://openjdk.java.net/
13COMMENT= Open-source implementation of the Java Platform, Standard Edition 13COMMENT= Open-source implementation of the Java Platform, Standard Edition
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16DISTFILES= ${DEFAULT_DISTFILES} 16DISTFILES= ${DEFAULT_DISTFILES}
17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
18 18
@@ -155,26 +155,27 @@ ${WRKDIR}/cacerts.out: @@ -155,26 +155,27 @@ ${WRKDIR}/cacerts.out:
155 -storepass changeit; \ 155 -storepass changeit; \
156 done 156 done
157 mv ${.TARGET}.tmp ${.TARGET} 157 mv ${.TARGET}.tmp ${.TARGET}
158 158
159do-build: 159do-build:
160 rm -f ${WRKSRC}/make/data/fontconfig/*.orig 160 rm -f ${WRKSRC}/make/data/fontconfig/*.orig
161 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM} 161 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM}
162 162
163do-install: 163do-install:
164 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 164 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
165 cd ${BUILDDIR}/images/jdk && pax -rwpp . \ 165 cd ${BUILDDIR}/images/jdk && pax -rwpp . \
166 ${DESTDIR}${JAVA_HOME}/. 166 ${DESTDIR}${JAVA_HOME}/.
167 167
168.if ${OPSYS} == "Linux" 168.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
169.include "../../audio/alsa-lib/buildlink3.mk" 169.include "../../audio/alsa-lib/buildlink3.mk"
 170CONFIGURE_ARGS+= --with-alsa=${BUILDLINK_PREFIX.alsa-lib}
170.endif 171.endif
171.include "../../converters/libiconv/buildlink3.mk" 172.include "../../converters/libiconv/buildlink3.mk"
172.include "../../devel/zlib/buildlink3.mk" 173.include "../../devel/zlib/buildlink3.mk"
173.include "../../fonts/fontconfig/buildlink3.mk" 174.include "../../fonts/fontconfig/buildlink3.mk"
174.include "../../graphics/freetype2/buildlink3.mk" 175.include "../../graphics/freetype2/buildlink3.mk"
175# Headers from CUPS are required to build the native implementation of 176# Headers from CUPS are required to build the native implementation of
176# sun.print.* which is used by java.awt.print. 177# sun.print.* which is used by java.awt.print.
177BUILDLINK_DEPMETHOD.libcups?= build 178BUILDLINK_DEPMETHOD.libcups?= build
178.include "../../print/libcups/buildlink3.mk" 179.include "../../print/libcups/buildlink3.mk"
179.include "../../mk/java-env.mk" 180.include "../../mk/java-env.mk"
180.include "../../mk/bsd.pkg.mk" 181.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/lang/openjdk11/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/distinfo 2020/05/09 00:55:44 1.16
+++ pkgsrc/lang/openjdk11/distinfo 2020/06/04 01:10:38 1.17
@@ -1,42 +1,45 @@ @@ -1,42 +1,45 @@
1$NetBSD: distinfo,v 1.16 2020/05/09 00:55:44 tnn Exp $ 1$NetBSD: distinfo,v 1.17 2020/06/04 01:10:38 ryoon Exp $
2 2
3SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c 3SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
4RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8 4RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
5SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d 5SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
6Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes 6Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes
7SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff461dfadf85ca8dc42d11a2710 7SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff461dfadf85ca8dc42d11a2710
8RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339 8RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339
9SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359 9SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359
10Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes 10Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
11SHA1 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = a1339a72f399c154104fcf46766b4c259ac24783 11SHA1 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = a1339a72f399c154104fcf46766b4c259ac24783
12RMD160 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = edf0054b7c2fa2eff641b2c385a4f9de07eb0247 12RMD160 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = edf0054b7c2fa2eff641b2c385a4f9de07eb0247
13SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad 13SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad
14Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes 14Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes
15SHA1 (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = a4a3ae9f7d214d08b89ff16a5f794e0650a15288 15SHA1 (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = a4a3ae9f7d214d08b89ff16a5f794e0650a15288
16RMD160 (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = e46bb700a915d30f22e7e29a7f533b55c16c8e21 16RMD160 (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = e46bb700a915d30f22e7e29a7f533b55c16c8e21
17SHA512 (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = 79d35e9f78e3823154fa009cfd99d57841368fcec5db63fb1375cb447116a00d65bb81d3f73de26ae1c730384ab0cc7741276835a40eb34300d60ec08cab7b8c 17SHA512 (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = 79d35e9f78e3823154fa009cfd99d57841368fcec5db63fb1375cb447116a00d65bb81d3f73de26ae1c730384ab0cc7741276835a40eb34300d60ec08cab7b8c
18Size (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = 117654998 bytes 18Size (openjdk-jdk11u-jdk-11.0.7-10-2.tar.gz) = 117654998 bytes
19SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5 19SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5
20SHA1 (patch-make_autoconf_flags-cflags.m4) = 7ec010eb62a1e4f057b7886caf0d0efaae4b6b63 20SHA1 (patch-make_autoconf_flags-cflags.m4) = 7ec010eb62a1e4f057b7886caf0d0efaae4b6b63
21SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618 21SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618
22SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594 22SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594
23SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54 23SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
24SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f 24SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
 25SHA1 (patch-make_autoconf_libraries.m4) = 212cea17edcaf9f333bbf1f2f2b7220787c77d10
25SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d 26SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
26SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07 27SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
27SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d 28SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
 29SHA1 (patch-make_lib_Lib-java.desktop.gmk) = db330b3e1820c3423a2334a3e88179c9a69ee342
28SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp) = 70cd073fcc3e84e673228754dd0fb85ce5ae7102 30SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp) = 70cd073fcc3e84e673228754dd0fb85ce5ae7102
29SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.hpp) = 042ae280b0988c945ed96a2c20e9f1cb356d8efe 31SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.hpp) = 042ae280b0988c945ed96a2c20e9f1cb356d8efe
30SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499 32SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499
31SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = 190f56e8c725884712d850e096955d6d694e902d 33SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = 190f56e8c725884712d850e096955d6d694e902d
32SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = abbfd0f9bd79e6363ffb050b48d081b7d1c3a8e1 34SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = abbfd0f9bd79e6363ffb050b48d081b7d1c3a8e1
33SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797 35SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797
34SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a 36SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
35SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2 37SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
36SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = ad7ee25e66232b07db6abe7b13f9d6ed05a61202 38SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = ad7ee25e66232b07db6abe7b13f9d6ed05a61202
37SHA1 (patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c) = fbc0aa6656292535fb38344fee7178b6f625f58a 39SHA1 (patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c) = fbc0aa6656292535fb38344fee7178b6f625f58a
38SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f 40SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f
39SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1 41SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1
40SHA1 (patch-src_java.base_unix_native_libjsig_jsig.c) = 82e3a8bad9ca18478cad85ada8544712ff117459 42SHA1 (patch-src_java.base_unix_native_libjsig_jsig.c) = 82e3a8bad9ca18478cad85ada8544712ff117459
 43SHA1 (patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 3bec9153803ae023c655579ac08e39963c352880
41SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 0a78e7e8db513ddc06a75f6e504f8ce6132b97ec 44SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 0a78e7e8db513ddc06a75f6e504f8ce6132b97ec
42SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b 45SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b
File Added: pkgsrc/lang/openjdk11/patches/Attic/patch-make_autoconf_libraries.m4
$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
File Added: pkgsrc/lang/openjdk11/patches/Attic/patch-make_lib_Lib-java.desktop.gmk
$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), \
File Added: pkgsrc/lang/openjdk11/patches/Attic/patch-src_java.desktop_bsd_native_libjsound_PLATFORM__API__BsdOS__ALSA__PCM.c
$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"