aboutsummaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-05-31 22:58:04 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2020-05-31 23:08:17 +0200
commit3577586be8fc09b3d1d46c018fc4c5116ce9a497 (patch)
tree7bd47a390938e502daa5e962b98568d3276bc134 /testing
parent510eb0d8b8ec99e760d5a7d7697aab6ca23c1435 (diff)
downloadalpine_aports-3577586be8fc09b3d1d46c018fc4c5116ce9a497.tar.bz2
alpine_aports-3577586be8fc09b3d1d46c018fc4c5116ce9a497.tar.xz
alpine_aports-3577586be8fc09b3d1d46c018fc4c5116ce9a497.zip
unmaintained/openjfx12: move from testing
* Disabled on all arches * Still requires python2
Diffstat (limited to 'testing')
-rw-r--r--testing/openjfx12/APKBUILD241
-rw-r--r--testing/openjfx12/configure-ant-home.patch11
-rw-r--r--testing/openjfx12/crosscompile.patch224
-rw-r--r--testing/openjfx12/disable-architecture-verification.patch23
-rw-r--r--testing/openjfx12/disable-assembler-on-unsupported-archs.patch19
-rw-r--r--testing/openjfx12/disable-jit-for-non-x86.patch21
-rw-r--r--testing/openjfx12/disable-sse2.patch60
-rw-r--r--testing/openjfx12/disable-webkit-sampling-profiler.patch15
-rw-r--r--testing/openjfx12/fix-arm32-build.patch69
-rw-r--r--testing/openjfx12/fix-arm64-build.patch21
-rw-r--r--testing/openjfx12/gcc-no-error.patch31
-rw-r--r--testing/openjfx12/use-system-icu.patch39
-rw-r--r--testing/openjfx12/webcore-linker-flags.patch16
-rw-r--r--testing/openjfx12/webkit-debug-level.patch16
14 files changed, 0 insertions, 806 deletions
diff --git a/testing/openjfx12/APKBUILD b/testing/openjfx12/APKBUILD
deleted file mode 100644
index 6b84c13370..0000000000
--- a/testing/openjfx12/APKBUILD
+++ /dev/null
@@ -1,241 +0,0 @@
1# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
2# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
3pkgname=openjfx12
4pkgver=12.0.2_p1
5_pkgver=${pkgver/_p/+}
6pkgrel=1
7pkgdesc="Open JavaFX 12"
8url="https://hg.openjdk.java.net/openjfx/12-dev/rt"
9arch="" # openjdk11 is not yet available on 32 bit arches, gets stuck on others
10license="GPL-2.0-with-classpath-exception"
11depends="$pkgname-gtk3" # for the virtual openjfx12 package
12makedepends="binutils-gold
13 cmake
14 ninja
15 python2
16 gperf
17 openjdk11-jdk
18 alsa-lib-dev
19 ffmpeg-dev
20 freetype-dev
21 gtk+2.0-dev
22 gtk+3.0-dev
23 icu-dev
24 ruby-dev
25 sqlite-dev"
26subpackages="$pkgname-media:_media
27 $pkgname-web:_web
28 $pkgname-jmods:_jmods:noarch
29 $pkgname-src:_src:noarch
30 $pkgname-doc:_doc:noarch
31 $pkgname-gtk2:_gtk2
32 $pkgname-gtk3:_gtk3
33 $pkgname-libs:_libs
34 $pkgname-base:_base:noarch
35 $pkgname-dev:_dev:noarch"
36source="openjfx-$_pkgver.tar.bz2::http://hg.openjdk.java.net/openjfx/12-dev/rt/archive/$_pkgver.tar.bz2
37 https://archive.apache.org/dist/ant/binaries/apache-ant-1.8.2-bin.zip
38
39 configure-ant-home.patch
40 crosscompile.patch
41 disable-architecture-verification.patch
42 disable-assembler-on-unsupported-archs.patch
43 disable-jit-for-non-x86.patch
44 disable-sse2.patch
45 disable-webkit-sampling-profiler.patch
46 fix-arm32-build.patch
47 fix-arm64-build.patch
48 gcc-no-error.patch
49 use-system-icu.patch
50 webcore-linker-flags.patch
51 webkit-debug-level.patch"
52builddir="$srcdir/rt-$_pkgver"
53
54_ant_home="$srcdir/apache-ant-1.8.2/"
55_java_home="/usr/lib/java/openjfx12"
56
57sonameprefix="$pkgname:"
58ldpath="$_java_home/lib"
59
60prepare() {
61 default_prepare
62
63 # Create build properties
64 cat >gradle.properties <<EOF
65PROMOTED_BUILD_NUMBER=${_pkgver##*+}
66COMPANY_NAME=Alpine
67HUDSON_JOB_NAME=abuild
68RELEASE_SUFFIX=-alpine
69COMPILE_WEBKIT=true
70COMPILE_MEDIA=true
71# non standard, alpine patched properties
72ANT_HOME=$_ant_home
73EXTRA_CXXFLAGS=$CXXFLAGS
74EXTRA_LDFLAGS=$LDFLAGS
75PKG_CONFIG_PATH=$PKG_CONFIG_PATH
76PKG_CONFIG_SYSROOT_DIR=$PKG_CONFIG_SYSROOT_DIR
77CC=${CC:-gcc}
78CXX=${CXX:-g++}
79AR=${AR:-ar}
80EOF
81
82 # use system provided library for icu
83 rm -rf modules/javafx.web/src/main/native/Source/ThirdParty/icu
84
85 # make gradle wrapper executable
86 chmod +x ./gradlew
87}
88
89build() {
90 ./gradlew publicExportsStandaloneLinux
91}
92
93check() {
94 ./gradlew check -x :web:test
95}
96
97package() {
98 mkdir -p "$pkgdir/$_java_home/apps"
99 cp -r build/artifacts/javafx-sdk-12*/* "$pkgdir/$_java_home"
100 cp -r build/artifacts/javafx-jmods-12*/ "$pkgdir/$_java_home/jmods"
101 cp -r build/artifacts/javafx-docs-12*/ "$pkgdir/$_java_home/api"
102}
103
104_jmods() {
105 pkgdesc="$pkgdesc (jmods)"
106 depends=""
107 _fromroot="$pkgdir/$_java_home"
108 _toroot="$subpkgdir/$_java_home"
109
110 mkdir -p "$_toroot"
111 mv "$_fromroot/jmods" "$_toroot"
112}
113
114_src() {
115 pkgdesc="$pkgdesc (src)"
116 depends=""
117 _fromroot="$pkgdir/$_java_home"
118 _toroot="$subpkgdir/$_java_home"
119
120 mkdir -p "$_toroot/lib"
121 mv "$_fromroot/lib/src.zip" "$_toroot/lib/src.zip"
122}
123
124_doc() {
125 pkgdesc="$pkgdesc (Documentation)"
126 depends=""
127 _fromroot="$pkgdir/$_java_home"
128 _toroot="$subpkgdir/$_java_home"
129
130 mkdir -p "$_toroot"
131 mv "$_fromroot/api" "$_toroot"
132}
133
134_gtk2() {
135 pkgdesc="$pkgdesc (GTK 2)"
136 depends="$pkgname-base"
137 _fromroot="$pkgdir/$_java_home"
138 _toroot="$subpkgdir/$_java_home"
139
140 mkdir -p "$_toroot/lib"
141 mv "$_fromroot/lib/libglassgtk2.so" "$_toroot/lib"
142}
143
144_gtk3() {
145 pkgdesc="$pkgdesc (GTK 3)"
146 depends="$pkgname-base"
147 _fromroot="$pkgdir/$_java_home"
148 _toroot="$subpkgdir/$_java_home"
149
150 mkdir -p "$_toroot/lib"
151 mv "$_fromroot/lib/libglassgtk3.so" "$_toroot/lib"
152}
153
154_web() {
155 pkgdesc="$pkgdesc (web)"
156 depends="$pkgname-media"
157 _fromroot="$pkgdir/$_java_home"
158 _toroot="$subpkgdir/$_java_home"
159
160 mkdir -p "$_toroot/lib"
161 mkdir -p "$_toroot/jmods"
162 mkdir -p "$_toroot/legal"
163 mv \
164 "$_fromroot"/lib/libjfxwebkit.so \
165 "$_fromroot"/lib/javafx.web.jar \
166 "$_toroot/lib"
167 mv \
168 "$_fromroot"/jmods/javafx.web.jmod \
169 "$_toroot/jmods"
170 mv \
171 "$_fromroot/legal/javafx.web" \
172 "$_toroot/legal"
173}
174
175_media() {
176 pkgdesc="$pkgdesc (media)"
177 depends="$pkgname-libs"
178 _fromroot="$pkgdir/$_java_home"
179 _toroot="$subpkgdir/$_java_home"
180
181 mkdir -p "$_toroot/lib"
182 mkdir -p "$_toroot/jmods"
183 mkdir -p "$_toroot/legal"
184
185 mv \
186 "$_fromroot"/lib/libavplugin.so \
187 "$_fromroot"/lib/libgstreamer-lite.so \
188 "$_fromroot"/lib/libjfxmedia.so \
189 "$_fromroot"/lib/libfxplugins.so \
190 "$_fromroot"/lib/javafx.media.jar \
191 "$_toroot/lib"
192 mv \
193 "$_fromroot"/jmods/javafx.media.jmod \
194 "$_toroot/jmods"
195 mv \
196 "$_fromroot/legal/javafx.media" \
197 "$_toroot/legal/"
198}
199
200_libs() {
201 pkgdesc="$pkgdesc (libs)"
202 depends=""
203 _fromroot="$pkgdir/$_java_home"
204 _toroot="$subpkgdir/$_java_home"
205
206 mkdir -p "$_toroot/lib"
207 mv "$_fromroot"/lib/*.so "$_toroot/lib"
208}
209
210_base() {
211 pkgdesc="$pkgdesc (base)"
212 depends="$pkgname-libs openjdk11-jre"
213 _fromroot="$pkgdir/$_java_home"
214 _toroot="$subpkgdir/$_java_home"
215
216 mkdir -p "$_toroot"
217 mv "$_fromroot/legal" "$_toroot"
218 mv "$_fromroot/lib" "$_toroot"
219}
220
221_dev() {
222 pkgdesc="$pkgdesc (development)"
223 depends="$pkgname-jmods $pkgname-src $pkgname-doc $pkgname-media $pkgname-web"
224 mkdir -p "$subpkgdir"
225}
226
227sha512sums="35b45abf22922f3bea17a746ccad683f7d408ccd7e3aa27f8775d10fbeec72058c6c5828b4b587a0e8c57dbcdee3e9d465f6ecc414cf78b0b38261d8b0b93f9a openjfx-12.0.2+1.tar.bz2
228b10a420f65dc47b609fd3b7b0fae5b0bd1ddfa6a52cad41bc729c03f7ff82a79092ec81a24cdae363b8b6ec05061267e3cc48a0e14e097d07757bc021cb5619b apache-ant-1.8.2-bin.zip
2290c0c32bc1fcb1766c4149d16b07d5f656300a945208a1df5044c9ad2055c37ea7b348593ef88c529be0ff653daf662fc89b0b0e17acd58d95faafbf76de6b2a4 configure-ant-home.patch
230261b5c26c33030caa5350bf1833455f0b80f24a115876b95bba1490a42b9bfde43d36c0887ff15d34cd73e14b89d33633316d4baece480f4cfef2f9e147775f6 crosscompile.patch
23133a3e4067347a51f5a8dacd3827e6108aefce1dd6a8b39847b1af4652834ffc36d69622023f18cd6cad73c7a3e2e65b51cf14e57f96bf4152385838f82f99646 disable-architecture-verification.patch
232c508a813d8c21151396fd385b6807f757236d0ddb0e33db21368c61c554f845c01326c774eb515a52b098ec51c55f77d1b9c185fba8f6dd0bd4aaf2b32e09880 disable-assembler-on-unsupported-archs.patch
233b4a421f68a58d1e1f06344068fa835a07ba55e4ea73a9171fbb2a158c961ac0951ce6f29969f54ae5358f89f8f5284b78bcbf7a2c0727cda82d333d1ed4ca816 disable-jit-for-non-x86.patch
2347d8c16f132e31a2caa86391944824dfc74ffdcd689c5429310f1546e66726c800583fb5e2bface1ee663fc4576ded545f6118baac9a0c8b7c67a2d21050ff8c7 disable-sse2.patch
2353d443a7216b5f0df3eca1ceb7da9cb973f17d015707cad0203972dee8af1422c3204bd77af36571ded0827a56a21f2f355bb657c1e2ff42da2780667bc8cb995 disable-webkit-sampling-profiler.patch
2361c139f90a666638866ce3898d0cd2597f6f6ac9c93eb9cfcf0538c30c63949b9a2a1e9a737d06f6b611cf1b13aef9690c82a14fd6d0ec5f9685418190eefab37 fix-arm32-build.patch
2373f7ec35437b94e8773541b8cfbf99c2225540572b0c2ba50a954824aba9ad374085fb1b3532ff7bb53a02346b9b5ef7804acf980016815c56acdf587f6559613 fix-arm64-build.patch
23851d4cb484996d62b441ce3ee310703b4e16ad79b4574d936215cb8aea512d5f74511244f0e21d7dc0f56f30469803e3581742444da6db7261b93c60f34ffd91a gcc-no-error.patch
2391ad39f3d53ab52696f8ec6c1039afa494949de1c261dd3c0f9f68372860da2a9c601b09c92b61c9099b399c7589f7f2e313bf93aabaabde0e294ddb7eec60b92 use-system-icu.patch
2402b8ec3bae8c93e5b6154988a5a7ac53477b7e86eea00d11cbd5ac1aaa5c87ddeaba239a65423549da29647f839c15d0f25126128f8fa619ea11ae907be646b44 webcore-linker-flags.patch
241232aebbd13e2e3291d1ae2bc0df282ade5e861e17fce9aaf378ea930655137a2f3fd6e8b43b1ffbc9c3fcc5b21ec36129bdff1070253d6642162e099b32fc171 webkit-debug-level.patch"
diff --git a/testing/openjfx12/configure-ant-home.patch b/testing/openjfx12/configure-ant-home.patch
deleted file mode 100644
index d3851c2efa..0000000000
--- a/testing/openjfx12/configure-ant-home.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- old/build.gradle
2+++ new/build.gradle
3@@ -751,7 +751,7 @@
4 List<String> params // parameters (usually -Dxxx=yyy)
5 ) {
6 // Try to use ANT_HOME
7- String antHomeEnv = System.getenv("ANT_HOME")
8+ String antHomeEnv = "$ANT_HOME"
9 String antHome = antHomeEnv != null ? cygpath(antHomeEnv) : null;
10 String ant = (antHome != null && !antHome.equals("")) ? "$antHome/bin/ant" : "ant";
11
diff --git a/testing/openjfx12/crosscompile.patch b/testing/openjfx12/crosscompile.patch
deleted file mode 100644
index 4c8004ee88..0000000000
--- a/testing/openjfx12/crosscompile.patch
+++ /dev/null
@@ -1,224 +0,0 @@
1--- old/build.gradle
2+++ new/build.gradle
3@@ -2509,6 +2509,12 @@
4
5 }
6
7+def pkgConfigEnv = [
8+ PKG_CONFIG_PATH: "$PKG_CONFIG_PATH",
9+ PKG_CONFIG_SYSROOT_DIR: "$PKG_CONFIG_SYSROOT_DIR"
10+]
11+
12+
13 project(":media") {
14 configurations {
15 media
16@@ -2614,6 +2620,7 @@
17
18 doLast {
19 exec {
20+ environment(pkgConfigEnv)
21 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")
22 args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}",
23 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia",
24@@ -2643,6 +2650,7 @@
25 enabled = IS_COMPILE_MEDIA
26 doLast {
27 exec {
28+ environment(pkgConfigEnv)
29 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
30 args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite",
31 IS_64 ? "ARCH=x64" : "ARCH=x32", "CC=${mediaProperties.compiler}",
32@@ -2661,6 +2669,7 @@
33
34 doLast {
35 exec {
36+ environment(pkgConfigEnv)
37 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
38 args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins",
39 IS_64 ? "ARCH=x64" : "ARCH=x32",
40@@ -2789,6 +2798,7 @@
41 }
42 exec {
43 workingDir("$libavDir")
44+ environment(pkgConfigEnv)
45 commandLine("make")
46 }
47 }
48@@ -2857,6 +2867,7 @@
49 }
50 exec {
51 workingDir("$libavDir")
52+ environment(pkgConfigEnv)
53 commandLine("make")
54 }
55 }
56@@ -2928,6 +2939,7 @@
57 }
58 exec {
59 workingDir("$libavDir")
60+ environment(pkgConfigEnv)
61 commandLine("make")
62 }
63 }
64@@ -2962,6 +2974,7 @@
65 File dir = file(libavDir)
66 if (dir.exists()) {
67 exec {
68+ environment(pkgConfigEnv)
69 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
70 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
71 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
72@@ -2976,6 +2989,7 @@
73 File dir = file(libavDir)
74 if (dir.exists()) {
75 exec {
76+ environment(pkgConfigEnv)
77 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
78 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
79 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
80@@ -2990,6 +3004,7 @@
81 File dir = file(libavDir)
82 if (dir.exists()) {
83 exec {
84+ environment(pkgConfigEnv)
85 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
86 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
87 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
88@@ -3001,6 +3016,7 @@
89 } else {
90 // Building fxavcodec plugin (libav plugin)
91 exec {
92+ environment(pkgConfigEnv)
93 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
94 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
95 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
96@@ -3199,7 +3215,7 @@
97 exec {
98 workingDir("$webkitOutputDir")
99 commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
100- environment(["WEBKIT_OUTPUTDIR" : webkitOutputDir])
101+ environment(["WEBKIT_OUTPUTDIR" : webkitOutputDir, "CC" : CC, "CXX" : CXX, "AR" : AR])
102 }
103
104 exec {
105@@ -3245,6 +3261,9 @@
106 "JAVA_HOME" : JDK_HOME,
107 "WEBKIT_OUTPUTDIR" : webkitOutputDir,
108 "PYTHONDONTWRITEBYTECODE" : "1",
109+ "CC" : CC,
110+ "CXX" : CXX,
111+ "AR" : AR
112 ])
113
114 def targetCpuBitDepthSwitch = ""
115--- old/buildSrc/linux.gradle
116+++ new/buildSrc/linux.gradle
117@@ -54,11 +54,13 @@
118 commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
119 "-ffunction-sections", "-fdata-sections",
120 IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
121+ccFlags.addAll(ext.EXTRA_CXXFLAGS.split(" "))
122 def ccFlagsGTK3 = ccFlags
123 //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
124 def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
125 "-z", "relro",
126 "-Wl,--gc-sections"].flatten()
127+linkFlags.addAll(ext.EXTRA_LDFLAGS.split(" "))
128
129 if (IS_DEBUG_NATIVE) {
130 linkFlags += "-g"
131@@ -77,11 +79,17 @@
132 def gtk3LinkFlags = [ ];
133 LINUX.buildGTK3 = true
134
135+def pkgConfigEnv = [
136+ PKG_CONFIG_PATH: "$PKG_CONFIG_PATH",
137+ PKG_CONFIG_SYSROOT_DIR: "$PKG_CONFIG_SYSROOT_DIR"
138+]
139+
140 // Create $buildDir/linux_tools.properties file and load props from it
141 setupTools("linux_gtk2",
142 { propFile ->
143 ByteArrayOutputStream results1 = new ByteArrayOutputStream();
144 exec {
145+ environment(pkgConfigEnv)
146 commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst")
147 setStandardOutput(results1);
148 }
149@@ -89,6 +97,7 @@
150
151 ByteArrayOutputStream results3 = new ByteArrayOutputStream();
152 exec {
153+ environment(pkgConfigEnv)
154 commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst")
155 setStandardOutput(results3);
156 }
157@@ -110,6 +119,7 @@
158 { propFile ->
159 ByteArrayOutputStream results2 = new ByteArrayOutputStream();
160 exec {
161+ environment(pkgConfigEnv)
162 commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-3.0", "gthread-2.0", "xtst")
163 setStandardOutput(results2);
164 ignoreExitValue(true)
165@@ -118,6 +128,7 @@
166
167 ByteArrayOutputStream results4 = new ByteArrayOutputStream();
168 exec {
169+ environment(pkgConfigEnv)
170 commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-3.0", "gthread-2.0", "xtst")
171 setStandardOutput(results4);
172 ignoreExitValue(true)
173@@ -144,6 +155,7 @@
174 { propFile ->
175 ByteArrayOutputStream results = new ByteArrayOutputStream();
176 exec {
177+ environment(pkgConfigEnv)
178 commandLine "${toolchainDir}pkg-config", "--cflags", "pangoft2"
179 standardOutput = results
180 }
181@@ -151,6 +163,7 @@
182
183 results = new ByteArrayOutputStream();
184 exec {
185+ environment(pkgConfigEnv)
186 commandLine "${toolchainDir}pkg-config", "--libs", "pangoft2"
187 standardOutput = results
188 }
189@@ -175,6 +188,7 @@
190 { propFile ->
191 ByteArrayOutputStream results = new ByteArrayOutputStream();
192 exec {
193+ environment(pkgConfigEnv)
194 commandLine "${toolchainDir}pkg-config", "--cflags", "freetype2"
195 standardOutput = results
196 }
197@@ -182,6 +196,7 @@
198
199 results = new ByteArrayOutputStream();
200 exec {
201+ environment(pkgConfigEnv)
202 commandLine "${toolchainDir}pkg-config", "--libs", "freetype2"
203 standardOutput = results
204 }
205@@ -199,8 +214,8 @@
206 }
207 )
208
209-def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "${toolchainDir}gcc";
210-def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "${toolchainDir}g++";
211+def compiler = ext.CC;
212+def linker = ext.CXX;
213
214 LINUX.glass = [:]
215 LINUX.glass.variants = ["glass", "glassgtk2"]
216@@ -316,7 +331,7 @@
217 LINUX.media = [:]
218 LINUX.media.compiler = compiler
219 LINUX.media.linker = linker
220-LINUX.media.ar = "${toolchainDir}ar"
221+LINUX.media.ar = ext.AR
222
223 LINUX.webkit = [:]
224 LINUX.webkit.compiler = compiler
diff --git a/testing/openjfx12/disable-architecture-verification.patch b/testing/openjfx12/disable-architecture-verification.patch
deleted file mode 100644
index 456598adf1..0000000000
--- a/testing/openjfx12/disable-architecture-verification.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Description: Disable the architecture verification which is limited to i386 and amd64
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/06-disable-architecture-verification.patch
5--- a/build.gradle
6+++ b/build.gradle
7@@ -302,6 +302,7 @@
8 // at present building on PI is not supported, but we would only need to make
9 // some changes on assumptions on what should be built (like SWT / Swing) and
10 // such and we could probably make it work.
11+/*
12 if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}")
13 if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
14 fail("Unknown and unsupported build architecture: $OS_ARCH")
15@@ -310,6 +311,7 @@
16 } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
17 fail("Unknown and unsupported build architecture: $OS_ARCH")
18 }
19+*/
20
21
22 // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
23
diff --git a/testing/openjfx12/disable-assembler-on-unsupported-archs.patch b/testing/openjfx12/disable-assembler-on-unsupported-archs.patch
deleted file mode 100644
index 3e2d534a89..0000000000
--- a/testing/openjfx12/disable-assembler-on-unsupported-archs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Description: Disable assembler in WebKit on unsupported architectures
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/07-disable-assembler-on-unsupported-archs.patch
5--- old/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
6+++ new/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
7@@ -357,6 +357,12 @@
8 #endif
9 #endif
10
11+#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4)
12+#define ENABLE_ASSEMBLER 0
13+#define ENABLE_JIT 0
14+#define ENABLE_YARR_JIT 0
15+#endif
16+
17 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
18 virtual memory, not to choose a GUI toolkit ==== */
19
diff --git a/testing/openjfx12/disable-jit-for-non-x86.patch b/testing/openjfx12/disable-jit-for-non-x86.patch
deleted file mode 100644
index a1c117a6eb..0000000000
--- a/testing/openjfx12/disable-jit-for-non-x86.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/disable-jit-for-non-x86.patch
2--- old/build.gradle
3+++ new/build.gradle
4@@ -3231,11 +3231,17 @@
5 cmakeArgs = " $cmakeArgs -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
6 } else if (t.name == "linux") {
7 cmakeArgs = " $cmakeArgs -DCMAKE_SYSTEM_NAME=Linux"
8+ /*
9 if (IS_64) {
10 cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
11 } else {
12 cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586"
13 }
14+ */
15+ if ( OS_ARCH != "amd64" && OS_ARCH != "i386" ) {
16+ cmakeArgs = "$cmakeArgs -DENABLE_JIT=OFF"
17+ }
18+ cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=$OS_ARCH"
19 // TODO: Use cflags and ldflags from all platforms
20 def cFlags = webkitProperties.ccFlags?.join(' ') ?: ''
21 def lFlags = webkitProperties.linkFlags?.join(' ') ?: ''
diff --git a/testing/openjfx12/disable-sse2.patch b/testing/openjfx12/disable-sse2.patch
deleted file mode 100644
index ef60f825c2..0000000000
--- a/testing/openjfx12/disable-sse2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1Description: Enable SSE2 on i386 and amd64 CPUs only
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/08-disable-sse2.patch
5--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
6+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
7@@ -24,13 +24,16 @@
8 -fstack-protector \
9 -Werror=implicit-function-declaration \
10 -Werror=trampolines \
11- -msse2 \
12 -fbuiltin \
13 -DHAVE_STDINT_H \
14 -DLINUX \
15 -DGST_DISABLE_LOADSAVE \
16 -DGSTREAMER_LITE \
17 -ffunction-sections -fdata-sections
18+
19+ifneq (,$(filter $(CARCH), x86 x86_64))
20+ CFLAGS += -msse2
21+endif
22
23 ifeq ($(BUILD_TYPE), Release)
24 CFLAGS += -Os
25--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
26+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
27@@ -21,7 +21,6 @@
28 -fstack-protector \
29 -Werror=implicit-function-declaration \
30 -Werror=trampolines \
31- -msse2 \
32 -fbuiltin \
33 -DHAVE_STDINT_H \
34 -DLINUX \
35@@ -32,6 +31,10 @@
36 -DGST_DISABLE_GST_DEBUG \
37 -DGSTREAMER_LITE \
38 -ffunction-sections -fdata-sections
39+
40+ifneq (,$(filter $(CARCH), x86 x86_64))
41+ CFLAGS += -msse2
42+endif
43
44 ifeq ($(BUILD_TYPE), Release)
45 CFLAGS += -Os
46--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
47+++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
48@@ -43,8 +43,11 @@
49 -fstack-protector \
50 -Werror=implicit-function-declaration \
51 -Werror=trampolines \
52- -msse2 \
53 -DGSTREAMER_LITE
54+
55+ifneq (,$(filter $(CARCH), x86 x86_64))
56+ CFLAGS += -msse2
57+endif
58
59 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
60 PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
diff --git a/testing/openjfx12/disable-webkit-sampling-profiler.patch b/testing/openjfx12/disable-webkit-sampling-profiler.patch
deleted file mode 100644
index 86285f8d75..0000000000
--- a/testing/openjfx12/disable-webkit-sampling-profiler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Description: Disables the sampling profiler in WebKit (fails to build on arm64)
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: not-needed
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/19-disable-webkit-sampling-profiler.patch
5--- old/modules/javafx.web/src/main/native/Source/cmake/WebKitFeatures.cmake
6+++ new/modules/javafx.web/src/main/native/Source/cmake/WebKitFeatures.cmake
7@@ -163,7 +163,7 @@
8 WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
9 WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
10 WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
11- WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE ON)
12+ WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE OFF)
13 WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
14 WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_WORKER "Toggle ServiceWorker support" PRIVATE OFF)
15 WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE ON)
diff --git a/testing/openjfx12/fix-arm32-build.patch b/testing/openjfx12/fix-arm32-build.patch
deleted file mode 100644
index 153ded3d65..0000000000
--- a/testing/openjfx12/fix-arm32-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1--- old/buildSrc/linux.gradle
2+++ new/buildSrc/linux.gradle
3@@ -45,10 +45,6 @@
4 "-fstack-protector",
5 "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration", "-Werror=trampolines"] // warning flags
6
7-if (!IS_64) {
8- commonFlags += "-m32"
9-}
10-
11 // Specify the compilation parameters and link parameters
12 def ccFlags = [
13 commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
14--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
15+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
16@@ -64,11 +64,6 @@
17 LDFLAGS += $(shell pkg-config --libs libavcodec libavformat)
18 endif
19
20-ifeq ($(ARCH), x32)
21- CFLAGS += -m32
22- LDFLAGS += -m32
23-endif
24-
25 SOURCES = av/fxavcodecplugin.c \
26 av/avelement.c \
27 av/decoder.c \
28--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
29+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
30@@ -55,11 +55,6 @@
31 -z relro \
32 -static-libgcc -static-libstdc++ -Wl,--gc-sections
33
34-ifeq ($(ARCH), x32)
35- CFLAGS += -m32
36- LDFLAGS += -m32
37-endif
38-
39 SOURCES = fxplugins.c \
40 progressbuffer/progressbuffer.c \
41 progressbuffer/hlsprogressbuffer.c \
42--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
43+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
44@@ -80,11 +80,6 @@
45 -z relro \
46 -static-libgcc -static-libstdc++ -Wl,--gc-sections
47
48-ifeq ($(ARCH), x32)
49- CFLAGS += -m32
50- LDFLAGS += -m32
51-endif
52-
53 SOURCES = \
54 gstreamer/gst/gst.c \
55 gstreamer/gst/gstallocator.c \
56--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
57+++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
58@@ -75,11 +75,6 @@
59 CFLAGS += -g -Wall -D_DEBUG
60 endif
61
62-ifeq ($(ARCH), x32)
63- CFLAGS += -m32
64- LDFLAGS += -m32
65-endif
66-
67 CPP_SOURCES = \
68 jni/com_sun_media_jfxmedia_logging_Logger.cpp \
69 jni/JavaBandsHolder.cpp \
diff --git a/testing/openjfx12/fix-arm64-build.patch b/testing/openjfx12/fix-arm64-build.patch
deleted file mode 100644
index 5add350ff3..0000000000
--- a/testing/openjfx12/fix-arm64-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1From: Iain Lane <iain.lane@canonical.com>
2Description: Fix arm64 build
3 Add AArch64 support in Platform.h
4 Don't use COMPARE_AND_SWAP on arm64; it produces invalid asm.
5 Fix some other areas where disabling JIT doesn't work.
6Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
7Forwarded: no
8Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/fix-arm64-build.patch
9--- old/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
10+++ new/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
11@@ -146,7 +146,9 @@
12 #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
13 #define WTF_CPU_ARM64 1
14 #define WTF_CPU_KNOWN 1
15-
16+#if defined(__AARCH64BE__)
17+#define WTF_CPU_BIG_ENDIAN 1
18+#endif
19 #if defined(__arm64e__)
20 #define WTF_CPU_ARM64E 1
21 #endif
diff --git a/testing/openjfx12/gcc-no-error.patch b/testing/openjfx12/gcc-no-error.patch
deleted file mode 100644
index 36c9e2d729..0000000000
--- a/testing/openjfx12/gcc-no-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1The compilation with GCC 8.2 produces a lot of warnings which are treated as errors by default.
2Let the warnings be warnings and pretend we don't care.
3--- old/buildSrc/linux.gradle
4+++ new/buildSrc/linux.gradle
5@@ -233,7 +233,7 @@
6 LINUX.glass.glass = [:]
7 LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
8 LINUX.glass.glass.compiler = compiler
9-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
10+LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Wno-error"].flatten()
11 LINUX.glass.glass.linker = linker
12 LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
13 LINUX.glass.glass.lib = "glass"
14@@ -241,7 +241,7 @@
15 LINUX.glass.glassgtk2 = [:]
16 LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles()
17 LINUX.glass.glassgtk2.compiler = compiler
18-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
19+LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Wno-error"].flatten()
20 LINUX.glass.glassgtk2.linker = linker
21 LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
22 LINUX.glass.glassgtk2.lib = "glassgtk2"
23@@ -249,7 +249,7 @@
24 LINUX.glass.glassgtk3 = [:]
25 LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles()
26 LINUX.glass.glassgtk3.compiler = compiler
27-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
28+LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Wno-error"].flatten()
29 LINUX.glass.glassgtk3.linker = linker
30 LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
31 LINUX.glass.glassgtk3.lib = "glassgtk3"
diff --git a/testing/openjfx12/use-system-icu.patch b/testing/openjfx12/use-system-icu.patch
deleted file mode 100644
index 5717f0c971..0000000000
--- a/testing/openjfx12/use-system-icu.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1This patch disables usage of the bundled icu library as alpine
2already has 63.1
3This saves about 30 MB on the final jfxwebkit.so
4--- old/modules/javafx.web/src/main/native/Source/PlatformJava.cmake
5+++ new/modules/javafx.web/src/main/native/Source/PlatformJava.cmake
6@@ -1,4 +1,3 @@
7 add_subdirectory(ThirdParty/sqlite)
8-add_subdirectory(ThirdParty/icu)
9 add_subdirectory(ThirdParty/libxml)
10 add_subdirectory(ThirdParty/libxslt)
11--- old/modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
12+++ new/modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
13@@ -18,7 +18,7 @@
14 #if PLATFORM(JAVA) && OS(WINDOWS)
15 typedef wchar_t UChar;
16 #else
17-typedef uint16_t UChar;
18+//typedef uint16_t UChar;
19 #endif
20
21 // #ifdef UChar32
22@@ -26,7 +26,7 @@
23 // #endif
24
25 #ifndef __UMACHINE_H__ //XXX: recheck
26-typedef uint32_t UChar32;
27+//typedef uint32_t UChar32;
28 #endif
29
30 #define U_MASK(x) ((uint32_t)1<<(x))
31--- old/modules/javafx.web/src/main/native/Tools/CMakeLists.txt
32+++ new/modules/javafx.web/src/main/native/Tools/CMakeLists.txt
33@@ -48,6 +48,3 @@
34 add_subdirectory(TestWebKitAPI)
35 endif ()
36
37-if (PORT STREQUAL "Java")
38- add_subdirectory(DumpRenderTree/java)
39-endif ()
diff --git a/testing/openjfx12/webcore-linker-flags.patch b/testing/openjfx12/webcore-linker-flags.patch
deleted file mode 100644
index 6e34ada923..0000000000
--- a/testing/openjfx12/webcore-linker-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Description: Use the gold linker with memory saving options to avoid build failures caused by lack of RAM
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Bug-Debian: https://bugs.debian.org/857464
5Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/23-webcore-linker-flags.patch
6--- old/modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake
7+++ new/modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake
8@@ -314,7 +314,7 @@
9 set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
10 set(JFXWebKit_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-macosx")
11 elseif (UNIX)
12- set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
13+ set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
14 set(JFXWebKit_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-vers")
15 elseif (WIN32)
16 # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
diff --git a/testing/openjfx12/webkit-debug-level.patch b/testing/openjfx12/webkit-debug-level.patch
deleted file mode 100644
index 08d12692a6..0000000000
--- a/testing/openjfx12/webkit-debug-level.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Description: Use the -g1 debugging level instead of -g when compiling WebKit
2 to reduce the memory used and avoid build failures caused by lack of RAM.
3Author: Emmanuel Bourg <ebourg@apache.org>
4Forwarded: not-needed
5Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/25-webkit-debug-level.patch
6--- a/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
7+++ b/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
8@@ -89,6 +89,7 @@
9
10 if (COMPILER_IS_GCC_OR_CLANG)
11 WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-strict-aliasing)
12+ WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-g1)
13
14 # clang-cl.exe impersonates cl.exe so some clang arguments like -fno-rtti are
15 # represented using cl.exe's options and should not be passed as flags, so
16
© 2015 Mike Crute