diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
| commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
| tree | 9f1f0dee23e13658e52f49437befe78427148c51 /dev-games/simgear | |
| parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) | |
gentoo resync : 10.02.2020
Diffstat (limited to 'dev-games/simgear')
| -rw-r--r-- | dev-games/simgear/Manifest | 5 | ||||
| -rw-r--r-- | dev-games/simgear/files/simgear-2019.1.1-gdal3.patch | 12 | ||||
| -rw-r--r-- | dev-games/simgear/simgear-2019.1.1.ebuild | 8 | ||||
| -rw-r--r-- | dev-games/simgear/simgear-9999.ebuild | 8 |
4 files changed, 27 insertions, 6 deletions
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest index a0f7844e46e3..f783c3318626 100644 --- a/dev-games/simgear/Manifest +++ b/dev-games/simgear/Manifest @@ -1,4 +1,5 @@ +AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667 DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B 2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8 SHA512 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2 -EBUILD simgear-2019.1.1.ebuild 1507 BLAKE2B 6a94f26bf11de1a7d8160adf11e440f0339ee298d26d85b1beaacffb50d34c27074a60f548c71361e266459e078aef90b705287b78cf3f5bd17ef81d6d196709 SHA512 22e009d885f399c9d7ef8c7b5045704fe41beb167ab1b855209838db6221fc0ddb69a050dca67ccd1c3a18ffd5ff38a362413efa21b3dcf68815efa24adae82f -EBUILD simgear-9999.ebuild 1569 BLAKE2B 78dde565fdae2256180db5a43b0d0bccd4f6df31bf3662a1214967e814c8e2411df0408f0dff9060b294837ae2f741000fad0f1f59f4226d6441ecccfcf206e7 SHA512 dc1c40f9f239b4bb17360bca606d9093a0a780424559123ba5c19ffc58894584f6c3bed08da225f5db95872876ca66e44dad6d0f31dc0d9693cab70ce0ab5482 +EBUILD simgear-2019.1.1.ebuild 1547 BLAKE2B 0e9ff2e39a692dbdaf30958a52e0488eff8237742e6514993ac0fcd067df2d9bbac5d88a39b921df33a3efbb9c522d7428873ad07147d3e0092e5730982a54ad SHA512 d9071c9f6d3ff0f0fa2cf02a83006c8eb42bca041c5f0f8b14d309d47d11f6381ac8e484a2007cd8dafc1b77ce5edba397a6a8244035adbe6abaa378e0322218 +EBUILD simgear-9999.ebuild 1609 BLAKE2B 82961c4dae78e88dfedf40332e6604a21066b0989e0165b05e8bd8d5db495ab27ecbb0984dc55e3cb68d8a781e4b73a5bbb9e0fab6f2172fccbe28be5fe3e509 SHA512 da4467feaa241c6f39eb1bb507001fd1a66e094b001a00ebac51e60af84bdf1ec332d528ae80b5970d3d87e1169dcf53ffd4c13923ea84c8e0e0ba04ec7c05d5 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8 diff --git a/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch new file mode 100644 index 000000000000..6d48994224c8 --- /dev/null +++ b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a2f59f..5916c4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -308,6 +308,7 @@ endif(ENABLE_RTI) + if(ENABLE_GDAL) + find_package(GDAL 2.0.0 REQUIRED) + if (GDAL_FOUND) ++ add_compile_definitions(USE_DEPRECATED_SRS_WKT_WGS84) + include_directories(${GDAL_INCLUDE_DIR}) + endif(GDAL_FOUND) + endif(ENABLE_GDAL) diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild index e4f8accb9c67..be0ff6416267 100644 --- a/dev-games/simgear/simgear-2019.1.1.ebuild +++ b/dev-games/simgear/simgear-2019.1.1.ebuild @@ -33,6 +33,10 @@ RDEPEND="${COMMON_DEPEND} subversion? ( dev-vcs/subversion ) " +PATCHES=( + "${FILESDIR}/${PN}-2019.1.1-gdal3.patch" +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -49,7 +53,7 @@ src_configure() { -DENABLE_PKGUTIL=ON -DENABLE_RTI=OFF -DENABLE_SIMD=OFF # see CPU_FLAGS - -DENABLE_SIMD_CODE=OFF + -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) -DENABLE_SOUND=ON -DENABLE_TESTS=$(usex test) -DSIMGEAR_HEADLESS=OFF @@ -61,7 +65,7 @@ src_configure() { ) if use cpu_flags_x86_sse2; then - append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize + append-flags -msse2 -mfpmath=sse fi cmake-utils_src_configure diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild index 14feded1bd5a..d5d560554829 100644 --- a/dev-games/simgear/simgear-9999.ebuild +++ b/dev-games/simgear/simgear-9999.ebuild @@ -35,6 +35,10 @@ RDEPEND="${COMMON_DEPEND} subversion? ( dev-vcs/subversion ) " +PATCHES=( + "${FILESDIR}/${PN}-2019.1.1-gdal3.patch" +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -51,7 +55,7 @@ src_configure() { -DENABLE_PKGUTIL=ON -DENABLE_RTI=OFF -DENABLE_SIMD=OFF # see CPU_FLAGS - -DENABLE_SIMD_CODE=OFF + -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) -DENABLE_SOUND=ON -DENABLE_TESTS=$(usex test) -DSIMGEAR_HEADLESS=OFF @@ -63,7 +67,7 @@ src_configure() { ) if use cpu_flags_x86_sse2; then - append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize + append-flags -msse2 -mfpmath=sse fi cmake-utils_src_configure |