diff options
Diffstat (limited to 'media-sound/synaesthesia')
| -rw-r--r-- | media-sound/synaesthesia/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch | 14 | ||||
| -rw-r--r-- | media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch | 11 | ||||
| -rw-r--r-- | media-sound/synaesthesia/synaesthesia-2.4-r1.ebuild (renamed from media-sound/synaesthesia/synaesthesia-2.4.ebuild) | 17 |
4 files changed, 36 insertions, 10 deletions
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest index 35a0e0327df4..6c61b5e35335 100644 --- a/media-sound/synaesthesia/Manifest +++ b/media-sound/synaesthesia/Manifest @@ -1,3 +1,5 @@ +AUX synaesthesia-2.4-inline-keyword.patch 558 BLAKE2B aaf978da81fa7edbffbf479c16fa51db7a765a3889356d724dde2d1a2f342b853077d020429b983c9fda75b19f4d7833015b7a5e645cc50d0e389d6aad58ebec SHA512 468e9e94428adc8a639f647be8ebdee9d5c4b0a91489666a1afcf0e19d9eb26825d36ed9968502cf9926e19124d7d1af0d3f27aa375967d4255976b9932bb4d6 +AUX synaesthesia-2.4-respect-flags.patch 187 BLAKE2B 96739009fca0649c417b82c281c90f91aac4674e8f432f8be54b5d75a01586f86f84b8f05cfe8839c3ffc6b96e25446d99c492e8b6fe2fc686e9abd7edfe6db7 SHA512 c1a8fc2ef1c5f0bab7ed0cadb183082aff00a9484b25ded5c095653634df9bd69252ecbb3c6ea37ae77edf5423d04a4a60336db9669c44388af17f39b0eee3cc DIST synaesthesia-2.4.tar.gz 259531 BLAKE2B 2ecf15a58793de77addb2dc2ab6d7640902c4a34838cff158d7bf9ce0ea5ee171cc205d2c8d9ee3a07d5434fd8e0e48f0cf1bf8c9d5b53de9cb9b70799cfc9c7 SHA512 e48f210f055486aa0a7c9a03f6aa7ff6a3292a2b598bfd8536dd592c3934b7672ed0b9b7dfc20427b5ea2b4cd1dcd6e104bf2c41f80ec38ab0b4b0a9497ff905 -EBUILD synaesthesia-2.4.ebuild 718 BLAKE2B d36669fcef5323373bd1d0f04c43f982c382aba69d6b5471cfc0c0e0124bd9708617c7a5248266ecc2dcbfbcf6b10b5c1b5ef404f36bb417b9efd40fddf12131 SHA512 e854d3d82dca84716746fe7bbff4ca49052966dce66333ebb51d894b43fff53d6c2ba3c1d09e4f4cb14d5b8db6c01c4fd50b045f2092522dfbcbf66646a15c12 +EBUILD synaesthesia-2.4-r1.ebuild 608 BLAKE2B 5af19d266c0e1a92629970742e222b158cbb239c29aab632557391c4a3b6968460fc81e11077dc2adbea4d03908379ce5164a79a4b7bb5e0d174a4212510ef64 SHA512 e79d716f04dd789ecd88f1dd5703dbeeb99581a7aa99c8bbf0e625a4bb2838bae9178e0371c8d616e00b80b8fb9d66d0cec89f34f0fb378ac5388c9ac6e586d6 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch new file mode 100644 index 000000000000..ef93f24029bb --- /dev/null +++ b/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch @@ -0,0 +1,14 @@ +--- a/syna.h ++++ b/syna.h +@@ -73,9 +73,9 @@ + #endif + + void error(char *str,bool syscall=false); +-void inline attempt(int x,char *y,bool syscall=false) { if (x == -1) error(y,syscall); } ++inline void attempt(int x,char *y,bool syscall=false) { if (x == -1) error(y,syscall); } + void warning(char *str,bool syscall=false); +-void inline attemptNoDie(int x,char *y,bool syscall=false) { if (x == -1) warning(y,syscall); } ++inline void attemptNoDie(int x,char *y,bool syscall=false) { if (x == -1) warning(y,syscall); } + + /* *wrap */ + struct BaseScreen { diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch new file mode 100644 index 000000000000..7a9523ee8b9a --- /dev/null +++ b/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -1664,8 +1664,6 @@ + ac_config_commands="$ac_config_commands default-1" + + +-CXXFLAGS="-O4" +-CFLAGS="-O4" + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4-r1.ebuild index e431ff390070..57f8faec27b7 100644 --- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild +++ b/media-sound/synaesthesia/synaesthesia-2.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="a nice graphical accompaniment to music" HOMEPAGE="http://www.logarithmic.net/pfh/synaesthesia" @@ -12,16 +12,15 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="sdl svga" -RDEPEND="x11-libs/libXext +RDEPEND=" + x11-libs/libXext x11-libs/libSM sdl? ( >=media-libs/libsdl-1.2 ) svga? ( >=media-libs/svgalib-1.4.3 )" DEPEND="${RDEPEND} x11-base/xorg-proto" -src_prepare() { - default - sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \ - -e '/CXXFLAGS=/s:-O4:${CXXFLAGS}:' -i configure || die "sed failed" - sed -e 's:void inline:inline void:' -i syna.h || die "sed failed" -} +PATCHES=( + "${FILESDIR}"/${P}-respect-flags.patch + "${FILESDIR}"/${P}-inline-keyword.patch +) |