From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4542138335 for ; Wed, 26 Dec 2018 00:04:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61272E09E0; Wed, 26 Dec 2018 00:04:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1EE85E09E0 for ; Wed, 26 Dec 2018 00:04:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF7EF335C39 for ; Wed, 26 Dec 2018 00:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D59F4FB for ; Wed, 26 Dec 2018 00:04:06 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1545782610.a4f0694c7e378b3ff0c2241a1cfacc8a683b2921.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mixxx/Manifest media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch media-sound/mixxx/mixxx-2.2.0.ebuild X-VCS-Directories: media-sound/mixxx/files/ media-sound/mixxx/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a4f0694c7e378b3ff0c2241a1cfacc8a683b2921 X-VCS-Branch: master Date: Wed, 26 Dec 2018 00:04:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a96ee556-3d38-420f-b89f-5adc734cdff4 X-Archives-Hash: 3d6429a8b92c5d6c90d8e34e4f0710af commit: a4f0694c7e378b3ff0c2241a1cfacc8a683b2921 Author: Lars Wendler gentoo org> AuthorDate: Wed Dec 26 00:03:30 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Dec 26 00:03:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f0694c media-sound/mixxx: Bump to version 2.2.0 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> media-sound/mixxx/Manifest | 1 + .../mixxx/files/mixxx-2.2.0-lilv_include_fix.patch | 33 +++++ media-sound/mixxx/mixxx-2.2.0.ebuild | 133 +++++++++++++++++++++ 3 files changed, 167 insertions(+) diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 04685a35bc1..5850046889c 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,3 +1,4 @@ DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20 DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51 SHA512 082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8 DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4 SHA512 f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854 +DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134 diff --git a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch new file mode 100644 index 00000000000..4addc98b1e1 --- /dev/null +++ b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch @@ -0,0 +1,33 @@ +--- mixxx-release-2.2.0/src/effects/lv2/lv2backend.h ++++ mixxx-release-2.2.0/src/effects/lv2/lv2backend.h +@@ -5,7 +5,7 @@ + #include "effects/effectsbackend.h" + #include "effects/lv2/lv2manifest.h" + #include "preferences/usersettings.h" +-#include ++#include + + class LV2Backend : public EffectsBackend { + Q_OBJECT +--- mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h ++++ mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h +@@ -4,7 +4,7 @@ + #include "effects/effectprocessor.h" + #include "effects/effectmanifest.h" + #include "engine/effects/engineeffectparameter.h" +-#include ++#include + #include "effects/defs.h" + #include "engine/engine.h" + +--- mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h ++++ mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h +@@ -3,7 +3,7 @@ + + #include "effects/effectmanifest.h" + #include "effects/defs.h" +-#include ++#include + + class LV2Manifest { + public: diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild b/media-sound/mixxx/mixxx-2.2.0.ebuild new file mode 100644 index 00000000000..de84f4ec868 --- /dev/null +++ b/media-sound/mixxx/mixxx-2.2.0.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic scons-utils toolchain-funcs + +DESCRIPTION="Advanced Digital DJ tool based on Qt" +HOMEPAGE="https://www.mixxx.org/" +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" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="aac doc ffmpeg hid mp3 mp4 opus 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 + dev-libs/protobuf:0= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtscript:5[scripttools] + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/chromaprint + media-libs/flac + media-libs/libid3tag + media-libs/libogg + media-libs/libsndfile + >=media-libs/libsoundtouch-1.5 + media-libs/libvorbis + >=media-libs/portaudio-19_pre + media-libs/portmidi + media-libs/rubberband + media-libs/taglib + media-libs/vamp-plugin-sdk + sci-libs/fftw:3.0= + sys-power/upower + virtual/libusb:1 + virtual/opengl + x11-libs/libX11 + aac? ( + media-libs/faad2 + media-libs/libmp4v2:0 + ) + hid? ( dev-libs/hidapi ) + mp3? ( media-libs/libmad ) + mp4? ( media-libs/libmp4v2:= ) + opus? ( media-libs/opusfile ) + shout? ( media-libs/libshout ) + wavpack? ( media-sound/wavpack ) + ffmpeg? ( media-video/ffmpeg:0= ) +" +# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0 +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + dev-qt/qttest:5 + dev-qt/qtxmlpatterns:5 +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.0-docs.patch + "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch +) + +src_prepare() { + # use multilib compatible directory for plugins + sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die + + default +} + +src_configure() { + local myoptimize=0 + + # Required for >=qt-5.7.0 (bug #590690) + append-cxxflags -std=c++11 + + # 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 + + myesconsargs=( + 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 + 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)" + ) +} + +src_compile() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} +} + +src_install() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \ + install_root="${ED%/}"/usr install + + dodoc README Mixxx-Manual.pdf +}