From 217182f97a52672fb9c3a3fb56f39682755b0538 Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Tue, 13 Jan 2015 06:33:32 +0000 Subject: [PATCH] fix compilation error caused by underlinking This path was inspired by https://bugs.gentoo.org/show_bug.cgi?id=505788 --- app-emulation/uae/Manifest | 17 ++--------------- app-emulation/uae/files/uae-0.8.26-underlinking.patch | 19 +++++++++++++++++++ app-emulation/uae/uae-0.8.29-r2.ebuild | 7 +++++-- 3 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 app-emulation/uae/files/uae-0.8.26-underlinking.patch diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest index 925ba5a..e6ce022 100644 --- a/app-emulation/uae/Manifest +++ b/app-emulation/uae/Manifest @@ -1,22 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX sdlgfx.h 974 SHA256 dcbbcc57ffa9ee951963be49aa454ff6078b6e18d5bbe7b773b4bf8d37f5deea SHA512 56614df4b2640f01a32e714fe3578d0607472b2cd49131124eee998d9ea43d223817d44c25be942c47e47a5599249672a61b03d3c87d94a8c48c6b3304e2bc8e WHIRLPOOL 34672c30b62ba15dc164219973e6f774efb518ae6419874b980939228990256c730cfea652e3ae38d5e012d7af070becbfdd510b48ae0f56bf9e5d5891bfe4eb AUX uae-0.8.25-allow_spaces_in_zip_filenames.diff 651 SHA256 13f4377de98fba7758bff128830f4f16a97db83fd4d2e5c1161a71d8423bd80e SHA512 f69200029c1c3e2a38ebbf09fda254e98e8ed457b447801953519969be6d78e73a8054a66f44c8c495a1205aa54033914da43159f84985f9421844c7a00740a0 WHIRLPOOL 4ebc3e528feb3b63fc3af745afaf6bd02720cf2a4c125e0c2197f7abfd30f8c776843fed93fa67151aab8097e71a90383594095b440ef7ca15e6bc4be6f32781 AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 SHA256 ac020eacef32f92b82740022c0383fb5746c6a6d205a96c2564805063ad9035a SHA512 553150271c42ca76f414fd19e482230dedc7ea9c466d5bffb31ef5e729a92d558c020f91aae3a91570b1ef5cef5af5f6872bdaf009db17517651b5e106323270 WHIRLPOOL 62158ba7d9af4fa7952723a601eeb0937bddd1368422a6505e88ca45e6beeab0ec75b2d7a69396134f2ba93ba878db9bc4ff7bf13f35922f14b8468e3234781a AUX uae-0.8.26-uae_reset_args.diff 3216 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 SHA512 04d404efa4d63fa89eb537e9c0f6b964e5dad031305abdf6ba08339d1aa5d211b51c37599202e52210b5805ebb5c1109b5b04092e2484001b7f630b268e59a21 WHIRLPOOL ffd0d154fd750a332ab1d059167119758847d3e8121eed97cf9ff59491d48e43b29de8cfbd1287a8acd91ea106bd1ba067063b9ac504c8b64bf70d37a8bd9ca2 +AUX uae-0.8.26-underlinking.patch 499 SHA256 05c8a4d29d5cbc0c1fe4a2150697f37aa716374baa3edbb255c84188f2ce0405 SHA512 8a297f34d3550a66b4145ef913cd2ef4399ebcd43adff88b9d0b93a6eabb1ace8dedef53f515b6f413faef7b6e6491fd81f3b60a0e6efa67212b082d2671b74a WHIRLPOOL c43caacc7a4baf28ffd242368c9201979c77135ff89d60fa35d83a9d1c32fe246b618f4e4f86f4294fe956e9b47dab9f961749fe1e20ccf7cefbe12d4ceb0e60 DIST uae-0.8.29.tar.bz2 925508 SHA256 2463524b19b36ab44de158c5f24871878eda05230ea391343849959643634317 SHA512 2b8f362f9ba7171cf9ce71938b0a4f22c5d90d518524d50023792f4dc9f75a1b1e17e55966926e1138801b4d9ffbc2f1ae4c4b5dfa42e98a8e6ec688adb84064 WHIRLPOOL 0fcf540415b4434f59f8df97de6c49db03f088d219267eb19647afad483ffc99c48cba7cbf704e86e3d2f25ab184f19119d5a1c578df6dcbe53f7e6c25d1648c -EBUILD uae-0.8.29-r2.ebuild 1822 SHA256 150a14de94eb4ba3cedc6392fd98393fc5b387e7b61d866a953f1915522311ff SHA512 2c7b0ea00d29d9791f9eb6fbafe4884bd33d62534ef25cfd44aa6d0f18c65db0592444f97da13218a6318893e96a9000826ca321102fba52c7b818fdb637af84 WHIRLPOOL 459c55c7218ac9cebef529d734ada6fd63d829e794c5084144d8f5f6fef53f721b73177694482bfe2fbdbadfc4aabd7ba0c752db42d0f8a2e492ce84ff78bca8 +EBUILD uae-0.8.29-r2.ebuild 1901 SHA256 fe4889048425c37e7576edc426f30954643645c26dd1af2eebd867eac8070f9a SHA512 aa33620b1adec742500769985191c48f6051f1a0ca73d22a1bd82bceaa0de0c9a429a38931e343404b7c1aa6dc6450af3a0333e190e8f9f9b430f9cd262233f5 WHIRLPOOL 17ae6233958a244445b588f718bcc88dff8be377fc722baa96780c8df3352e25017995bf0cb5fba13ca991745bb9ed078f9ae40ffd53e790f187230e490768f7 MISC ChangeLog 7615 SHA256 7e3ad8b25c1504c4a4bd4a6dee59aa82c89ef9510758c4d77116bdbb037642d6 SHA512 3b1387540a206146992b6af94715b6f9ef7bec44c54dd93bc3e9de5c6df6339243cfa7d35a1c04674897eb61afbd7dca84324cbac6e678553db33017426b790b WHIRLPOOL 8c4570c70ced1d80351d949ca94c3ea0ff0f0207ee07c17ee0962bf31183aac2d4eff7c8fab2e8800ee1ab4fa6f8fc5c6a9e76e646b4229650cd068f4553bc6f MISC metadata.xml 720 SHA256 c6f3b414102c0aac64c1ae570a1b7dc407a55ce4161ed3d66fe983a32c46b9b8 SHA512 554421e6cc288e5bcb8ad1a74dc7d45fe5077f3b8eb01bdfe71c02fe95c1d4e6187414faa86fe933559ee4e8c8a259579fd3c4d4cd3da1fe69f9a5676c43806d WHIRLPOOL 4734f87221b5eb07820b411f79f9dcdbd8992d2e574fb44f684779a8cd9e7aa72e244c116509442940521937a5ef652bba00326a19a58d72e25916ac7abb661f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAEBCAAGBQJTO/qtAAoJEJWyH81tNOV9vC0IALClGPfdMQvkmUKSidg7y8De -++O7rCTsyqkbaDjh0RDUGxmHbZ5HClGMcz7h2NHsIvqVMsEGrDd6cMW/JPVJacSa -p7BekJDpqDJMZ+NQecrFrzrqx5YDBkK4PawUnvhzSwxYmR0IhCjCfUxiWnZH1+x5 -sXnF34cHl7g015OBZaoUe7/FYjnXLteLgld8KXnTgwiQKYhKmiRRtk3UMsVBNwlx -xZYTEzErJ5Gp3DItx4zPRxpQQk1HEtxTehXtjn2Zz4aEl9bp0w6KAfCHnsBHQmoq -vkHuHjs0ejEF/EnZbiZyFCui18e9ikCsd93eAE2nvfKFadjQN0GN8n5CH8xRHC8= -=jIT0 ------END PGP SIGNATURE----- diff --git a/app-emulation/uae/files/uae-0.8.26-underlinking.patch b/app-emulation/uae/files/uae-0.8.26-underlinking.patch new file mode 100644 index 0000000..16bf574 --- /dev/null +++ b/app-emulation/uae/files/uae-0.8.26-underlinking.patch @@ -0,0 +1,19 @@ +--- configure.in ++++ configure.in +@@ -81,6 +81,16 @@ + AC_CHECK_LIB(audio, alOpenPort, HAVE_SGIAUDIO_LIB=yes, HAVE_SGIAUDIO_LIB=no) + AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA=yes, HAVE_ALSA=no) + ++dnl Check for libm for cos() ++AC_SEARCH_LIBS([cos], [m], [], [ ++ AC_MSG_ERROR([unable to find the cos() function]) ++]) ++ ++dnl Check for libm for floor() ++AC_SEARCH_LIBS([floor], [m], [], [ ++ AC_MSG_ERROR([unable to find the floor() function]) ++]) ++ + AC_PATH_XTRA + AC_CONFIG_HEADER(src/sysconfig.h) + diff --git a/app-emulation/uae/uae-0.8.29-r2.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild index 8f0c3b0..2dbf462 100644 --- a/app-emulation/uae/uae-0.8.29-r2.ebuild +++ b/app-emulation/uae/uae-0.8.29-r2.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils +inherit eutils autotools DESCRIPTION="The Umiquious Amiga Emulator" HOMEPAGE="http://www.amigaemulator.org/" @@ -31,8 +31,11 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff + epatch "${FILESDIR}"/${PN}-0.8.26-underlinking.patch cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die + + eautoreconf } src_configure() { @@ -62,7 +65,7 @@ src_install() { pkg_postinst() { elog - elog "Upstream recomends using SDL graphics (with an environment variable)" + elog "Upstream recommends using SDL graphics (with an environment variable)" elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support." echo } -- 2.2.1