diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
| commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
| tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /media-sound/cantata | |
| parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) | |
gentoo resync : 20.02.2019
Diffstat (limited to 'media-sound/cantata')
| -rw-r--r-- | media-sound/cantata/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/cantata/cantata-2.3.3-r1.ebuild (renamed from media-sound/cantata/cantata-2.3.3.ebuild) | 7 | ||||
| -rw-r--r-- | media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch | 29 |
3 files changed, 36 insertions, 3 deletions
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index 93be5f7bd9e9..3c8ea8fe50fb 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1,7 +1,8 @@ AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbbece6219feede3e35f9304de783787a75e43f6a1ecabc2d9bdd773c1c5db3e6d85dc206ed5e0d8425c23a37b52d0213 SHA512 e6b8d714ca6a37fd096ad77fb187e9552058dae98c73ebed9f30e04dd03f8467a27ce0cf1afa9a868e86cb5c8aad05599bafb6b56929de9753251e2bb22c6b78 +AUX cantata-2.3.3-solidlite-static.patch 994 BLAKE2B 66b4a6a0325f0f7cb4f3886bca68c88e45aee4eb08947f422f07d7e43b585d6d3661f92152dcdb2c0fb243978fe3fd203bf14d88cfd7b472031e87f8d83430d4 SHA512 395b9d8968c2be12561ac595c99cd821296722598d33916328823137538d174f9dd2953146eee24263cc8f0485e3e1627eab678890ea6b5c6141472e4ae9aaeb DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6 EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0 -EBUILD cantata-2.3.3.ebuild 3077 BLAKE2B 93a2129cad70551854e3886c18801d9dfd7226a48f90fb6b59d39e7a694c798eb21aed6be001a7a55dae60c1644d265862fc483035bc3c1dc8933edcd9ce1ae2 SHA512 c969cfab10ce72f4b75b531c81544bd6f511d07fc22339db43d27f92e5fa3ec69d112aa852bec99a5e58d063317820aa898167d324d34570d70bbe3a5a758797 +EBUILD cantata-2.3.3-r1.ebuild 3133 BLAKE2B 07da67ff326f1309b0fcd7f42aa02c70a102b92c48b2aa442f8d5bfb6b1b066f80b6d67a3efb8f6491d135493bc403c385f4732b67bcc656d22b49067c1cfc48 SHA512 6b880a9b9533fc98e20ce7d222288f09141cb50e2b29e1de7e8130edaeaed80df47c3f6d14405d19d9827ae2d8df1a7703a5c489d06ce9f0aaef6621bebe865d MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97 diff --git a/media-sound/cantata/cantata-2.3.3.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild index db0b51d4e8d8..ccd0d2f5b44d 100644 --- a/media-sound/cantata/cantata-2.3.3.ebuild +++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf" REQUIRED_USE=" ?? ( cdda cdio ) @@ -67,7 +67,10 @@ DEPEND="${COMMON_DEPEND} # cantata has no tests RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-headers.patch" + "${FILESDIR}/${P}-solidlite-static.patch" # bug 678228 +) src_prepare() { remove_locale() { diff --git a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch new file mode 100644 index 000000000000..891917eebcb1 --- /dev/null +++ b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch @@ -0,0 +1,29 @@ +From aa35362aa2835e9e2903f5f785f10402a6abd3a1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 17 Feb 2019 16:58:48 +0100 +Subject: [PATCH] Fix solid-lite static linking + +If BUILD_SHARED_LIBS is part of standard system cmake args: + + cantata: error while loading shared libraries: libsolidlite.so: + cannot open shared object file: No such file or directory +--- + 3rdparty/solid-lite/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/3rdparty/solid-lite/CMakeLists.txt b/3rdparty/solid-lite/CMakeLists.txt +index 4ae51aab..86e37189 100644 +--- a/3rdparty/solid-lite/CMakeLists.txt ++++ b/3rdparty/solid-lite/CMakeLists.txt +@@ -202,7 +202,7 @@ if(APPLE) + set(solidlite_OPTIONAL_LIBS ${IOKIT_LIBRARY}) + endif() + +-add_library(solidlite ${solidlite_LIB_SRCS}) ++add_library(solidlite STATIC ${solidlite_LIB_SRCS}) + + if ( UDEV_FOUND ) + set(solidlite_OPTIONAL_LIBS ${solidlite_OPTIONAL_LIBS} ${UDEV_LIBS}) +-- +2.20.1 + |