[patch] icedtea-sound-1.0.1-openjdk11.patch

icedtea-sound-1.0.1-openjdk11.patch (text/plain), 5.91 KB, created by Maciej Mrozowski on 2022-11-05 21:33:52 UTC

diff -ruN icedtea-sound-1.0.1/acinclude.m4 my/acinclude.m4
--- icedtea-sound-1.0.1/acinclude.m4	2014-07-18 21:16:30.474403997 +0200
+++ my/acinclude.m4	2022-10-17 03:05:28.899575854 +0200
@@ -225,7 +225,7 @@
   JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
   AC_MSG_CHECKING([if a java binary was specified])
   AC_ARG_WITH([java],
-              [AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 1.5 Java VM)],
+              [AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 11+ Java VM)],
   [
     if test "x${withval}" = "xyes"; then
       JAVA=no
@@ -254,7 +254,7 @@
       AC_PATH_PROG(JAVA, "cacao")
     fi
     if test -z "${JAVA}"; then
-      AC_MSG_ERROR("A 1.5-compatible Java VM is required.")
+      AC_MSG_ERROR("A 11-compatible Java VM is required.")
     fi
   fi
   AC_SUBST(JAVA)
@@ -290,44 +290,6 @@
   AC_SUBST(ECJ_JAR)
 ])
 
-AC_DEFUN_ONCE([IT_FIND_JAVAH],
-[
-  AC_REQUIRE([IT_CHECK_FOR_JDK])
-  JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah
-  AC_MSG_CHECKING([if a javah executable is specified])
-  AC_ARG_WITH([javah],
-              [AS_HELP_STRING([--with-javah[[=PATH]]],specify location of javah)],
-  [
-    if test "x${withval}" = "xyes"; then
-      JAVAH=no
-    else
-      JAVAH="${withval}"
-    fi
-  ],
-  [
-    JAVAH=no
-  ])
-  AC_MSG_RESULT(${JAVAH})
-  if test "x${JAVAH}" == "xno"; then
-    JAVAH=${JAVAH_DEFAULT}
-  fi
-  AC_MSG_CHECKING([if $JAVAH is a valid executable file])
-  if test -x "${JAVAH}" && test -f "${JAVAH}"; then
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-    JAVAH=""
-    AC_PATH_PROG(JAVAH, "javah")
-    if test -z "${JAVAH}"; then
-      AC_PATH_PROG(JAVAH, "gjavah")
-    fi
-    if test -z "${JAVAH}"; then
-      AC_MSG_ERROR("A Java header generator was not found.")
-    fi
-  fi
-  AC_SUBST(JAVAH)
-])
-
 AC_DEFUN_ONCE([IT_FIND_JAR],
 [
   AC_REQUIRE([IT_CHECK_FOR_JDK])
@@ -538,7 +500,7 @@
     }
 }]
 EOF
-  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+  if $JAVAC -cp . $JAVACFLAGS -source 11 -target 11 $CLASS 2>&1; then
     if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
       it_cv_jdk_works=yes;
     else
diff -ruN icedtea-sound-1.0.1/Makefile.am my/Makefile.am
--- icedtea-sound-1.0.1/Makefile.am	2014-07-19 00:37:29.899679075 +0200
+++ my/Makefile.am	2022-10-17 02:59:50.749310225 +0200
@@ -28,7 +28,6 @@
 ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java
 
 # Build directories
-RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
 ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build
 ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native
 ICEDTEA_SOUND_NATIVE_OBJECTS = \
@@ -51,8 +50,8 @@
 EXTRA_DIST = $(ICEDTEA_SOUND_SRCS)
 
 # Flags
-IT_LANGUAGE_SOURCE_VERSION=6
-IT_CLASS_TARGET_VERSION=6
+IT_LANGUAGE_SOURCE_VERSION=11
+IT_CLASS_TARGET_VERSION=11
 IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
 IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -62,7 +61,7 @@
 JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
  -bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
 if JAVADOC_SUPPORTS_J_OPTIONS
-JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m
+JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m
 endif
 endif
 
@@ -114,7 +113,7 @@
 stamps/icedtea-sound-class.stamp:
 	mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)
 	$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(ICEDTEA_SOUND_CLASS_DIR) \
-	 -bootclasspath $(RUNTIME) $(ICEDTEA_SOUND_JAVA_SRCS)
+	 $(ICEDTEA_SOUND_JAVA_SRCS)
 	cp  -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)
 	chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF
 	mkdir -p stamps
@@ -127,18 +126,18 @@
 
 stamps/icedtea-sound-headers.stamp: stamps/icedtea-sound-class.stamp
 	mkdir -p $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
-	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
-	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
-	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
-	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
-	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
+	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  src/java/org/classpath/icedtea/pulseaudio/EventLoop.java ; \
+	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  src/java/org/classpath/icedtea/pulseaudio/Stream.java ; \
+	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  src/java/org/classpath/icedtea/pulseaudio/Operation.java; \
+	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java ; \
+	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java ; \
+	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
 	mkdir -p stamps
 	touch $@