diff options
Diffstat (limited to 'media-sound/mixxx')
-rw-r--r-- | media-sound/mixxx/Manifest | 5 | ||||
-rw-r--r-- | media-sound/mixxx/files/mixxx-9999-docs.patch | 20 | ||||
-rw-r--r-- | media-sound/mixxx/metadata.xml | 2 | ||||
-rw-r--r-- | media-sound/mixxx/mixxx-9999.ebuild | 101 |
4 files changed, 70 insertions, 58 deletions
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 1eac839a4ede..2e1c301c7b0c 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,7 +1,8 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8 +AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa EBUILD mixxx-2.2.4.ebuild 3178 BLAKE2B 1e3c0021ae0f7f22cdaa690d3995638d863b2289c8366b49fcb5d80876898d10474983ad359d84802441008c106387bfc5b1343260a0ed2f464e46bb4299ddd1 SHA512 709ea52ec18f6aeb35c4abbe19ef7df24a6ed6e95218090048ffd5a9ad29e3bfc9d6741db7cd69733adb72a1b53789bbefb767a15f3469141797071e14a1192e -EBUILD mixxx-9999.ebuild 3081 BLAKE2B bc18db6124d898a6517b822ec959832d3782b605c2bdfd11fc48c7c6aa4fc44c2a4103657b9deeedfd04a54179846ee969e66efa77ba2a1ace7ed6619d2052f2 SHA512 3bd11e7eae8a549583c1aed47da56a6cf80f002afcd2dd4cd39b09242d110ca665fc32298309c021636018b46bf276924285ab8342477388da2f09e917eba606 -MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f +EBUILD mixxx-9999.ebuild 2576 BLAKE2B f4a04d4500297dc2c2ff75d088127b1b09f3d1c9fd182a3e1695e6a3ae99b55e35ce4bc1dc73696cdab7006dc1c2ac617a582f2a10e7351d6500b9989941a329 SHA512 19b8bdae260828ff5b4203d5269cb60873765930d09e6c1ad9c6793d869ceabe415b492e2caf86cb71e91839cbf4fb232e2a4e02746503447c5ac4e6b8f6abb3 +MISC metadata.xml 849 BLAKE2B 7b6df4e7a68267848242fb26c50caf028960d3f3059ee74d0d0009be20b7385ca4fdfbc9a36b5cb5a7897e23085ddabddef6ea7a39a88874e3be8051753cfdb3 SHA512 e99a796d33b8a3b67993386565a61517b554b957548bcdef159a48571ce4cc5a1bcf2a4e4171c9a8d965418e2d469193f5682f1ce7068f50b958a3908a683fa6 diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-9999-docs.patch new file mode 100644 index 000000000000..d1de4e6e9443 --- /dev/null +++ b/media-sound/mixxx/files/mixxx-9999-docs.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0cc5b3a7ba..63f18bfda4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1142,15 +1142,6 @@ install( + "${MIXXX_INSTALL_LICENSEDIR}" + ) + +-# Documentation +-install( +- FILES +- "${CMAKE_CURRENT_SOURCE_DIR}/README" +- "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf" +- DESTINATION +- "${MIXXX_INSTALL_DOCDIR}" +-) +- + # Additional Linux-only files + if(UNIX AND NOT APPLE) + # .desktop file for KDE/GNOME menu diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml index da78302375e8..5e69aa297bf4 100644 --- a/media-sound/mixxx/metadata.xml +++ b/media-sound/mixxx/metadata.xml @@ -7,7 +7,9 @@ </maintainer> <use> <flag name="hid">Enable HID controller support</flag> + <flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag> <flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag> + <flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag> <flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag> </use> <upstream> diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index 8b6b845279eb..bbfbe57f1f07 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8}) - -inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs +inherit cmake xdg udev DESCRIPTION="Advanced Digital DJ tool based on Qt" HOMEPAGE="https://www.mixxx.org/" @@ -13,7 +11,6 @@ if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git" else - #SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz" SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-release-${PV}" KEYWORDS="~amd64 ~x86" @@ -21,10 +18,8 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack" +IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack" -# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this -# got fixed RDEPEND=" dev-db/sqlite dev-libs/glib:2 @@ -43,12 +38,13 @@ RDEPEND=" dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac + media-libs/libebur128 media-libs/libid3tag media-libs/libogg media-libs/libsndfile - >=media-libs/libsoundtouch-1.5 + media-libs/libsoundtouch media-libs/libvorbis - >=media-libs/portaudio-19_pre + media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib @@ -58,75 +54,68 @@ RDEPEND=" virtual/glu virtual/libusb:1 virtual/opengl + virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) + ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) - lv2? ( >=media-libs/lilv-0.24.2-r3 ) + keyfinder? ( media-libs/libkeyfinder ) + lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) - shout? ( media-libs/libshout ) + qtkeychain? ( dev-libs/qtkeychain ) + shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack ) - ffmpeg? ( media-video/ffmpeg:0= ) -" -# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0 -DEPEND="${RDEPEND} - virtual/pkgconfig + " + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig dev-qt/qttest:5 - dev-qt/qtxmlpatterns:5 - ${PYTHON_DEPS} -" + dev-qt/qtxmlpatterns:5" -src_prepare() { - # use multilib compatible directory for plugins - sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die +PATCHES=( + "${FILESDIR}"/mixxx-9999-docs.patch + ) - default +src_prepare() { + cmake_src_prepare } src_configure() { - local myoptimize=0 - # Try to get cpu type based on CFLAGS. - # Bug #591968 - for i in $(get-flag mcpu) $(get-flag march) ; do - if [[ ${i} = native ]] ; then - myoptimize="native" - break - fi - done - - MYSCONS=( - prefix="${EPREFIX}/usr" - qtdir="${EPREFIX}/usr/$(get_libdir)/qt5" - faad="$(usex aac 1 0)" - ffmpeg="$(usex ffmpeg 1 0)" - hid="$(usex hid 1 0)" - hifieq=1 - lilv="$(usex lv2 1 0)" - m4a="$(usex mp4 1 0)" - mad="$(usex mp3 1 0)" - optimize="${myoptimize}" - opus="$(usex opus 1 0)" - qt5=1 - shoutcast="$(usex shout 1 0)" - vinylcontrol=1 - wv="$(usex wavpack 1 0)" + local mycmakeargs=( + -DFAAD="$(usex aac on off)" + -DFFMPEG="$(usex ffmpeg on off)" + -DHID="$(usex hid on off)" + -DLILV="$(usex lv2 on off)" + -DMAD="$(usex mp3 on off)" + -DOPTIMIZE="off" + -DCCACHE_SUPPORT="off" + -DOPUS="$(usex opus on off)" + -DBROADCAST="$(usex shout on off)" + -DVINYLCONTROL="on" + -DINSTALL_USER_UDEV_RULES=OFF + -DWAVPACK="$(usex wavpack on off)" + -DQTKEYCHAIN="$(usex qtkeychain on off)" + -DKEYFINDER="$(usex keyfinder on off)" ) + + cmake_src_configure } src_compile() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} + cmake_src_compile } src_install() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \ - install_root="${ED}"/usr install + cmake_src_install + udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules - dodoc README Mixxx-Manual.pdf + if use doc ; then + dodoc README Mixxx-Manual.pdf + fi } |