diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
| commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
| tree | f82923fbca262493e83dd1382e561a2fae24cc46 /media-sound/yoshimi | |
| parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
| parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'media-sound/yoshimi')
| -rw-r--r-- | media-sound/yoshimi/Manifest | 1 | ||||
| -rw-r--r-- | media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch | 66 |
2 files changed, 0 insertions, 67 deletions
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest index c8853f20f252..8bb93109bceb 100644 --- a/media-sound/yoshimi/Manifest +++ b/media-sound/yoshimi/Manifest @@ -1,4 +1,3 @@ -AUX yoshimi-1.5.10.2-cxxflags.patch 2592 BLAKE2B 383784742913ad2a2d711a1999269438eea525da3ed54fdd24fbad46932e05e781b18b2cbad1bd1e5bbe3ef160762f865517bbcda9ea6f5c4df4eb413af8b278 SHA512 78c3e2a84f44e9220b2f3fcc1cbac1b243a4fd19036d32f0ded794c90f83e5797ff3cddcb57ae3612656be27954b1db69b92d4b2107d8c18ffbdbd984abb87bd DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce EBUILD yoshimi-1.7.0.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152 diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch deleted file mode 100644 index dc5544339b54..000000000000 --- a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch +++ /dev/null @@ -1,66 +0,0 @@ -Respect user CXXFLAGS setting. - ---- a/src/CMakeLists.txt 2019-05-06 15:09:19.010755505 +0200 -+++ b/src/CMakeLists.txt 2019-05-06 15:14:11.668510627 +0200 -@@ -307,28 +307,28 @@ - endif(READLINE_FOUND) - - # set platform specific compiler flags --if (BuildFor0ld_X86) -- set (OurCxxFlags ${BuildOptions_X86}) --else (BuildFor0ld_X86) -- if (BuildForAMD_X86_64) -- set (OurCxxFlags ${BuildOptions_X86_64AMD}) -- else (BuildForAMD_X86_64) -- if (BuildForCore2_X86_64) -- set (OurCxxFlags ${BuildOptions_X86_64Core2}) -- else (BuildForCore2_X86_64) -- if (BuildForNEON) -- set (OurCxxFlags ${BuildOptions_NEON}) -- else (BuildForNEON) -- if (BuildForThisCPU) -- set (OurCxxFlags ${BuildOptionsThisCPU}) -- else (BuildForThisCPU) -- set (OurCxxFlags ${BuildOptionsBasic}) -- endif (BuildForThisCPU) -- endif (BuildForNEON) -- endif (BuildForCore2_X86_64) -- endif (BuildForAMD_X86_64) --endif (BuildFor0ld_X86) --set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}") -+# if (BuildFor0ld_X86) -+# set (OurCxxFlags ${BuildOptions_X86}) -+# else (BuildFor0ld_X86) -+# if (BuildForAMD_X86_64) -+# set (OurCxxFlags ${BuildOptions_X86_64AMD}) -+# else (BuildForAMD_X86_64) -+# if (BuildForCore2_X86_64) -+# set (OurCxxFlags ${BuildOptions_X86_64Core2}) -+# else (BuildForCore2_X86_64) -+# if (BuildForNEON) -+# set (OurCxxFlags ${BuildOptions_NEON}) -+# else (BuildForNEON) -+# if (BuildForThisCPU) -+# set (OurCxxFlags ${BuildOptionsThisCPU}) -+# else (BuildForThisCPU) -+# set (OurCxxFlags ${BuildOptionsBasic}) -+# endif (BuildForThisCPU) -+# endif (BuildForNEON) -+# endif (BuildForCore2_X86_64) -+# endif (BuildForAMD_X86_64) -+# endif (BuildFor0ld_X86) -+# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}") - - if (BuildForDebug) - set (CMAKE_BUILD_TYPE "Debug") -@@ -330,8 +330,8 @@ - message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") - else (BuildForDebug) - set (CMAKE_BUILD_TYPE "Release") -- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) -- message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") -+ # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) -+ message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}") - endif (BuildForDebug) - - configure_file( |