rpms/java-1.8.0-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed dangling patch 605, soundfont patch

Browse Source
This commit is contained in:
Jiri Vanek 2016-08-25 14:15:52 +02:00
parent e8a1ee2643
commit d102dd99ad
2 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java-1.8.0-openjdk.spec
View File

@ -903,9 +903,6 @@ Patch203: system-lcms.patch
# PR2462: Backport "8074839: Resolve disabled warnings for libunpack and the unpack200 binary" # PR2462: Backport "8074839: Resolve disabled warnings for libunpack and the unpack200 binary"
# This fixes printf warnings that lead to build failure with -Werror=format-security from optflags # This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
Patch502: pr2462.patch Patch502: pr2462.patch
# S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
# waiting on upstream: http://mail.openjdk.java.net/pipermail/jdk8u-dev/2016-January/004916.html
Patch605: soundFontPatch.patch
# S8148351, PR2842: Only display resolved symlink for compiler, do not change path # S8148351, PR2842: Only display resolved symlink for compiler, do not change path
Patch506: pr2842-01.patch Patch506: pr2842-01.patch
Patch507: pr2842-02.patch Patch507: pr2842-02.patch
@ -1248,7 +1245,6 @@ sh %{SOURCE12}
%patch603 %patch603
%patch601 %patch601
%patch602 %patch602
%patch605
%patch502 %patch502
%patch504 %patch504
@ -1867,7 +1863,7 @@ require "copy_jdk_configs.lua"
- updated to aarch64-shenandoah-jdk8u102-b14 (from aarch64-port/jdk8u-shenandoah) of hotspot - updated to aarch64-shenandoah-jdk8u102-b14 (from aarch64-port/jdk8u-shenandoah) of hotspot
- used aarch64-port-jdk8u-aarch64-jdk8u102-b14.tar.xz as new sources - used aarch64-port-jdk8u-aarch64-jdk8u102-b14.tar.xz as new sources
- used aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u102-b14.tar.xz as new sources for hotspot - used aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u102-b14.tar.xz as new sources for hotspot
- removed upstreamed patches 519 and 520 - removed upstreamed patches 519, 520 and 605
- updated to systemtap 3, removed related patches 300 and 301 - updated to systemtap 3, removed related patches 300 and 301
* Mon Aug 01 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.101-3.b14 * Mon Aug 01 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.101-3.b14

53
soundFontPatch.patch
View File

@ -1,53 +0,0 @@
# HG changeset patch
# User omajid
# Date 1445973555 14400
# Node ID 3e006ea10d21a7fcf15725c51f2ab7ededce53ab
# Parent dfeaf40df80032570558c031f37f6630dc729e3f
8140620: Find and load default.sf2 as the default soundbank on Linux
Reviewed-by: serb
+++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
@@ -671,6 +671,40 @@
actions.add(new PrivilegedAction<InputStream>() {
public InputStream run() {
if (System.getProperties().getProperty("os.name")
+ .startsWith("Linux")) {
+
+ File[] systemSoundFontsDir = new File[] {
+ /* Arch, Fedora, Mageia */
+ new File("/usr/share/soundfonts/"),
+ new File("/usr/local/share/soundfonts/"),
+ /* Debian, Gentoo, OpenSUSE, Ubuntu */
+ new File("/usr/share/sounds/sf2/"),
+ new File("/usr/local/share/sounds/sf2/"),
+ };
+
+ /*
+ * Look for a default.sf2
+ */
+ for (File systemSoundFontDir : systemSoundFontsDir) {
+ if (systemSoundFontDir.exists()) {
+ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2");
+ if (defaultSoundFont.exists()) {
+ try {
+ return new FileInputStream(defaultSoundFont);
+ } catch (IOException e) {
+ // continue with lookup
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+ });
+
+ actions.add(new PrivilegedAction<InputStream>() {
+ public InputStream run() {
+ if (System.getProperties().getProperty("os.name")
.startsWith("Windows")) {
File gm_dls = new File(System.getenv("SystemRoot")
+ "\\system32\\drivers\\gm.dls");