diff options
Diffstat (limited to 'dev-java/openjfx')
19 files changed, 939 insertions, 10 deletions
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index eaf662fea9fb..656c6cb39be9 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -1,12 +1,28 @@ AUX 11/11.0.9_p0-version.patch 691 BLAKE2B 33cfcd3c615e9dec14e2df985b48dc85b895d12ff127ffc3df08b670ad1bcc3790efec63c68b639288c44f7cf5da8dcb2de72195df24c049692df109b20e42ac SHA512 472bb5debb929d4191b2dc2bd0b2e2370f3c93671e581fe42616e4ed6fc3e4a34638a90f04ed756acb5e10d404694267cd861ecf698c7c926cd4c6fe6d6fe8ba +AUX 11/disable-architecture-verification.patch 1288 BLAKE2B 2c228eedfbc9b8642d26c7b92580172b83d492735bd59301fc2506f4a2ab77c002220d728fb2fa57e251c760e77cc224c54e831b15a594186750138336b78c3c SHA512 6d66b16833c61532521666d888cfb1a495c9f2b6bda87e0519ecb907b0c1bb99a267cb059a4ed8428edeb44a34ae6bcfac0c7ca6bd880ba6f08161e851e36252 AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede +AUX 11/don-t-force-msse.patch 4621 BLAKE2B e715f5e8a7aa9c7e6637baa4e90169e0cd63e2d42f1ad76305f4cb13c9cae43d1464fef9dabfc4d4f530261db40650a05347f55065af3e152255845c2168f64d SHA512 5d0c72493e9be638c1fbff26531b51a485f9eac1aeb286e2b6b9a8674d866dab7b736a9959c9ee231f96cbe1c11838a77f64a8db3a993e5c4a2059b4202cefc2 AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981 AUX 11/respect-user-cflags.patch 8609 BLAKE2B 865e8c2b10cc24c7ce45a4d6b039a1e852902f702fee06102273565f22ed870391f5f072c59db51fa48077516a8072b41252fdce961cde20581d8f520eb67afe SHA512 ab77752add6fe7b708d7e7eb94cad722b6016d50bc3ba40505107db0e70e642dfd7d48550cba344ee2e88bf2ea7f55d58140f5eeb7b025c112b87be0ce71e74c AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f AUX 11/wno-error.patch 1894 BLAKE2B 8b4380c97942cc542164ab1673eb4e5701ae17aab7b6673c3b01518fdce91d2daac1e52dd5d7dad09b619093d0b4a153f0aadf060c32ffab19428ab2f307661c SHA512 0d808836b0f52e911ea6172b3c573cfea84035611ce797da7cf58b5eaa51d8c4ef536eb21d3a0c2139311e3c7ba702f13dc96b9e1d3b6cefaaca88188e409f3b +AUX 8/0000-Fix-wait-call-in-PosixPlatform.patch 461 BLAKE2B 10c76c946063e35f935348cd6374b08bb2e2d032ab616bffc09ada63e6795e1887033b13a13bd7d467624b112c0e8523d0eb3f83208f1613eefc7e376b3ee1a5 SHA512 7354f81ea1b8246a9a0ae43aa8ffda9e24ef2cd91ca4a5ac499e5f16fbda1248d3ea4ee41580b76f884b0b41233e31b577a1ba8031772c1bbf86a39345f436dd +AUX 8/0001-Change-Lucene.patch 3008 BLAKE2B 9174e6ecd11b52b15281072195a32e798c833604e9d7ff5bfcf224710be0662a1b6d2d1040f29a053c157f470c4403737b6c05f0cc3debbc682b495b7ff96d27 SHA512 0b5371cfbdb5830649a060f1964830d774d267c38842f077e96e5fd841729f5802c1142874bdf255e9d0bd74c81f704374f9b6a27d883a0ef516f14e586971b6 +AUX 8/0003-fix-cast-between-incompatible-function-types.patch 3383 BLAKE2B 5a0f93db8a64d61874321908d50f7ed049df4f1000a710763384149614ffbb3c7012aecd3b53c89e9fae647746bff934560a91d7637ba3e3c8e95d50ccfd467e SHA512 cfaa6695ffaacc866016d2a78201490ba79ff8a00debf3ef9c793cc910e118f9720b29f54ac172c5f5c010f9a06f7a9cbe10817f3231ccad5435fe3bb5ef9341 +AUX 8/0004-Fix-Compilation-Flags.patch 1126 BLAKE2B 0f3d17a5ce7c501c55c7af0c39c48eda76812052ebdf0ec315663d71faf8d7435c8a88ca7b28900e512bbe6c6e4ebb7a580aa34ab6f0a1031cabd62180fa4701 SHA512 56a83b8aeae1f2767d1013e1ccab8acc0bbce172148b80c9c6121784f7ea35cc69f5d4a924f74720fe3d5b98bc6128a6db75c6f950a72b17202e5b9078e94d9e +AUX 8/0005-don-t-include-xlocale.h.patch 886 BLAKE2B e55a1695618136442f50bb7c57e0928d8a70154d54cdffcb65a5bc8923a967eabcce74f00c7cbf75f1a583a685fac136b3c0433e096df4809c925f80c7d540fc SHA512 a7959a25c3102c022c16cd259152b64f3edbad9085d93d5146cdaa891db1a3e573afcbc47a1ecfc1b338876fd1cac25d22633001cd3357c254f4c6701e8aa531 +AUX 8/06-disable-architecture-verification.patch 950 BLAKE2B 7cb4a1bb01d347203c3640c541ceb9d1a88b4e1ce6ba4300153e6b66ee010f96c6c392c86e56049283d49a1a28d2a7818f038481143ef1f0afada7999bc46fb0 SHA512 ee8c18fb10eeabe75cfc1d4894fff21ae9d2b0d34e1ffc596a6e58a8fad6159df9ac2fe13d2bdcbd061295a804c56dd4f98f81696bbe6b3318ed427aaffd08d0 +AUX 8/07-disable-assembler-on-unsupported-archs.patch 664 BLAKE2B 516eff1fca4580ba9073603586d7262d7d7dd0f0f6cf0862d4ca0e967b321a8423be0b7c141c2577a61152132ed45a167bd77a70ee78b53b0d9b078d3863f543 SHA512 96405afc3cf4718b32042e2c373370af219d4d0c52f6d4c63d4f71c22ba962b48603799ea7e3a043ea08ccea0d7e48b85001cf6bd8fd72ba3ce314b59457b948 +AUX 8/10-javadoc-locale.patch 768 BLAKE2B e674c8c613eb518dd5de7b6cb253d7f0d6dafd0e8a5f3ae9b619c99b9a87ec0e565f4908aabba8f996d960c2c6fe7010457da5a5bd3c6a9313e9e83843e9df05 SHA512 b97de0f5bcd1a8dcfab8e39694d02c7cdc20619efd5bb1d5fc5928a47e1495e3682ba0474ae064a1db42b9f79d0caab5214747214bacb512ed657773ce510aef +AUX 8/99-sysdeps.patch 1467 BLAKE2B afb49b067754e93ea3309b10217fd67589f3838a3772f425fac5f3c985cbca8f305bdedd7b9792059e62046d05687e9652047ff83eff01fe52dd3f5fe5ad86e3 SHA512 26d4ca4cc9c860c5d8d1ca9f2d6a13821498bb0f9a709b46b9e1d6fb04d90e74efb35093c1d084099d71343f158a122a2936297883294bc743a65ae81fff4b74 +AUX 8/Wno-error.patch 5055 BLAKE2B 07061a25ac190d3f0546eb7811b98a1b634d7e58686a48e5de5497fe244076e745250d860d577213a14bbf52e8db3b9e7cadfd78cf74b895d171ef5d9a1cc692 SHA512 cd61c99c275648399a0c779aa8efabd8b58320ac939fc305bbca75f4cb33b7a43246251ef9e3e3848d801a3c3588d4508796a2f97eea94a61d2b3f63906cf423 +AUX 8/disable-online-repos.patch 1886 BLAKE2B 2959fd2d324a66430ada639890de5563c987dfea4878d21666df54d0e107f021dfd47e6c29da44c23b934603f543f839f16af67c9e35526990cf11b6092c0455 SHA512 ce377c6fc25157e4e8b7ebc7a030411cef1c9fe0f8051ec4b02c8c6fa0505adc4ae3ed3a62a562019652b4d9d6279d168c0df1acc5a2a36272fea6fe114aea83 +AUX 8/don-t-force-msse.patch 2416 BLAKE2B 20380651c8c05b116aa936776a96b4fab390dce4e054fb75c902a51987a9c7ed9be09d8a419863c7d693e4363c274df65ea3d2fca459379ea3099613590e5e80 SHA512 5a94ed21a7d7ffc55c69f8d956351a0ba162d7ceb7ede5c85e53f39a4c48cd7fc4fea9665d2c60dfe2942250b2fd3be92b79bc47d8ee340a514bb35271ef295c +AUX 8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch 842 BLAKE2B 7c7b5d5291f51dbedba6b836b3adf863533cc1cac53b17ae39e0c045a0d902a622f71339dd31614c6a0a9ca43528f973a037c0e645b9010c90b721c5d468e259 SHA512 ea2f6b9171ba8c19e92b0972e06ac7774bcce3dfd1e76ce845f387670da3894cbb4236fcef4587f1ed4889cf49c777a4e443eea7578fca06ab03a4387bb293f7 +AUX 8/respect_flags.patch 812 BLAKE2B 1f2ec35dbfdb3c8c2d606a095206d1da187691a7fe054f66504cbb070a3ec74e95e6977e9143c46e98b646d34f5f6dbd57d3d9d253efd888510ab2c6292ddf9a SHA512 9a0fbbc6c849347ad71d3571573e0cfeed9ca0c5ff58634987f0f1faeeb3f2801020f51c6d7bbd7719e3a4d65c9a4e465c50b546c53c79f89e28f757befd37b7 DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086 DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11 -DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882 +DIST gradle-4.10.3-bin.zip 78422006 BLAKE2B f565e591751acb5b05c261b3d8dbc8e07f76b48c73516f6cb1b2846ebf0bbf38000b9a61790e9b3055bddd9f9846d61979d187f4a30c317a1de98546891d9d2d SHA512 fd3f4cfbd5262cc8514b7fb3e303ef46b9ca4b22901f1fe848ec4679f8d6bc283bde12ec584437624f0acf5486e5663966ad0736bf8ab341ac3e2667f514ceec DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2 DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678 DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60c57489017985448ddff46bc8c527b72e615e5f28d0301c28dc8119f0e6c75f4e8a711df3e6aaa418190b8ac8d1857 SHA512 41a85eafde03718efba7cf22598a430efbc6a6a68cf68058988f9eff648d19faa6cc4cf68293fe6e39783a7636eae571f27e04006f4607250dd9f6642184c61d @@ -14,5 +30,8 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 -EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B a21489ee9fc2342d3c2cd5808cc2c3ba1567b96f8391b2356028a18ebf4e5c77e54d537dbaba74ebcdddc4a6d8ac6e4c6ace4f75749b7e6f8d0e5159afbc3835 SHA512 474743ff11d921b7654508e3ee9a2644cf7d1b1baeb5dc5b7348b6bd6bc84877354313bb62f64b84ccd27a68eb55690838170e1aadc510eeb6d0ebeb6d18bb0a +DIST openjfx-8.999-backports.tar.xz 2794912 BLAKE2B cdcef2e443dce274b90ce5d0d148e7d10e73eebd9a62ec1514bc13017defa624ce6486f00de80f03d055d2294c9656de9bd3965bb07393d4397a201023a52a69 SHA512 eabbce2f230ef37d392d564d272a95d0f5225cfad0441268b020200e63fbb15b1883df3f21b5f75e34e8b2cf61bc3d843451315a51f1ec2cd487abaae3ee7893 +DIST openjfx-8.999.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 +EBUILD openjfx-11.0.9_p0.ebuild 6529 BLAKE2B ff736eb45f3c448c54c918da73ca36b49b917a0e4e7181f79bd3d0665fed434295e43ec09c9054f07d546a28312ab7bb92d28e4d2714608b355080dd5471e476 SHA512 1e34a7876c9dadf87edc96ae2e3c3159069c9fb2d057f2a98546f231e67724c338fb06e1a9c7045e5da390c45d2c84232fb7241d6442d5fc48f14b0581c493aa +EBUILD openjfx-8.999.ebuild 5613 BLAKE2B 3e173120520d2e0918a8d6532c8cf3a681bb8314b3898b55da3c9c8f7583177977b93a651936f099bf2b9b83dea70f074d1abe042fd12463d32fda7352bc8aae SHA512 1fcf6839af3edca556c40c6f75797b840ee08010e762b985c6864cdefedb44c4f1e9945c72237e39c33920481a26d1d2650fe18f4546ef945bbafcce0ed51f87 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d diff --git a/dev-java/openjfx/files/11/disable-architecture-verification.patch b/dev-java/openjfx/files/11/disable-architecture-verification.patch new file mode 100644 index 000000000000..9e5a3fc3b750 --- /dev/null +++ b/dev-java/openjfx/files/11/disable-architecture-verification.patch @@ -0,0 +1,33 @@ +From 715ea681d14364be4fb2bdda120f6bf9ebaa9d5e Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sat, 19 Sep 2020 18:38:05 -0700 +Subject: [PATCH] disable architecture verification + +--- + build.gradle | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build.gradle b/build.gradle +index 66a4b3c..f66ee01 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx" + // at present building on PI is not supported, but we would only need to make + // some changes on assumptions on what should be built (like SWT / Swing) and + // such and we could probably make it work. ++/* + if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}") + if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { + fail("Unknown and unsupported build architecture: $OS_ARCH") +@@ -310,7 +311,7 @@ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { + } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") { + fail("Unknown and unsupported build architecture: $OS_ARCH") + } +- ++*/ + + // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified, + // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, all of which may be specified +-- +2.28.0 + diff --git a/dev-java/openjfx/files/11/don-t-force-msse.patch b/dev-java/openjfx/files/11/don-t-force-msse.patch new file mode 100644 index 000000000000..f3d62c8e26f2 --- /dev/null +++ b/dev-java/openjfx/files/11/don-t-force-msse.patch @@ -0,0 +1,95 @@ +From cf60da4cb9429f01b5793b0116651e6766068e7b Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sat, 19 Sep 2020 18:30:58 -0700 +Subject: [PATCH] don't force -msse + +--- + .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - + .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - + .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- + .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- + .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - + .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- + 6 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +index f27b9479..4e229f20 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +@@ -23,7 +23,6 @@ CFLAGS := -fPIC \ + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +index 627865f9..a4d99299 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +@@ -20,7 +20,6 @@ CFLAGS := -fPIC \ + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +index 9f80434d..659ab1c1 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +@@ -30,8 +30,7 @@ CFLAGS += -fPIC \ + -DHAVE_STDINT_H \ + -DGSTREAMER_LITE \ + -DG_DISABLE_DEPRECATED \ +- -DOSX \ +- -msse2 ++ -DOSX + + ifeq ($(BUILD_TYPE), Release) + CFLAGS += -Os +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +index 2020404c..34bdf42c 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +@@ -51,8 +51,7 @@ CFLAGS += -fPIC \ + -DHAVE_CONFIG_H \ + -DGSTREAMER_LITE \ + -DGST_REMOVE_DISABLED \ +- -DOSX \ +- -msse2 ++ -DOSX + + ifeq ($(BUILD_TYPE), Release) + CFLAGS += -Os +diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +index c9500236..175be13e 100644 +--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile ++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +@@ -43,7 +43,6 @@ ifdef HOST_COMPILE + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -DGSTREAMER_LITE + + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) +diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +index 5ffd9eac..a7b3ddbb 100644 +--- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile ++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +@@ -30,8 +30,7 @@ CFLAGS += -pipe \ + -fPIC \ + -Werror=implicit-function-declaration \ + -DTARGET_OS_MAC=1 \ +- -D_GNU_SOURCE \ +- -msse2 ++ -D_GNU_SOURCE + + ifeq ($(BUILD_TYPE), Release) + CFLAGS += -Os +-- +2.28.0 + diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch new file mode 100644 index 000000000000..fee211fd8770 --- /dev/null +++ b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch @@ -0,0 +1,14 @@ +--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-10-29 16:26:04.000000000 +0100 ++++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-11-27 15:34:52.170181958 +0100 +@@ -232,10 +232,7 @@ + pid_t wpid = 0; + + //TODO Use waitpid instead of wait +-#ifdef LINUX +- wait(&status); +-#endif +-#ifdef MAC ++#if defined(LINUX) || defined(MAC) + wpid = wait(&status); + #endif + diff --git a/dev-java/openjfx/files/8/0001-Change-Lucene.patch b/dev-java/openjfx/files/8/0001-Change-Lucene.patch new file mode 100644 index 000000000000..58d0c805ccb5 --- /dev/null +++ b/dev-java/openjfx/files/8/0001-Change-Lucene.patch @@ -0,0 +1,79 @@ +--- rt-8u202-b02/build.gradle ++++ rt-8u202-b02-patched/build.gradle +@@ -3268,38 +3268,38 @@ + // The apps build is Ant based, and gradle lets us "import" ant build.xml + // into our configuration. + +- ant.importBuild 'build.xml' ++ //ant.importBuild 'build.xml' + + // Download the Lucene libraries needed for the Ensemble8 app +- def luceneVersion = "7.4.0" +- getConfigurations().create("lucene"); +- dependencies { +- lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion +- lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion +- lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion +- } ++ //def luceneVersion = "7.4.0" ++ //getConfigurations().create("lucene"); ++ //dependencies { ++ // lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion ++ // lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion ++ // lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion ++ //} + + // Copy Lucene libraries into the Ensemble8/lib directory +- File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib"); +- def libNames = [ "lucene-core-${luceneVersion}.jar", +- "lucene-grouping-${luceneVersion}.jar", +- "lucene-queryparser-${luceneVersion}.jar" ] +- +- +- task getLucene(type: Copy) { +- doFirst { +- ensembleLibDir.mkdirs(); +- } +- into ensembleLibDir +- includeEmptyDirs = false +- configurations.lucene.files.each { f -> +- libNames.each { name -> +- if (name == f.getName()) { +- from f.getPath() +- } +- } +- } +- } ++ //File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib"); ++ //def libNames = [ "lucene-core-${luceneVersion}.jar", ++ // "lucene-grouping-${luceneVersion}.jar", ++ // "lucene-queryparser-${luceneVersion}.jar" ] ++ ++ ++ //task getLucene(type: Copy) { ++ // doFirst { ++ // ensembleLibDir.mkdirs(); ++ // } ++ // into ensembleLibDir ++ // includeEmptyDirs = false ++ // configurations.lucene.files.each { f -> ++ // libNames.each { name -> ++ // if (name == f.getName()) { ++ // from f.getPath() ++ // } ++ // } ++ // } ++ //} + + compileTargets { t -> + // The apps build is Ant based, and gradle lets us "import" ant apps/build.xml +@@ -3310,7 +3310,7 @@ + def jfxrtJar = "${rootProject.buildDir}/${sdkDirName}/rt/lib/ext/jfxrt.jar" + + def appsJar = project.task("appsJar${t.capital}") { +- dependsOn(sdk, getLucene) ++ dependsOn(sdk) + doLast() { + ant.properties['targetBld'] = "$t.name" + if (!rootProject.ext[t.upper].compileSwing) { + diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch new file mode 100644 index 000000000000..011e952b9440 --- /dev/null +++ b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch @@ -0,0 +1,77 @@ +From 36b952bdcdc301a600009308bff90440b6ceab5b Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth@redhat.com> +Date: Thu, 21 Jun 2018 15:57:01 +0100 +Subject: [PATCH 4/4] fix cast between incompatible function types + +--- + modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++-- + .../src/main/native-glass/gtk/glass_window_ime.cpp | 9 +++------ + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp +index f85b1dae..3b9225f7 100644 +--- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp ++++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp +@@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() { + return ctx; + } + +-static gboolean dnd_finish_callback() { ++static gboolean dnd_finish_callback(gpointer data) { + if (dnd_window) { + dnd_set_performed_action( + translate_gdk_action_to_glass( +@@ -1079,6 +1079,10 @@ gboolean DragView::get_drag_image_offset(int* x, int* y) { + return offset_set; + } + ++static void on_pixbuf_destroy_notify(guchar *pixels, gpointer data) { ++ g_free(pixels); ++} ++ + GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* height) { + GdkPixbuf *pixbuf = NULL; + gboolean is_raw = FALSE; +@@ -1106,7 +1110,7 @@ GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* h + if (data) { + memcpy(data, (raw + whsz), nraw - whsz); + pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8, +- w, h, w * 4, (GdkPixbufDestroyNotify) g_free, NULL); ++ w, h, w * 4, (GdkPixbufDestroyNotify) on_pixbuf_destroy_notify, NULL); + } + } + } +diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp +index 82e54d11..51af2a6a 100644 +--- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp ++++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp +@@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) { + } + } + +-//Note: this function must return int, despite the fact it doesn't conform to XIMProc type. +-// This is required in documentation of XIM +-static int im_preedit_start(XIM im_xim, XPointer client, XPointer call) { ++static void im_preedit_start(XIM im_xim, XPointer client, XPointer call) { + (void)im_xim; + (void)call; + + mainEnv->CallVoidMethod((jobject) client, jViewNotifyPreeditMode, JNI_TRUE); +- CHECK_JNI_EXCEPTION_RET(mainEnv, -1); +- return -1; // No restrictions ++ CHECK_JNI_EXCEPTION(mainEnv); + } + + static void im_preedit_done(XIM im_xim, XPointer client, XPointer call) { +@@ -234,7 +231,7 @@ void WindowContextBase::enableOrResetIME() { + return; + } + +- XIMCallback startCallback = {(XPointer) jview, (XIMProc) im_preedit_start}; ++ XIMCallback startCallback = {(XPointer) jview, im_preedit_start}; + XIMCallback doneCallback = {(XPointer) jview, im_preedit_done}; + XIMCallback drawCallback = {(XPointer) jview, im_preedit_draw}; + XIMCallback caretCallback = {(XPointer) jview, im_preedit_caret}; +-- +2.17.1 + diff --git a/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch b/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch new file mode 100644 index 000000000000..17c91ab9ab88 --- /dev/null +++ b/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch @@ -0,0 +1,23 @@ +--- rt-8u202-b07/buildSrc/linux.gradle ++++ rt-8u202-b07-patched/buildSrc/linux.gradle +@@ -54,7 +54,7 @@ + def ccFlags = [ + commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", + "-ffunction-sections", "-fdata-sections", +- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() ++ IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten() + def ccFlagsGTK3 = ccFlags + //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) + def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags, + +--- rt-8u202-b07/buildSrc/x86egl.gradle ++++ rt-8u202-b07-patched/buildSrc/x86egl.gradle +@@ -99,7 +99,7 @@ + def ccFlags = [ + commonFlags, + "-I$JDK_HOME/include", "-I$JDK_HOME/include/${jniPlatform}", "-c", +- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() ++ IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten() + //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) + def linkFlags = ["-shared", commonFlags].flatten() + diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch new file mode 100644 index 000000000000..883c3da57e72 --- /dev/null +++ b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch @@ -0,0 +1,25 @@ +From 597f200762be416d5a62f1efd351cba6e47c1c4c Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Thu, 30 May 2019 12:07:30 -0700 +Subject: [PATCH] don't include xlocale.h + +--- + .../gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c +index 72dc1301..32669789 100644 +--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c ++++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c +@@ -39,7 +39,7 @@ + + #ifdef HAVE_XLOCALE_H + /* Needed on BSD/OS X for e.g. strtod_l */ +-#include <xlocale.h> ++#include <locale.h> + #endif + + #ifdef G_OS_WIN32 +-- +2.21.0 + diff --git a/dev-java/openjfx/files/8/06-disable-architecture-verification.patch b/dev-java/openjfx/files/8/06-disable-architecture-verification.patch new file mode 100644 index 000000000000..d10e62850c31 --- /dev/null +++ b/dev-java/openjfx/files/8/06-disable-architecture-verification.patch @@ -0,0 +1,21 @@ +Description: Disable the architecture verification which is limited to i386 and amd64 +Author: Emmanuel Bourg <ebourg@apache.org> +Forwarded: no +--- a/build.gradle ++++ b/build.gradle +@@ -699,6 +699,7 @@ + // at present building on PI is not supported, but we would only need to make + // some changes on assumptions on what should be built (like SWT / Swing) and + // such and we could probably make it work. ++/* + if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}") + if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { + throw new Exception("Unknown and unsupported build architecture: $OS_ARCH") +@@ -707,6 +708,7 @@ + } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") { + throw new Exception("Unknown and unsupported build architecture: $OS_ARCH") + } ++*/ + + // Sanity check that we actually have a list of compile targets to execute + if (COMPILE_TARGETS == null || COMPILE_TARGETS == "") { diff --git a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch new file mode 100644 index 000000000000..551a1e82ba50 --- /dev/null +++ b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch @@ -0,0 +1,18 @@ +Description: Disable assembler in WebKit on unsupported architectures +Author: Emmanuel Bourg <ebourg@apache.org> +Forwarded: no +--- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h ++++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h +@@ -325,6 +325,12 @@ + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif + ++#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(MIPS) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4) ++#define ENABLE_ASSEMBLER 0 ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#endif ++ + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like + virtual memory, not to choose a GUI toolkit ==== */ + diff --git a/dev-java/openjfx/files/8/10-javadoc-locale.patch b/dev-java/openjfx/files/8/10-javadoc-locale.patch new file mode 100644 index 000000000000..39d346a4fb73 --- /dev/null +++ b/dev-java/openjfx/files/8/10-javadoc-locale.patch @@ -0,0 +1,21 @@ +Description: Set the locale of the javadoc to make the build reproducible +Author: Emmanuel Bourg <ebourg@apache.org> +Forwarded: no +--- a/build.gradle ++++ b/build.gradle +@@ -1218,6 +1218,7 @@ + } else { + options.links(JDK_DOCS); + } ++ options.locale("en"); + options.addBooleanOption("XDignore.symbol.file").setValue(true); + options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT); + options.addBooleanOption("javafx").setValue(true); +@@ -2769,6 +2770,7 @@ + options.windowTitle("${javadocTitle}") + options.header("${javadocHeader}") + options.bottom("${javadocBottom}") ++ options.locale("en"); + if (BUILD_CLOSED) { + options.linksOffline(JDK_DOCS, JDK_DOCS_CLOSED); + } else { diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch new file mode 100644 index 000000000000..367d9392d95e --- /dev/null +++ b/dev-java/openjfx/files/8/99-sysdeps.patch @@ -0,0 +1,30 @@ +diff --git a/build.gradle b/build.gradle +index 0914d7d..6bd9e78 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -1309,6 +1309,7 @@ project(":graphics") { + antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" + antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" + antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" ++ antlr3 group: "antlr", name: "antlr", version: "2.7.7" + } + + // Create a single "native" task which will depend on all the individual native tasks for graphics +diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle +index 25f88d1..642450d 100644 +--- a/buildSrc/build.gradle ++++ b/buildSrc/build.gradle +@@ -82,10 +82,13 @@ getConfigurations().create("antlr3"); + + dependencies { + compile group: "org.antlr", name: "antlr", version: "3.1.3" ++ compile group: "org.antlr", name: "antlr-runtime", version: "3.1.3" ++ compile group: "org.antlr", name: "stringtemplate", version: "3.2" + testCompile group: "junit", name: "junit", version: "4.8.2" + antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" + antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" + antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" ++ antlr3 group: "antlr", name: "antlr", version: "2.7.7" + } + + // At the moment the ASM library shipped with Gradle that is used to diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch new file mode 100644 index 000000000000..208411508d87 --- /dev/null +++ b/dev-java/openjfx/files/8/Wno-error.patch @@ -0,0 +1,121 @@ +From 822bf818933311327c5b73cb1b185484f22f55fb Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sun, 26 Apr 2020 21:15:36 -0700 +Subject: [PATCH] Wno-error + +--- + buildSrc/armv5sf.gradle | 1 - + buildSrc/armv6hf.gradle | 1 - + buildSrc/armv6sf.gradle | 1 - + buildSrc/armv7hf.gradle | 1 - + buildSrc/armv7sf.gradle | 1 - + buildSrc/linux.gradle | 6 +++--- + buildSrc/x86egl.gradle | 1 - + 7 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/buildSrc/armv5sf.gradle b/buildSrc/armv5sf.gradle +index ee154182..bee6003e 100644 +--- a/buildSrc/armv5sf.gradle ++++ b/buildSrc/armv5sf.gradle +@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] + def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() + def monocleCFlags = [ + extraCFlags, +- "-Werror", + "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); + def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() + def glassCFlags = ["-ffast-math"] +diff --git a/buildSrc/armv6hf.gradle b/buildSrc/armv6hf.gradle +index dfdff237..0f090f23 100644 +--- a/buildSrc/armv6hf.gradle ++++ b/buildSrc/armv6hf.gradle +@@ -131,7 +131,6 @@ def extraLFlags = [ + def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() + def monocleCFlags = [ + extraCFlags, +- "-Werror", + "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); + def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() + +diff --git a/buildSrc/armv6sf.gradle b/buildSrc/armv6sf.gradle +index ee6615f0..6ebbdd90 100644 +--- a/buildSrc/armv6sf.gradle ++++ b/buildSrc/armv6sf.gradle +@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] + def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() + def monocleCFlags = [ + extraCFlags, +- "-Werror", + "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); + def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() + def glassCFlags = ["-ffast-math"] +diff --git a/buildSrc/armv7hf.gradle b/buildSrc/armv7hf.gradle +index e75bf8a9..092be817 100644 +--- a/buildSrc/armv7hf.gradle ++++ b/buildSrc/armv7hf.gradle +@@ -131,7 +131,6 @@ def extraLFlags = [ + def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() + def monocleCFlags = [ + extraCFlags, +- "-Werror", + "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); + def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() + +diff --git a/buildSrc/armv7sf.gradle b/buildSrc/armv7sf.gradle +index 0bb8a530..38e98303 100644 +--- a/buildSrc/armv7sf.gradle ++++ b/buildSrc/armv7sf.gradle +@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] + def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() + def monocleCFlags = [ + extraCFlags, +- "-Werror", + "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); + def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() + def glassCFlags = ["-ffast-math"] +diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle +index f233b817..0f9d5252 100644 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -203,7 +203,7 @@ LINUX.glass.javahInclude = [ + "com/sun/glass/ui/gtk/*"] + LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles() + LINUX.glass.glass.compiler = compiler +-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() ++LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten() + LINUX.glass.glass.linker = linker + LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten() + LINUX.glass.glass.lib = "glass" +@@ -211,7 +211,7 @@ LINUX.glass.glass.lib = "glass" + LINUX.glass.glassgtk2 = [:] + LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() + LINUX.glass.glassgtk2.compiler = compiler +-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() ++LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten() + LINUX.glass.glassgtk2.linker = linker + LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten() + LINUX.glass.glassgtk2.lib = "glassgtk2" +@@ -219,7 +219,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2" + LINUX.glass.glassgtk3 = [:] + LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() + LINUX.glass.glassgtk3.compiler = compiler +-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten() ++LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten() + LINUX.glass.glassgtk3.linker = linker + LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten() + LINUX.glass.glassgtk3.lib = "glassgtk3" +diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle +index 6bf6196b..ff24207d 100644 +--- a/buildSrc/x86egl.gradle ++++ b/buildSrc/x86egl.gradle +@@ -118,7 +118,6 @@ def extraLFlags = [ + def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() + def monocleCFlags = [ + extraCFlags, +- "-Werror", + "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); + def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() + +-- +2.26.2 + diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch new file mode 100644 index 000000000000..6b0afe4bf070 --- /dev/null +++ b/dev-java/openjfx/files/8/disable-online-repos.patch @@ -0,0 +1,54 @@ +diff --git a/build.gradle b/build.gradle +index df82f63..3f920b6 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -1135,17 +1135,17 @@ allprojects { + // "artifact" in the pattern below. Note that the closed builds use different repositories + // so if you are debugging a closed-build artifact related build issue, check out the + // closed gradle file instead. +- if (!BUILD_CLOSED) { +- repositories { +- mavenCentral() +- ivy { +- url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/" +- layout "pattern", { +- artifact "[artifact].[ext]" +- } +- } +- } +- } ++ // if (!BUILD_CLOSED) { ++ // repositories { ++ // mavenCentral() ++ // ivy { ++ // url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/" ++ // layout "pattern", { ++ // artifact "[artifact].[ext]" ++ // } ++ // } ++ // } ++ // } + + // We want to configure all projects as java projects and use the same compile settings + // etc, except for the root project which we just want to ignore (and for now media) +@@ -1785,13 +1785,13 @@ project(":fxpackager") { + } + // fxpackager has a dependency on ant in order to build the ant jar, + // and as such needs to point to the apache binary repository +- if (!BUILD_CLOSED) { +- repositories { +- maven { +- url "https://repository.apache.org" +- } +- } +- } ++ // if (!BUILD_CLOSED) { ++ // repositories { ++ // maven { ++ // url "https://repository.apache.org" ++ // } ++ // } ++ // } + + dependencies { + compile group: "org.apache.ant", name: "ant", version: "1.8.2" diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch new file mode 100644 index 000000000000..2f5d56718cca --- /dev/null +++ b/dev-java/openjfx/files/8/don-t-force-msse.patch @@ -0,0 +1,51 @@ +From 6483d73551590e8036cd5ec6d317e8114b403f36 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sun, 26 Apr 2020 20:57:39 -0700 +Subject: [PATCH] don't force msse + +--- + .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - + .../native/gstreamer/projects/linux/fxplugins/Makefile | 1 - + .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 - + modules/web/src/main/native/Tools/Scripts/webkitdirs.pm | 7 ------- + 4 files changed, 10 deletions(-) + +diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +index df9f7f21..f82f0537 100644 +--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile ++++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +@@ -28,7 +28,6 @@ CFLAGS = -fPIC \ + -Wformat-security \ + -Werror=implicit-function-declaration \ + -fstack-protector \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +index fd3847d0..3887ac6d 100644 +--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile ++++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +@@ -25,7 +25,6 @@ CFLAGS = -fPIC \ + -Wformat-security \ + -Werror=implicit-function-declaration \ + -fstack-protector \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile +index 3d089501..10fad68f 100644 +--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile ++++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile +@@ -44,7 +44,6 @@ ifdef HOST_COMPILE + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -DGSTREAMER_LITE + + INCLUDES = $(BASE_INCLUDES) \ +-- +2.26.2 + diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch new file mode 100644 index 000000000000..a01dd05494fe --- /dev/null +++ b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch @@ -0,0 +1,24 @@ +From 26d59b7c8cc2b40277756f55387606ba8a852b31 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Fri, 18 Sep 2020 21:43:57 -0700 +Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h + +--- + .../fxpackager/src/main/native/library/common/PosixPlatform.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp +index 5ea3bc6..b5d167b 100644 +--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp ++++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp +@@ -43,7 +43,6 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <unistd.h> +-#include <sys/sysctl.h> + #include <iostream> + #include <dlfcn.h> + #include <signal.h> +-- +2.28.0 + diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch new file mode 100644 index 000000000000..5c5dfa14e042 --- /dev/null +++ b/dev-java/openjfx/files/8/respect_flags.patch @@ -0,0 +1,22 @@ +diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle +index 022d073..8bccdd8 100644 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -46,6 +46,9 @@ def commonFlags = [ + "-fstack-protector", + "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags + ++ ++commonFlags.addAll(System.getenv('CFLAGS').trim().split(" ")) ++ + if (!IS_64) { + commonFlags += "-m32" + } +@@ -61,6 +64,7 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags, + "-z", "relro", + "-Wl,--gc-sections"].flatten() + def defaultLinkFlags = linkFlags.flatten() ++linkFlags.addAll(System.getenv('LDFLAGS').trim().split(" ")) + + def gtk2CCFlags = [ ]; + def gtk3CCFlags = [ "-Wno-deprecated-declarations" ]; diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild index d9fd79845b49..119aa94597c6 100644 --- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild +++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild @@ -5,7 +5,7 @@ EAPI=6 MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.8" +EGRADLE_VER="4.10.3" inherit flag-o-matic java-pkg-2 multiprocessing @@ -25,7 +25,7 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" +KEYWORDS="-* ~amd64 ~ppc64" IUSE="cpu_flags_x86_sse2 debug doc source +media" @@ -48,9 +48,12 @@ RDEPEND=" x11-libs/pango virtual/jpeg virtual/opengl - || ( - dev-java/openjdk-bin:${SLOT}[doc?] - dev-java/openjdk:${SLOT}[doc?] + doc? ( dev-java/openjdk:${SLOT}[doc] ) + !doc? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) ) " @@ -66,7 +69,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -REQUIRED_USE="cpu_flags_x86_sse2" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" PATCHES=( "${FILESDIR}"/11/disable-buildSrc-tests.patch @@ -74,6 +77,8 @@ PATCHES=( "${FILESDIR}"/11/respect-user-cflags.patch "${FILESDIR}"/11/use-system-swt-jar.patch "${FILESDIR}"/11/wno-error.patch + "${FILESDIR}"/11/don-t-force-msse.patch + "${FILESDIR}"/11/disable-architecture-verification.patch "${FILESDIR}/11/${PV}-version.patch" ) @@ -180,8 +185,6 @@ src_configure() { local jdk_doc if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" - elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then - jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" fi [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" fi diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.999.ebuild new file mode 100644 index 000000000000..b7520c0307b2 --- /dev/null +++ b/dev-java/openjfx/openjfx-8.999.ebuild @@ -0,0 +1,199 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs + +EGRADLE_VER="4.10.3" +EHG_COMMIT="9f49e3b6147f" + +DESCRIPTION="Java OpenJFX 8 client application platform" +HOMEPAGE="https://openjfx.io" +SRC_URI=" + https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2 + https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.xz + https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip +" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~ppc64" + +IUSE="debug doc media cpu_flags_x86_sse2" + +DEPEND=" + app-arch/unzip + >=dev-java/ant-core-1.8.2:0 + >=dev-java/antlr-2.7.7-r7:0 + dev-java/antlr:3 + dev-java/openjdk:8 + dev-java/stringtemplate:0 + dev-java/swt:4.10[cairo,opengl] + sys-devel/bison + sys-devel/flex + virtual/jdk:1.8 + virtual/pkgconfig +" + +RDEPEND=" + dev-java/swt:4.10[cairo,opengl] + virtual/jre:1.8 +" + +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" + +RESTRICT="test" # needs junit version we don't have, fragile + +# eclass overrides it, set back to normal +S="${WORKDIR}/${P}" + +# FIXME: majority of flags are honored, needs a bit more patching +QA_FLAGS_IGNORED=".*" + +JAVA_PKG_WANT_BUILD_VM="openjdk-8" +JAVA_PKG_WANT_SOURCE="1.8" +JAVA_PKG_WANT_TARGET="1.8" + +PATCHES=( + "${FILESDIR}"/8/99-sysdeps.patch + "${FILESDIR}"/8/disable-online-repos.patch + "${FILESDIR}"/8/respect_flags.patch + "${FILESDIR}"/8/0000-Fix-wait-call-in-PosixPlatform.patch + "${FILESDIR}"/8/0001-Change-Lucene.patch + "${FILESDIR}"/8/0003-fix-cast-between-incompatible-function-types.patch + "${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch + "${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch + "${FILESDIR}"/8/06-disable-architecture-verification.patch + "${FILESDIR}"/8/07-disable-assembler-on-unsupported-archs.patch + "${FILESDIR}"/8/10-javadoc-locale.patch + "${FILESDIR}"/8/Wno-error.patch + "${FILESDIR}"/8/don-t-force-msse.patch + "${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch +) + +egradle() { + local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" + local gradle="${GRADLE_HOME}/bin/gradle" + local gradle_args=( + --info + --stacktrace + --no-build-cache + --no-daemon + --offline + --gradle-user-home "${T}/gradle_user_home" + --project-cache-dir "${T}/gradle_project_cache" + ) + + export GRADLE_HOME + + # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist + unset ANT_HOME + + einfo "gradle "${gradle_args[@]}" ${@}" + # TERM needed, otherwise gradle may fail on terms it does not know about + TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" +} + +src_unpack() { + default + mv -v "rt-${EHG_COMMIT}" "${P}" || die +} + +src_prepare() { + eapply "${WORKDIR}/${P}-backports" + default + + # this will create local jar storage to be used as ivy repo + local d="${T}/jars" + mkdir "${d}" || die + + # we need jars subdir in every prokect so gradle can find them + # only system jars, no bundling + local target targets + targets=( + jars + buildSrc/jars + modules/{base,builders,controls,extensions,fxml}/jars + modules/{graphics,jmx,media,swing,swt,web,fxpackager}/jars + ) + einfo "Copying system jars" + for target in ${targets[@]}; do + ln -vs "${T}/jars" "${target}" || die + done + + local swt_file_name="$(java-pkg_getjars swt-4.10)" + java-pkg_jar-from --build-only --into "${d}" ant-core ant.jar ant-1.8.2.jar + java-pkg_jar-from --build-only --into "${d}" ant-core ant-launcher.jar ant-launcher-1.8.2.jar + java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar + java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar + java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar + java-pkg_jar-from --build-only --into "${d}" stringtemplate stringtemplate.jar stringtemplate-3.2.jar + sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name#/}\")#" "${S}"/build.gradle || die + + sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die +} + +src_configure() { + # see gradle.properties.template in ${S} + cat <<- _EOF_ > "${S}"/gradle.properties + COMPILE_TARGETS = linux + GRADLE_VERSION_CHECK = false + COMPILE_AVPLUGIN = $(usex media true false) + COMPILE_MEDIA = $(usex media true false) + COMPILE_WEBKIT = false + BUILD_JAVADOC = $(usex doc true false) + BUILD_SRC_ZIP = $(usex source true false) + FULL_TEST = false + CONF = $(usex debug DebugNative Release) + NUM_COMPILE_THREADS = $(makeopts_jobs) + _EOF_ + + local repostring=' + repositories { + ivy { + url file("${projectDir}/jars") + layout "pattern", { + artifact "[artifact]-[revision].[ext]" + artifact "[artifact].[ext]" + } + } + mavenLocal() + }' + + cat <<- _EOF_ > "${S}"/buildSrc/gentoo.gradle + ${repostring} + _EOF_ + + cat <<- _EOF_ > "${S}"/gentoo.gradle + ${repostring} + allprojects { + ${repostring} + } + _EOF_ + + echo "apply from: 'gentoo.gradle'" >> build.gradle || die + echo "apply from: 'gentoo.gradle'" >> buildSrc/build.gradle || die + sed -i 's/mavenCentral/mavenLocal/g' build.gradle || die + sed -i 's/mavenCentral/mavenLocal/g' buildSrc/build.gradle || die + einfo "Configured with the following settings:" + cat gradle.properties || die + +} + +src_compile() { + tc-export_build_env CC CXX PKG_CONFIG + rm -r tests buildSrc/src/test || die + egradle openExportLinux +} + +src_install() { + local dest="/usr/$(get_libdir)/openjdk-${SLOT}" + local ddest="${ED%/}/${dest#/}" + dodir "${dest}" + pushd build/export/sdk > /dev/null || die + cp -pPRv * "${ddest}" || die + popd > /dev/null || die +} |