commit: e4c66ae969c5289f469717ebd84abcee1314d537 Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de> AuthorDate: Mon Apr 23 21:16:11 2018 +0000 Commit: gerion <gerion.entrup <AT> flump <DOT> de> CommitDate: Mon Apr 23 21:30:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=e4c66ae9
add mixx-9999 ebuild media-sound/mixxx/Manifest | 4 ++-- media-sound/mixxx/metadata.xml | 4 ++-- media-sound/mixxx/mixxx-9999.ebuild | 29 ++++++++++++++++++++++------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 690af65..c09179e 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,3 +1,3 @@ -EBUILD mixxx-9999.ebuild 3233 SHA256 4a0d9f7ded7c07a2e0dc6ec10831f2e5b5d9a41983d4a8b81dce9a958fc56d02 SHA512 865489676411fd3ebef0350ea2b23fba911c9840ac3f3495cd5d3568b27c2499303959f9b1f5daa6978f8bd8b037c124d429e2ede05422a41b05edf66e84ba39 WHIRLPOOL cbca6e8fad62661dfb4c66714f4fc46184f2078abc931d425149e0eed23ac0a3e3279f3040624325e56cf64c8b9a4c3796e10d07af2a93f6f7546ea68b541ee2 +EBUILD mixxx-9999.ebuild 3797 SHA256 18fd5243a40073a1d4e03d1e54ea23fd651dbd61f698f0b4f48b7e6b72d0f98a SHA512 1d75063e28546b2197d5d9b8f482f7928197a2ffefa5c42c8d091d4da81a46f0fcf9d44e5e24b14d4b26d36ece9efb04ad9fec63787308c6579970b318f83f2b WHIRLPOOL f979a1fb2fa97ea2b06066adcab2b8ac54063543726bc91ea475a0f61b3a009d48c1824354cc62d9450a387eeaa41ef04e9d14862450189407f652ac3ab07520 MISC ChangeLog 8257 SHA256 aadd55750770c6faed596e1935ad00f9af1ac5a17ec3592a8fae1b746c21b434 SHA512 f705341e0dec49311df72e4308e1a413af53197bd5846728bf8a78652542cf5251bf8ccadb54e56fba9e1faf09ea24728f975d2fa2ff023e8692355b240279db WHIRLPOOL 1ebb24fe84bda384708e6bf415ad7d8109be5b9f7e765446af81a4fb517d13e17344a43fddd922be8faa771db5c979b88c8a9055bee1e38013022d6be5899b7e -MISC metadata.xml 561 SHA256 fac51b210ada59f2b25d7b091e0fedbfe8a67b22a6028a2a4da0fac9a6de00a8 SHA512 d8bddfe2914053823ef2366f67472bc19160c053bc8942b96036ee49d581ea496c0bc4788028d3bcd5b546c43483c26deb2917724b525f9040c36a14ab222f2b WHIRLPOOL 7afc7b47f36f06a632fc70b652cf5cbcf88ff69268493136a516c79256c283f720dd25d6ff874dedca12773896488be54a143673d1af6f578df44f99f8f036f8 +MISC metadata.xml 549 SHA256 7021bc46cf6acdd5fa15dfbe03aee4afd97ff5b2c7f1b4165f673d659761c95b SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296 WHIRLPOOL fc44885e723d1fa6e1799b293d110ea5268d9da79136cf2358f6eff026d495c113af785ee7ee0384f4b0d4b44ef5a48741f73da9709f4dc846c1008e57a29615 diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml index 4300293..4627d1b 100644 --- a/media-sound/mixxx/metadata.xml +++ b/media-sound/mixxx/metadata.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="project"> @@ -8,9 +8,9 @@ <use> <flag name="hid">Enable HID controller support</flag> <flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag> - <flag name="vamp">Enable vamp analyzing plugins support</flag> </use> <upstream> <remote-id type="sourceforge">mixxx</remote-id> + <remote-id type="github">mixxxdj/mixxx</remote-id> </upstream> </pkgmetadata> diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index ca9b68f..14e9030 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit flag-o-matic scons-utils toolchain-funcs DESCRIPTION="Advanced Digital DJ tool based on Qt" -HOMEPAGE="http://www.mixxx.org/"; +HOMEPAGE="https://www.mixxx.org/"; if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://github.com/mixxxdj/${PN}.git" + EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"; inherit git-r3 KEYWORDS="" else @@ -19,13 +18,26 @@ else # Upstream patches SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch" SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" PATCHES=( "${FILESDIR}"/${PN}-2.0.0-docs.patch + "${DISTDIR}"/${P}-ffmpeg30.patch "${DISTDIR}"/${P}-ffmpeg31.patch + "${FILESDIR}"/${P}-chromaprint-1.4.patch #604528 + "${FILESDIR}"/${P}-gcc62.patch #595090 + + "${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776 + + # The following patches were taken from sunny-overlay (bug #608430) + "${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch + "${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch + "${FILESDIR}"/${P}-fix-missing-pointer-initialization.patch + "${FILESDIR}"/${P}-move-definition-of-time-formatseconds-into-dot-cpp-file.patch + "${FILESDIR}"/${P}-fix-formatting-of-time-durations2.patch + "${FILESDIR}"/${P}-rmx2-backport-controller-scripts.patch ) fi @@ -35,7 +47,8 @@ IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack" # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this # got fixed -RDEPEND="dev-db/sqlite +RDEPEND=" + dev-db/sqlite dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -72,9 +85,11 @@ RDEPEND="dev-db/sqlite mp4? ( media-libs/libmp4v2:= ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) - ffmpeg? ( media-video/ffmpeg:0= )" + ffmpeg? ( media-video/ffmpeg:0= ) +" # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0 -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5
