[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-10-25 Thread Miroslav Šulc
commit: ae737497e762de98e2958da9df98d968ef01f804
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 25 07:45:18 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 25 07:45:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae737497

media-sound/mixxx: dropped obsolete 2.3.5-r1

Bug: https://bugs.gentoo.org/916246
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest  |   1 -
 media-sound/mixxx/mixxx-2.3.5-r1.ebuild | 161 
 2 files changed, 162 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 6546404d6eb6..4ed0e4c162a6 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
-DIST mixxx-2.3.5.tar.gz 41226268 BLAKE2B 
311dc36c5544e34651b4eb824fac2ab70827382295ba1912d53ec9706fc976a89d5417c969cb41e23c22a456953046e472fcbdbe78316949e02e6db7e15704b4
 SHA512 
d81208e8fe91e1843bac7ab512dc248457266b935bf8720694f2bedf96389ba35789d68ea77fcecf0a02682fb75de2752612b2c44a49b8eba52323cab2b82e51
 DIST mixxx-2.3.6.tar.gz 41285084 BLAKE2B 
35bedb5f41a56577bc59411ca979e3e780c1da2420bc0a7ad98d998c89f8c272202ba42e8b8089904ca8e1a1b6ac5155d08d556538245ce3242b4ea5a670e6d2
 SHA512 
a92c2c92dc7619ac135d940f23ffdc101c528eca6322517805afb9eb48a84c6339cefb88b96bdac6ffb23967c2f93f621daf3e98bfecbf7f3fe7626ddcec4398
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068

diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
deleted file mode 100644
index 35f24b5dfacb..
--- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg udev
-
-MY_PV=$(ver_cut 1-2)
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://mixxx.org/;
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   if [[ ${PV} == ?.?. ]] ; then
-   EGIT_BRANCH=${PV%.}
-   fi
-   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
-else
-   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   #S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 ~arm64 x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
-
-RDEPEND="
-   dev-db/sqlite
-   dev-libs/glib:2
-   dev-libs/protobuf:=
-   dev-qt/qtcore:5
-   dev-qt/qtdbus: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/qtx11extras:5
-   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
-   media-libs/libvorbis
-   media-libs/portaudio[alsa]
-   media-libs/portmidi
-   media-libs/rubberband
-   media-libs/taglib
-   media-libs/vamp-plugin-sdk
-   media-sound/lame
-   sci-libs/fftw:3.0=
-   sys-power/upower
-   virtual/glu
-   virtual/libusb:1
-   virtual/opengl
-   virtual/udev
-   x11-libs/libX11
-   aac? (
-   media-libs/faad2
-   media-libs/libmp4v2
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   hid? ( dev-libs/hidapi )
-   keyfinder? ( media-libs/libkeyfinder )
-   lv2? ( media-libs/lilv )
-   modplug? ( media-libs/libmodplug )
-   mp3? ( media-libs/libmad )
-   mp4? ( media-libs/libmp4v2:= )
-   opus? ( media-libs/opusfile )
-   qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
-   wavpack? ( media-sound/wavpack )
-"
-   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
-   # available in ::gentoo
-   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
-   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
-
-DEPEND="${RDEPEND}
-   dev-qt/qtconcurrent:5
-"
-BDEPEND="
-   dev-qt/qttest:5
-   dev-qt/qtxmlpatterns:5
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.3.0-docs.patch
-   "${FILESDIR}"/${PN}-2.3.0-cmake.patch
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-10-25 Thread Arthur Zamarin
commit: faa99c2e64a16d5acd8ccc2c985841f5a0b856bf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct 25 06:25:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct 25 06:25:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa99c2e

media-sound/mixxx: Stabilize 2.3.6 x86, #916246

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/mixxx/mixxx-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.6.ebuild 
b/media-sound/mixxx/mixxx-2.3.6.ebuild
index 29c69eb8ffa3..35f24b5dfacb 100644
--- a/media-sound/mixxx/mixxx-2.3.6.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-10-25 Thread Arthur Zamarin
commit: 8aeb8734a76d5cbec3e61237c1c4b289d4ae4de3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct 25 06:24:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct 25 06:24:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aeb8734

media-sound/mixxx: Stabilize 2.3.6 amd64, #916246

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/mixxx/mixxx-2.3.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.6.ebuild 
b/media-sound/mixxx/mixxx-2.3.6.ebuild
index 45b4429dbb1e..29c69eb8ffa3 100644
--- a/media-sound/mixxx/mixxx-2.3.6.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-08-16 Thread Miroslav Šulc
commit: 537957d2853f4f6d78156f87a10e4f5ce91cd3b6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Aug 16 06:39:51 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug 16 13:42:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537957d2

media-sound/mixxx: bump to 2.3.6

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.3.6.ebuild | 161 +++
 2 files changed, 162 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0f8d04a88288..6546404d6eb6 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
 DIST mixxx-2.3.5.tar.gz 41226268 BLAKE2B 
311dc36c5544e34651b4eb824fac2ab70827382295ba1912d53ec9706fc976a89d5417c969cb41e23c22a456953046e472fcbdbe78316949e02e6db7e15704b4
 SHA512 
d81208e8fe91e1843bac7ab512dc248457266b935bf8720694f2bedf96389ba35789d68ea77fcecf0a02682fb75de2752612b2c44a49b8eba52323cab2b82e51
+DIST mixxx-2.3.6.tar.gz 41285084 BLAKE2B 
35bedb5f41a56577bc59411ca979e3e780c1da2420bc0a7ad98d998c89f8c272202ba42e8b8089904ca8e1a1b6ac5155d08d556538245ce3242b4ea5a670e6d2
 SHA512 
a92c2c92dc7619ac135d940f23ffdc101c528eca6322517805afb9eb48a84c6339cefb88b96bdac6ffb23967c2f93f621daf3e98bfecbf7f3fe7626ddcec4398
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B 
bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86
 SHA512 
fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc

diff --git a/media-sound/mixxx/mixxx-2.3.6.ebuild 
b/media-sound/mixxx/mixxx-2.3.6.ebuild
new file mode 100644
index ..45b4429dbb1e
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg udev
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://mixxx.org/;
+if [[ ${PV} == * ]] ; then
+   inherit git-r3
+   if [[ ${PV} == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+   fi
+   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
+else
+   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   #S="${WORKDIR}/${PN}-release-${PV}"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
+
+RDEPEND="
+   dev-db/sqlite
+   dev-libs/glib:2
+   dev-libs/protobuf:=
+   dev-qt/qtcore:5
+   dev-qt/qtdbus: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/qtx11extras:5
+   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
+   media-libs/libvorbis
+   media-libs/portaudio[alsa]
+   media-libs/portmidi
+   media-libs/rubberband
+   media-libs/taglib
+   media-libs/vamp-plugin-sdk
+   media-sound/lame
+   sci-libs/fftw:3.0=
+   sys-power/upower
+   virtual/glu
+   virtual/libusb:1
+   virtual/opengl
+   virtual/udev
+   x11-libs/libX11
+   aac? (
+   media-libs/faad2
+   media-libs/libmp4v2
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   hid? ( dev-libs/hidapi )
+   keyfinder? ( media-libs/libkeyfinder )
+   lv2? ( media-libs/lilv )
+   modplug? ( media-libs/libmodplug )
+   mp3? ( media-libs/libmad )
+   mp4? ( media-libs/libmp4v2:= )
+   opus? ( media-libs/opusfile )
+   qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
+   wavpack? ( media-sound/wavpack )
+"
+   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
+   # available in ::gentoo
+   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
+   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-07-09 Thread Miroslav Šulc
commit: ef018e97725c658e636bae1ff3ccb7aca97f3b39
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 10 05:39:41 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 10 05:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef018e97

media-sound/mixxx: dropped obsolete 2.3.3-r1

Bug: https://bugs.gentoo.org/907433
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest  |   1 -
 media-sound/mixxx/mixxx-2.3.3-r1.ebuild | 168 
 2 files changed, 169 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 9a7dff6f262e..0f8d04a88288 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
-DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 
1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80
 SHA512 
6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 DIST mixxx-2.3.5.tar.gz 41226268 BLAKE2B 
311dc36c5544e34651b4eb824fac2ab70827382295ba1912d53ec9706fc976a89d5417c969cb41e23c22a456953046e472fcbdbe78316949e02e6db7e15704b4
 SHA512 
d81208e8fe91e1843bac7ab512dc248457266b935bf8720694f2bedf96389ba35789d68ea77fcecf0a02682fb75de2752612b2c44a49b8eba52323cab2b82e51
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068

diff --git a/media-sound/mixxx/mixxx-2.3.3-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.3-r1.ebuild
deleted file mode 100644
index f5cbf9720882..
--- a/media-sound/mixxx/mixxx-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg udev
-
-MY_PV=$(ver_cut 1-2)
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   if [[ "${PV}" == ?.?. ]] ; then
-   EGIT_BRANCH=${PV%.}
-   fi
-   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
-else
-   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   #S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
-
-RDEPEND="
-   dev-db/sqlite
-   dev-libs/glib:2
-   dev-libs/protobuf:=
-   dev-qt/qtcore:5
-   dev-qt/qtdbus: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/qtx11extras:5
-   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
-   media-libs/libvorbis
-   media-libs/portaudio[alsa]
-   media-libs/portmidi
-   media-libs/rubberband
-   media-libs/taglib
-   media-libs/vamp-plugin-sdk
-   media-sound/lame
-   sci-libs/fftw:3.0=
-   sys-power/upower
-   virtual/glu
-   virtual/libusb:1
-   virtual/opengl
-   virtual/udev
-   x11-libs/libX11
-   aac? (
-   media-libs/faad2
-   media-libs/libmp4v2
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   hid? ( dev-libs/hidapi )
-   keyfinder? ( media-libs/libkeyfinder )
-   lv2? ( media-libs/lilv )
-   modplug? ( media-libs/libmodplug )
-   mp3? ( media-libs/libmad )
-   mp4? ( media-libs/libmp4v2:= )
-   opus? ( media-libs/opusfile )
-   qtkeychain? ( dev-libs/qtkeychain )
-   wavpack? ( media-sound/wavpack )
-   "
-   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
-   # available in ::gentoo
-   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
-   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
-
-DEPEND="${RDEPEND}
-   dev-qt/qtconcurrent:5
-"
-BDEPEND="virtual/pkgconfig
-   dev-qt/qttest:5
-   dev-qt/qtxmlpatterns:5"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.3.0-docs.patch
-   "${FILESDIR}"/${PN}-2.3.0-cmake.patch
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-07-09 Thread Arthur Zamarin
commit: 84a3e09f12118e2a7b260bce4ff9447d65b03797
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jul  9 18:48:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jul  9 18:48:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a3e09f

media-sound/mixxx: Stabilize 2.3.5-r1 x86, #907433

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/mixxx/mixxx-2.3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index 29c69eb8ffa3..35f24b5dfacb 100644
--- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-06-02 Thread Sam James
commit: e2d7be48cf01f5b8e6ec682c7a6c5dd72bcd402b
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 02:22:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 02:22:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d7be48

media-sound/mixxx: Keyword 2.3.5-r1 arm64, #907279

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index fba6b6470a4e..29c69eb8ffa3 100644
--- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-06-02 Thread Sam James
commit: 93aa59d50775a771e9b8575a09f96c41d7566f7c
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  2 23:18:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  2 23:18:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93aa59d5

media-sound/mixxx: optimise SRC_URI generation

Thanks to radhermit's new pkgcraft tooling.

Before:
```
media-sound/mixxx-::/home/sam/g/: 11.417694ms
media-sound/mixxx-2.3.5-r1::/home/sam/g/: 27.881683ms
media-sound/mixxx-2.3.3-r1::/home/sam/g/: 29.44105ms
media-sound/mixxx-2.3.::/home/sam/g/: 30.059357ms
```

After:
```
media-sound/mixxx-2.3.5-r1::/home/sam/g/: 9.490994ms
media-sound/mixxx-2.3.3-r1::/home/sam/g/: 9.668916ms
media-sound/mixxx-2.3.::/home/sam/g/: 11.079521ms
media-sound/mixxx-::/home/sam/g/: 11.424654ms
```

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.3.3-r1.ebuild | 11 ++-
 media-sound/mixxx/mixxx-2.3.5-r1.ebuild |  9 +
 media-sound/mixxx/mixxx-2.3..ebuild |  9 +
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.3-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.3-r1.ebuild
index dd7a1e9e57b2..f5cbf9720882 100644
--- a/media-sound/mixxx/mixxx-2.3.3-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.3-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake xdg udev
 
+MY_PV=$(ver_cut 1-2)
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
 if [[ "${PV}" == * ]] ; then
@@ -97,12 +98,12 @@ PLOCALES="
 
 mixxx_set_globals() {
local lang
-   local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 
1-2)"
+   local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV};
for lang in ${PLOCALES} ; do
-   SRC_URI+=" l10n_${lang}? ( 
${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
+   SRC_URI+=" l10n_${lang}? ( 
${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )"
IUSE+=" l10n_${lang/ en/ +en}"
done
-   SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
+   SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf"
 }
 mixxx_set_globals
 
@@ -151,7 +152,7 @@ src_install() {
local locale
for locale in ${PLOCALES} ; do
if use l10n_${locale} ; then
-   dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
+   dodoc 
"${DISTDIR}"/${PN}-manual-${MY_PV}-${locale/ja/ja-JP}.pdf
fi
done
 }

diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index 4481a0c531b5..fba6b6470a4e 100644
--- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 inherit cmake xdg udev
 
+MY_PV=$(ver_cut 1-2)
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://mixxx.org/;
 if [[ ${PV} == * ]] ; then
@@ -99,12 +100,12 @@ PLOCALES="
 
 mixxx_set_globals() {
local lang
-   local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 
1-2)"
+   local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV};
for lang in ${PLOCALES} ; do
-   SRC_URI+=" l10n_${lang}? ( 
${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
+   SRC_URI+=" l10n_${lang}? ( 
${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )"
IUSE+=" l10n_${lang/ en/ +en}"
done
-   SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
+   SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf"
 }
 mixxx_set_globals
 
@@ -144,7 +145,7 @@ src_install() {
local locale
for locale in ${PLOCALES} ; do
if use l10n_${locale} ; then
-   dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
+   dodoc 
"${DISTDIR}"/${PN}-manual-${MY_PV}-${locale/ja/ja-JP}.pdf
fi
done
 }

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 8e68e926a377..55d859df3021 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 inherit cmake xdg udev
 
+MY_PV=$(ver_cut 1-2)
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://mixxx.org/;
 if [[ ${PV} == * ]] ; then
@@ -97,12 +98,12 @@ PLOCALES="
 
 mixxx_set_globals() {
local lang
-   local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 
1-2)"
+   local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV};
for lang in ${PLOCALES} ; do
-   SRC_URI+=" l10n_${lang}? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-05-31 Thread Arthur Zamarin
commit: e3ad06e52640e988ad27e53618acad6361ccc3c0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May 31 12:41:48 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May 31 12:41:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ad06e5

media-sound/mixxx: Stabilize 2.3.5-r1 amd64, #907433

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/mixxx/mixxx-2.3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index c95ad499da23..4481a0c531b5 100644
--- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-05-30 Thread Andreas Sturmlechner
commit: 459b01d0804b0cac069f64ef3b060a1ec2f49c0b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 30 19:14:34 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 30 19:32:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459b01d0

media-sound/mixxx: Add dev-libs/qtkeychain[qt5(+)] USEdep, slot op

- update HOMEPAGE
- minor style consistency improvements
- sync live ebuilds to some extent

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{mixxx-2.3.5.ebuild => mixxx-2.3.5-r1.ebuild}  | 27 ++
 media-sound/mixxx/mixxx-2.3..ebuild| 35 --
 media-sound/mixxx/mixxx-.ebuild| 42 +-
 3 files changed, 41 insertions(+), 63 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.5.ebuild 
b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
similarity index 92%
rename from media-sound/mixxx/mixxx-2.3.5.ebuild
rename to media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index 69c17499f146..c95ad499da23 100644
--- a/media-sound/mixxx/mixxx-2.3.5.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" == * ]] ; then
+HOMEPAGE="https://mixxx.org/;
+if [[ ${PV} == * ]] ; then
inherit git-r3
-   if [[ "${PV}" == ?.?. ]] ; then
+   if [[ ${PV} == ?.?. ]] ; then
EGIT_BRANCH=${PV%.}
fi
EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
@@ -70,9 +70,9 @@ RDEPEND="
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
-   qtkeychain? ( dev-libs/qtkeychain )
+   qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
wavpack? ( media-sound/wavpack )
-   "
+"
# libshout-idjc-2.4.6 is required. Please check and re-add once it's
# available in ::gentoo
# Meanwhile we're using the bundled libshout-idjc. See bug #775443
@@ -81,9 +81,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
dev-qt/qttest:5
-   dev-qt/qtxmlpatterns:5"
+   dev-qt/qtxmlpatterns:5
+   virtual/pkgconfig
+"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.3.0-docs.patch
@@ -106,10 +108,6 @@ mixxx_set_globals() {
 }
 mixxx_set_globals
 
-src_prepare() {
-   cmake_src_prepare
-}
-
 src_configure() {
local mycmakeargs=(
# Not available on Linux yet and requires additional deps
@@ -131,19 +129,14 @@ src_configure() {
-DWAVPACK="$(usex wavpack on off)"
)
 
-   if [[ "${PV}" ==  ]] ; then
+   if [[ ${PV} ==  ]] ; then
mycmakeargs+=(
-DENGINEPRIME="OFF"
-
)
fi
cmake_src_configure
 }
 
-src_compile() {
-   cmake_src_compile
-}
-
 src_install() {
cmake_src_install
udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 
69-mixxx-usb-uaccess.rules

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index eed827c69005..8e68e926a377 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" == * ]] ; then
+HOMEPAGE="https://mixxx.org/;
+if [[ ${PV} == * ]] ; then
inherit git-r3
-   if [[ "${PV}" == ?.?. ]] ; then
+   if [[ ${PV} == ?.?. ]] ; then
EGIT_BRANCH=${PV%.}
fi
EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
@@ -25,7 +25,7 @@ IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus 
qtkeychain shout wavpack
 RDEPEND="
dev-db/sqlite
dev-libs/glib:2
-   dev-libs/protobuf:0=
+   dev-libs/protobuf:=
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -70,9 +70,9 @@ RDEPEND="
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
-   qtkeychain? ( dev-libs/qtkeychain )
+   qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
wavpack? ( media-sound/wavpack )
-   "
+"
# libshout-idjc-2.4.6 is required. Please check and re-add once it's
# available in ::gentoo
# Meanwhile we're using the bundled libshout-idjc. See bug #775443
@@ -81,13 +81,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
dev-qt/qttest:5
-   dev-qt/qtxmlpatterns:5"
+   dev-qt/qtxmlpatterns:5
+   virtual/pkgconfig
+"
 
 PATCHES=(
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-05-10 Thread Miroslav Šulc
commit: af75ae633d060138e9d6f1afe9cc64ae5da37084
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu May 11 05:24:13 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 11 05:24:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af75ae63

media-sound/mixxx: bump to 2.3.5, dropped 2.3.4

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest   | 2 +-
 media-sound/mixxx/{mixxx-2.3.4.ebuild => mixxx-2.3.5.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 86c2bba86021..9a7dff6f262e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,5 @@
 DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 
1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80
 SHA512 
6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
-DIST mixxx-2.3.4.tar.gz 41132776 BLAKE2B 
4d5ae391cdc3b2bd2502665e60d3bcd8749deff54ebbbda1716803e0cfe496bc2ef5adc02500f9553a338221c7484ade9fc2e6ec7a23057affe93e49b2bcfe51
 SHA512 
75f5c1c6eb887072f0faa31bd469b79f5d03ea6df9174a8743adb2d8811f229c8f16d0d28931fe4810760af17376d254252500ff5825dcf21b20d03e763a78c9
+DIST mixxx-2.3.5.tar.gz 41226268 BLAKE2B 
311dc36c5544e34651b4eb824fac2ab70827382295ba1912d53ec9706fc976a89d5417c969cb41e23c22a456953046e472fcbdbe78316949e02e6db7e15704b4
 SHA512 
d81208e8fe91e1843bac7ab512dc248457266b935bf8720694f2bedf96389ba35789d68ea77fcecf0a02682fb75de2752612b2c44a49b8eba52323cab2b82e51
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B 
bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86
 SHA512 
fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc

diff --git a/media-sound/mixxx/mixxx-2.3.4.ebuild 
b/media-sound/mixxx/mixxx-2.3.5.ebuild
similarity index 100%
rename from media-sound/mixxx/mixxx-2.3.4.ebuild
rename to media-sound/mixxx/mixxx-2.3.5.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-03-03 Thread Miroslav Šulc
commit: 372d05f3a9c257b270426c3f2a2b1118a0b7c04c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Mar  4 07:38:08 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Mar  4 07:38:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372d05f3

media-sound/mixxx: bump to 2.3.4

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.3.4.ebuild | 167 +++
 2 files changed, 168 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 8309d892da11..86c2bba86021 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
 DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 
1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80
 SHA512 
6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
+DIST mixxx-2.3.4.tar.gz 41132776 BLAKE2B 
4d5ae391cdc3b2bd2502665e60d3bcd8749deff54ebbbda1716803e0cfe496bc2ef5adc02500f9553a338221c7484ade9fc2e6ec7a23057affe93e49b2bcfe51
 SHA512 
75f5c1c6eb887072f0faa31bd469b79f5d03ea6df9174a8743adb2d8811f229c8f16d0d28931fe4810760af17376d254252500ff5825dcf21b20d03e763a78c9
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B 
bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86
 SHA512 
fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc

diff --git a/media-sound/mixxx/mixxx-2.3.4.ebuild 
b/media-sound/mixxx/mixxx-2.3.4.ebuild
new file mode 100644
index ..69c17499f146
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/;
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   if [[ "${PV}" == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+   fi
+   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
+else
+   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   #S="${WORKDIR}/${PN}-release-${PV}"
+   KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
+
+RDEPEND="
+   dev-db/sqlite
+   dev-libs/glib:2
+   dev-libs/protobuf:=
+   dev-qt/qtcore:5
+   dev-qt/qtdbus: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/qtx11extras:5
+   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
+   media-libs/libvorbis
+   media-libs/portaudio[alsa]
+   media-libs/portmidi
+   media-libs/rubberband
+   media-libs/taglib
+   media-libs/vamp-plugin-sdk
+   media-sound/lame
+   sci-libs/fftw:3.0=
+   sys-power/upower
+   virtual/glu
+   virtual/libusb:1
+   virtual/opengl
+   virtual/udev
+   x11-libs/libX11
+   aac? (
+   media-libs/faad2
+   media-libs/libmp4v2
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   hid? ( dev-libs/hidapi )
+   keyfinder? ( media-libs/libkeyfinder )
+   lv2? ( media-libs/lilv )
+   modplug? ( media-libs/libmodplug )
+   mp3? ( media-libs/libmad )
+   mp4? ( media-libs/libmp4v2:= )
+   opus? ( media-libs/opusfile )
+   qtkeychain? ( dev-libs/qtkeychain )
+   wavpack? ( media-sound/wavpack )
+   "
+   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
+   # available in ::gentoo
+   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
+   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+"

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-01-22 Thread Sam James
commit: 2f3d6bc71763977f07e1389bc530c32400b36650
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 23 04:33:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 04:33:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f3d6bc7

media-sound/mixxx: update copyright

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index faecbb31e604..d6ba056d0789 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2023-01-22 Thread Sam James
commit: 0a3a03453658305cf00633b5b241b61d4fefd29e
Author: Marco Sirabella  sirabella  org>
AuthorDate: Sun Jan 22 22:48:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 04:27:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3a0345

media-sound/mixxx: fix(disable) doc generation

Signed-off-by: Marco Sirabella  sirabella.org>
Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/files/mixxx--docs.patch | 18 +-
 media-sound/mixxx/mixxx-.ebuild   |  3 ++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx--docs.patch 
b/media-sound/mixxx/files/mixxx--docs.patch
index d1de4e6e9443..0ac74959df2e 100644
--- a/media-sound/mixxx/files/mixxx--docs.patch
+++ b/media-sound/mixxx/files/mixxx--docs.patch
@@ -1,19 +1,27 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cc5b3a7ba..63f18bfda4 100644
+index e35d8dd4e1..798179955c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1142,15 +1142,6 @@ install(
+@@ -1504,23 +1504,6 @@ install(
  "${MIXXX_INSTALL_LICENSEDIR}"
  )
- 
+
 -# Documentation
 -install(
 -  FILES
--"${CMAKE_CURRENT_SOURCE_DIR}/README"
--"${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
+-"${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-"${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
 -  DESTINATION
 -"${MIXXX_INSTALL_DOCDIR}"
 -)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-FILES
+-  "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-DESTINATION
+-  "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
 -
  # Additional Linux-only files
  if(UNIX AND NOT APPLE)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 5348bd3d18a5..72ed63ef7744 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -105,6 +105,7 @@ src_configure() {
-DWAVPACK="$(usex wavpack on off)"
-DQTKEYCHAIN="$(usex qtkeychain on off)"
-DKEYFINDER="$(usex keyfinder on off)"
+   -DDOWNLOAD_MANUAL=OFF
)
 
if [[ "${PV}" ==  ]] ; then
@@ -125,7 +126,7 @@ src_install() {
udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 
69-mixxx-usb-uaccess.rules
 
if use doc ; then
-   dodoc README Mixxx-Manual.pdf
+   dodoc README res/Mixxx-Keyboard-Shortcuts.pdf
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-01-22 Thread Sam James
commit: 9c4c56577c6a096227449c6767c10a97d8a9be9e
Author: Marco Sirabella  sirabella  org>
AuthorDate: Sun Jan 22 23:09:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 04:28:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4c5657

media-sound/mixxx: disable building shared libs

Not sure if this is the right approach, but building the ebuild without this
gives a bunch of undefined reference errors to benchmarking code

Better approach might be this + disable benchmarking linking in final shared
build? & disable benchmarking & testing in general when USE=-test

Signed-off-by: Marco Sirabella  sirabella.org>
Closes: https://github.com/gentoo/gentoo/pull/29221
Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 605c7557ad8e..faecbb31e604 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -107,6 +107,7 @@ src_configure() {
-DQTKEYCHAIN="$(usex qtkeychain on off)"
-DKEYFINDER="$(usex keyfinder on off)"
-DDOWNLOAD_MANUAL=OFF
+   -DBUILD_SHARED_LIBS=OFF
)
 
if [[ "${PV}" ==  ]] ; then



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2023-01-22 Thread Sam James
commit: 6fbc5cc1417e81883b69988a0fc409f2966a031b
Author: Marco Sirabella  sirabella  org>
AuthorDate: Sun Jan 22 22:52:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 04:28:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbc5cc1

media-sound/mixxx: Update buildtime deps

Signed-off-by: Marco Sirabella  sirabella.org>
Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 72ed63ef7744..605c7557ad8e 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -75,7 +75,8 @@ RDEPEND="
wavpack? ( media-sound/wavpack )
"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   dev-cpp/ms-gsl"
 BDEPEND="virtual/pkgconfig
dev-qt/qttest:5
dev-qt/qtxmlpatterns:5"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-07-26 Thread Miroslav Šulc
commit: e60dc50a53859438555ddfa61a4e61463594361b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jul 27 04:51:05 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jul 27 04:51:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60dc50a

media-sound/mixxx: dropped obsolete 2.3.2

Bug: https://bugs.gentoo.org/861101
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.3.2.ebuild | 167 ---
 2 files changed, 168 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 86d97510d902..8309d892da11 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
-DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 
9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4
 SHA512 
81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
 DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 
1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80
 SHA512 
6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068

diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild 
b/media-sound/mixxx/mixxx-2.3.2.ebuild
deleted file mode 100644
index 8261053464b3..
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg udev
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   if [[ "${PV}" == ?.?. ]] ; then
-   EGIT_BRANCH=${PV%.}
-   fi
-   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
-else
-   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   #S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
-
-RDEPEND="
-   dev-db/sqlite
-   dev-libs/glib:2
-   dev-libs/protobuf:0=
-   dev-qt/qtcore:5
-   dev-qt/qtdbus: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/qtx11extras:5
-   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
-   media-libs/libvorbis
-   media-libs/portaudio[alsa]
-   media-libs/portmidi
-   media-libs/rubberband
-   media-libs/taglib
-   media-libs/vamp-plugin-sdk
-   media-sound/lame
-   sci-libs/fftw:3.0=
-   sys-power/upower
-   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 )
-   keyfinder? ( media-libs/libkeyfinder )
-   lv2? ( media-libs/lilv )
-   modplug? ( media-libs/libmodplug )
-   mp3? ( media-libs/libmad )
-   mp4? ( media-libs/libmp4v2:= )
-   opus? ( media-libs/opusfile )
-   qtkeychain? ( dev-libs/qtkeychain )
-   wavpack? ( media-sound/wavpack )
-   "
-   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
-   # available in ::gentoo
-   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
-   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
-
-DEPEND="${RDEPEND}
-   dev-qt/qtconcurrent:5
-"
-BDEPEND="virtual/pkgconfig
-   dev-qt/qttest:5
-   dev-qt/qtxmlpatterns:5"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.3.0-docs.patch
-   "${FILESDIR}"/${PN}-2.3.0-cmake.patch
-   "${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
-)
-
-PLOCALES="
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-07-26 Thread Agostino Sarubbo
commit: 98ab8e993ca3b95dd0ff0a4bdd3ac82b47ba2efc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul 26 15:24:17 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul 26 15:24:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ab8e99

media-sound/mixxx: x86 stable wrt bug #861101

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/mixxx/mixxx-2.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild 
b/media-sound/mixxx/mixxx-2.3.3.ebuild
index 2ba471bcba51..ee90b8144308 100644
--- a/media-sound/mixxx/mixxx-2.3.3.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-07-26 Thread Sam James
commit: c5871a7b877242de4d5fa08275d6761f806e55a4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 26 07:03:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 26 07:03:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5871a7b

media-sound/mixxx: Stabilize 2.3.3 amd64, #861101

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild 
b/media-sound/mixxx/mixxx-2.3.3.ebuild
index 527500bba678..2ba471bcba51 100644
--- a/media-sound/mixxx/mixxx-2.3.3.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-06-25 Thread Miroslav Šulc
commit: 9562328361f95ae1ea7d650563f8753b5c01ae01
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 25 12:59:49 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 25 13:00:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95623283

media-sound/mixxx: update udev rules

Closes: https://bugs.gentoo.org/847880
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/mixxx-2.3.2.ebuild| 10 ++
 media-sound/mixxx/mixxx-2.3.3.ebuild| 10 ++
 media-sound/mixxx/mixxx-2.3..ebuild | 10 ++
 media-sound/mixxx/mixxx-.ebuild | 10 ++
 4 files changed, 40 insertions(+)

diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild 
b/media-sound/mixxx/mixxx-2.3.2.ebuild
index 11a3b2cd1187..8261053464b3 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -155,3 +155,13 @@ src_install() {
fi
done
 }
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   udev_reload
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   udev_reload
+}

diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild 
b/media-sound/mixxx/mixxx-2.3.3.ebuild
index ad5efc5eed5b..527500bba678 100644
--- a/media-sound/mixxx/mixxx-2.3.3.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -155,3 +155,13 @@ src_install() {
fi
done
 }
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   udev_reload
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   udev_reload
+}

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 0717917ee46a..ef33c268c4fe 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -153,3 +153,13 @@ src_install() {
fi
done
 }
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   udev_reload
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   udev_reload
+}

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 7a7a2a358b7b..3b37660dc9e1 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -129,3 +129,13 @@ src_install() {
dodoc README Mixxx-Manual.pdf
fi
 }
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   udev_reload
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   udev_reload
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-06-25 Thread Miroslav Šulc
commit: 5acda659d06d385c84365844e2bde568819a9e0b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 25 08:46:38 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 25 08:46:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5acda659

media-sound/mixxx: bump to 2.3.3, eapi8

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest  | 1 +
 media-sound/mixxx/{mixxx-2.3..ebuild => mixxx-2.3.3.ebuild} | 8 +---
 media-sound/mixxx/mixxx-2.3..ebuild | 2 +-
 media-sound/mixxx/mixxx-.ebuild | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 857db23f0ae6..86d97510d902 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
 DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 
9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4
 SHA512 
81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
+DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 
1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80
 SHA512 
6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B 
bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86
 SHA512 
fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3.3.ebuild
similarity index 96%
copy from media-sound/mixxx/mixxx-2.3..ebuild
copy to media-sound/mixxx/mixxx-2.3.3.ebuild
index 8d7a94aca60b..ad5efc5eed5b 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 
@@ -86,8 +86,10 @@ BDEPEND="virtual/pkgconfig
dev-qt/qtxmlpatterns:5"
 
 PATCHES=(
-   "${FILESDIR}"/mixxx--docs.patch
-   )
+   "${FILESDIR}"/${PN}-2.3.0-docs.patch
+   "${FILESDIR}"/${PN}-2.3.0-cmake.patch
+   "${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
+)
 
 PLOCALES="
ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN 
zh-TW

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 8d7a94aca60b..0717917ee46a 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 8b5963df7ac6..7a7a2a358b7b 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-06-16 Thread Sam James
commit: 22342596386234d86475abd76bfa5e140f113d3c
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Wed Jun  8 20:08:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 16 16:30:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22342596

media-sound/mixxx: fix unquoted variable DISTDIR

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.3.2.ebuild| 2 +-
 media-sound/mixxx/mixxx-2.3..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild 
b/media-sound/mixxx/mixxx-2.3.2.ebuild
index eda1855950ba..11a3b2cd1187 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -151,7 +151,7 @@ src_install() {
local locale
for locale in ${PLOCALES} ; do
if use l10n_${locale} ; then
-   dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
+   dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
fi
done
 }

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 73bd3177b918..8d7a94aca60b 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -149,7 +149,7 @@ src_install() {
local locale
for locale in ${PLOCALES} ; do
if use l10n_${locale} ; then
-   dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
+   dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
fi
done
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/

2022-05-10 Thread Miroslav Šulc
commit: 94a60438d525dc8aa11a9c91df8fdbf24127b351
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May 10 17:53:11 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May 10 17:53:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a60438

media-sound/mixxx: removed obsolete 2.2.4-r1 & 2.3.1-r4

Bug: https://bugs.gentoo.org/835645
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest |   2 -
 media-sound/mixxx/files/mixxx-2.0.0-docs.patch |  10 -
 media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch  | 215 -
 .../mixxx/files/mixxx-2.2.4-fix-scons-compat.patch |  24 ---
 media-sound/mixxx/files/mixxx-2.2.4-metadata.patch |  11 --
 media-sound/mixxx/mixxx-2.2.4-r1.ebuild| 143 --
 media-sound/mixxx/mixxx-2.3.1-r4.ebuild| 157 ---
 7 files changed, 562 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0bbd99333e96..857db23f0ae6 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,3 @@
-DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 
3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f
 SHA512 
34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 
08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be
 SHA512 
17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcda3062f5b4f1f550722c5033c516e046816
 DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 
9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4
 SHA512 
81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
deleted file mode 100644
index 702ce6cd8df5..
--- a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 mixxx-/src/SConscript
-+++ mixxx-/src/SConscript
-@@ -290,7 +290,6 @@
- env.Alias('install', controllermappings)
- env.Alias('install', translations)
- env.Alias('install', keyboardmappings)
--env.Alias('install', docs)
- env.Alias('install', dotdesktop)
- env.Alias('install', icon)
- env.Alias('install', promotracks)

diff --git a/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch 
b/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch
deleted file mode 100644
index 686b16e159f0..
--- a/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From e581b59fa838f471259ea24089d663bec4c02a1a Mon Sep 17 00:00:00 2001
-From: "S.Brandt" 
-Date: Fri, 17 Jan 2020 13:03:58 +0100
-Subject: [PATCH 1/2] Fixes faders become invisible for the Deere skin with QT
- 5.14.0 . Simplified the affected svg graphics. There was some transformation
- going on (that rotates a shape around the point 0,0), also the unscaled
- handle graphics were bigger than the slider graphics. That was apparently not
- an issue pre-QT5.14.0.
-

- res/skins/Deere/handle-crossfader-blue.svg   | 8 ++--
- res/skins/Deere/handle-crossfader-grey.svg   | 8 ++--
- res/skins/Deere/handle-crossfader-lime.svg   | 8 ++--
- res/skins/Deere/handle-crossfader-orange.svg | 8 ++--
- res/skins/Deere/handle-vertical-blue.svg | 8 ++--
- res/skins/Deere/handle-vertical-carmine.svg  | 8 ++--
- res/skins/Deere/handle-vertical-grey.svg | 8 ++--
- res/skins/Deere/handle-vertical-lime.svg | 8 ++--
- res/skins/Deere/handle-vertical-orange.svg   | 8 ++--
- res/skins/Deere/handle-vertical-purple.svg   | 8 ++--
- res/skins/Deere/slider-crossfader-AutoDJ.svg | 6 +-
- res/skins/Deere/slider-crossfader.svg| 8 ++--
- res/skins/Deere/slider-vertical.svg  | 8 ++--
- 13 files changed, 77 insertions(+), 25 deletions(-)
-
-diff --git 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-05-10 Thread Agostino Sarubbo
commit: fac0c0becf800bcec31a1460592339b1040e5951
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 10 13:48:20 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 10 13:48:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac0c0be

media-sound/mixxx: x86 stable wrt bug #835645

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/mixxx/mixxx-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild 
b/media-sound/mixxx/mixxx-2.3.2.ebuild
index 1fa6847ab681..eda1855950ba 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-05-01 Thread Sam James
commit: aed4b4c9b7e14ba6171e0d7af371f96ce191efb8
Author: Sam James  gentoo  org>
AuthorDate: Mon May  2 02:02:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  2 02:02:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed4b4c9

media-sound/mixxx: Stabilize 2.3.2 amd64, #835645

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild 
b/media-sound/mixxx/mixxx-2.3.2.ebuild
index fff5c84c8171..1fa6847ab681 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-02-22 Thread Sam James
commit: 4d1797077825a67619592bcaed220e1d046d2f61
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 22 19:24:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 22 19:24:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d179707

media-sound/mixxx: Stabilize 2.3.1-r4 amd64, #833873

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.3.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild 
b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
index fff5c84c8171..1fa6847ab681 100644
--- a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == * ]] ; then
 else

SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
#S="${WORKDIR}/${PN}-release-${PV}"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-02-17 Thread Lars Wendler
commit: f6ca22039000df5dc0af228f4cd23f5873f9681a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Feb 17 14:53:14 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Feb 17 14:53:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ca2203

media-sound/mixxx: Bump to version 2.3.2

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.3.2.ebuild | 157 +++
 2 files changed, 158 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 2bf1be63ba6e..0bbd99333e96 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,6 @@
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 
3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f
 SHA512 
34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
 DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 
08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be
 SHA512 
17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcda3062f5b4f1f550722c5033c516e046816
+DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 
9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4
 SHA512 
81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B 
bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86
 SHA512 
fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc

diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild 
b/media-sound/mixxx/mixxx-2.3.2.ebuild
new file mode 100644
index ..fff5c84c8171
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/;
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   if [[ "${PV}" == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+   fi
+   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
+else
+   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   #S="${WORKDIR}/${PN}-release-${PV}"
+   KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
+
+RDEPEND="
+   dev-db/sqlite
+   dev-libs/glib:2
+   dev-libs/protobuf:0=
+   dev-qt/qtcore:5
+   dev-qt/qtdbus: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/qtx11extras:5
+   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
+   media-libs/libvorbis
+   media-libs/portaudio[alsa]
+   media-libs/portmidi
+   media-libs/rubberband
+   media-libs/taglib
+   media-libs/vamp-plugin-sdk
+   media-sound/lame
+   sci-libs/fftw:3.0=
+   sys-power/upower
+   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 )
+   keyfinder? ( media-libs/libkeyfinder )
+   lv2? ( media-libs/lilv )
+   modplug? ( media-libs/libmodplug )
+   mp3? ( media-libs/libmad )
+   mp4? ( media-libs/libmp4v2:= )
+   opus? ( media-libs/opusfile )
+   qtkeychain? ( dev-libs/qtkeychain )
+   wavpack? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-01-20 Thread Lars Wendler
commit: 82c0b699b4e6b6fcbace9f1c219e5b186ce7f1ef
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jan 20 16:37:38 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jan 20 16:40:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82c0b699

media-sound/mixxx: Avoid using plocale.eclass

It's not working with l10n_ USE flags in SRC_URI and still relies on
LINGUAS variable.

Revbump to fix dependency on libshout. mixxx-2.3.x releases currently
expect libshout-idjc which has not been packaged in Gentoo yet and the
release version the build system expects has not been published yet.

Closes: https://bugs.gentoo.org/831500
Bug: https://bugs.gentoo.org/775443
Signed-off-by: Lars Wendler  gentoo.org>

 .../{mixxx-2.3.1-r3.ebuild => mixxx-2.3.1-r4.ebuild}   | 18 +++---
 media-sound/mixxx/mixxx-2.3..ebuild| 18 +++---
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.1-r3.ebuild 
b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
similarity index 88%
rename from media-sound/mixxx/mixxx-2.3.1-r3.ebuild
rename to media-sound/mixxx/mixxx-2.3.1-r4.ebuild
index b9b3057923d4..fff5c84c8171 100644
--- a/media-sound/mixxx/mixxx-2.3.1-r3.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake plocale xdg udev
+inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
@@ -71,9 +71,12 @@ RDEPEND="
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
qtkeychain? ( dev-libs/qtkeychain )
-   shout? ( >=media-libs/libshout-2.4.5 )
wavpack? ( media-sound/wavpack )
"
+   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
+   # available in ::gentoo
+   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
+   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
 
 DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
@@ -91,14 +94,13 @@ PATCHES=(
 PLOCALES="
ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN 
zh-TW
 "
-PLOCALE_BACKUP="en"
 
 mixxx_set_globals() {
local lang
local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 
1-2)"
-   for lang in ${PLOCALES/ en} ; do
+   for lang in ${PLOCALES} ; do
SRC_URI+=" l10n_${lang}? ( 
${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
-   IUSE+=" l10n_${lang}"
+   IUSE+=" l10n_${lang/ en/ +en}"
done
SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
 }
@@ -147,7 +149,9 @@ src_install() {
udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 
69-mixxx-usb-uaccess.rules
dodoc README.md CHANGELOG.md
local locale
-   for locale in $(plocale_get_locales) ; do
-   dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
+   for locale in ${PLOCALES} ; do
+   if use l10n_${locale} ; then
+   dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 
1-2)-${locale/ja/ja-JP}.pdf
+   fi
done
 }

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 3f04dcfafd4b..73bd3177b918 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake plocale xdg udev
+inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
@@ -71,9 +71,12 @@ RDEPEND="
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
qtkeychain? ( dev-libs/qtkeychain )
-   shout? ( >=media-libs/libshout-2.4.5 )
wavpack? ( media-sound/wavpack )
"
+   # libshout-idjc-2.4.6 is required. Please check and re-add once it's
+   # available in ::gentoo
+   # Meanwhile we're using the bundled libshout-idjc. See bug #775443
+   #shout? ( >=media-libs/libshout-idjc-2.4.6 )
 
 DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
@@ -89,14 +92,13 @@ PATCHES=(
 PLOCALES="
ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN 
zh-TW
 "
-PLOCALE_BACKUP="en"
 
 mixxx_set_globals() {
local lang
local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 
1-2)"
-   for lang in ${PLOCALES/ en} ; do
+   for lang in ${PLOCALES} ; do
SRC_URI+=" l10n_${lang}? ( 
${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
-   IUSE+=" l10n_${lang}"
+   IUSE+=" l10n_${lang/ en/ +en}"
done
SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
 }
@@ -145,7 +147,9 @@ src_install() {
udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 
69-mixxx-usb-uaccess.rules
dodoc README.md CHANGELOG.md
local locale
-   for locale in 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-01-18 Thread Lars Wendler
commit: ccf32c1bbe010a41ad258df77077085edfd7e73a
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 19 07:47:34 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 19 07:56:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf32c1b

media-sound/mixxx: Revbump to install localized manual

Closes: https://bugs.gentoo.org/831421
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest | 23 +
 ...mixxx-2.3.1-r2.ebuild => mixxx-2.3.1-r3.ebuild} | 29 +-
 media-sound/mixxx/mixxx-2.3..ebuild| 29 +-
 3 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 21aab8965e21..2bf1be63ba6e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,2 +1,25 @@
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 
3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f
 SHA512 
34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
 DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 
08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be
 SHA512 
17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcda3062f5b4f1f550722c5033c516e046816
+DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 
0572da067016d6fd1a0e955cfa9daad319e633357532bad114a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c
 SHA512 
965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
+DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B 
de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76
 SHA512 
648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
+DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B 
bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86
 SHA512 
fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc
+DIST mixxx-manual-2.3-en.pdf 34055279 BLAKE2B 
1d4dac58d1d51dec0868f584b7c338a0f5889811c8c1770f89fb86a8ff25c189f68e58c39fb8d279622df1ae5955c3d5d476026976ea4c2144f1d264e0026273
 SHA512 
ae050aac9d10767de4f1793b9147a85cb41b2070d4747e50b4e17308dd6a4a54e049559473bb1c1dd0dcf0c50a51a649fd2e70aebde78139073adb4068e0ac77
+DIST mixxx-manual-2.3-es.pdf 34063874 BLAKE2B 
9a08615f7f01051c01585b967ca82829e264335462874b42bab4314079d1cc08dd5678472403451dde83bd57097be0f827d1e15b4cfe6567a96e817403eea942
 SHA512 
0bfb5d45a950e08120856ebbd4af771ae4da646a5d77994f2423166b3f9c8c8c90087ccf7eb6ccd81d596867f351ea935623b7299d077d587e1265c7ecf196c1
+DIST mixxx-manual-2.3-fi.pdf 34061528 BLAKE2B 
e7408e8efec4fab095f6e46f8c25ec0410895cf3d4fac6e11b7ad048d27fa6226b5516c9fba5428f357bf979d7878811bbb719490675da20a06190a6b93e775d
 SHA512 
70fa602c2c90c629a0b5b671f630110e8945ed76c7e9fe5b09ee167bb75e6a73d1d7c0a23ea30736710555cd1626c4c313cd45436488d3ecd254e245cd58
+DIST mixxx-manual-2.3-fr.pdf 34104354 BLAKE2B 
fd9b0c2d3a2705018771ca2ad4e609ec6a4a969148dc711bee4bd829f60a71713277cd94d0d95c6ca080a2c75233c7e395532aa816b1e2150c2fe45fe8242364
 SHA512 
cf8f9a0559845f1d4540d2a27ffa8b251e85aab6408166b352416f357ea045387ab8dd60c746b99c7d84eaf708f8d173bc16d4b92ebf726042b7aea59d3c460d
+DIST mixxx-manual-2.3-gl.pdf 34059337 BLAKE2B 
27cc942a0fd9994c573913e246d833e5014b535d152c338d18cd30d3f4f6cf2ffaf782a076862a7df638d0c7b2b61fb23dee61fa51f0cd3e4a4abed47ec48843
 SHA512 
17460fba1e754018b67d010fd529218b26a0218cc22c3da3ad92db837c5e5cc7d81ae463b168e965a296fff7fb790ee1e04a8228b5596450027cec12bb445a1e
+DIST mixxx-manual-2.3-id.pdf 34061075 BLAKE2B 
382d72e6429a83586f1b32779d2abef3a4610688b4bbd194568d4561f8df9d388dcb18cdfe3fd005a79cfca1ea32c948531d7964524d3195c65686d9eff11483
 SHA512 
231b5e8e617b714095952350dcf84ad5038d37a3e15071f32a827917c8a74bdf16aa529e7832eb46b12169156c30665365c6d4e354ec85a523641fb83d06ac07
+DIST mixxx-manual-2.3-it.pdf 34065113 BLAKE2B 
44c7cb83d17c3529096c3f94eab77a9cd6d09e2b33032042efcb8ba776fcf02cb298c5cd6e029bf33c1cd1f3a5239540a2e071cd091960bb3ce8e356fb9f7448
 SHA512 
d899171401fa5bc3b20b78997aa80cd806c7c2a901ff3e05204c819a7c039d460d09bc29276e862718e84db2e0c2875155b4bb20320b323668a971fc99a5fcdd
+DIST mixxx-manual-2.3-ja-JP.pdf 32835197 BLAKE2B 
d4fffe0297abaef128fabb14bbead429cf6ee0249b7a7679af88e5cbde606a2ec5f2f2f6fa587efa4fb8f37ebc5559af2e39dca67c20098f12a0442079248ed3
 SHA512 
ddb288925ceb759ecb33820326d400f5c5fa02a7e8905c5d84b374c6d3eb646fe0da738aa617c787bb9787d0b9be538ef123cb016c5ab0dfd12d77685717ae04

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-01-18 Thread Lars Wendler
commit: fa62797295086757938cc432bd89a56e9750ae0b
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 18 13:29:30 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 18 13:30:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa627972

media-sound/mixxx: Depend on media-libs/portaudio[alsa]

Closes: https://bugs.gentoo.org/831408
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/{mixxx-2.3.1-r1.ebuild => mixxx-2.3.1-r2.ebuild} | 2 +-
 media-sound/mixxx/mixxx-2.3..ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.1-r1.ebuild 
b/media-sound/mixxx/mixxx-2.3.1-r2.ebuild
similarity index 99%
rename from media-sound/mixxx/mixxx-2.3.1-r1.ebuild
rename to media-sound/mixxx/mixxx-2.3.1-r2.ebuild
index e29605db4680..992fbd27 100644
--- a/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
media-libs/libsndfile
media-libs/libsoundtouch
media-libs/libvorbis
-   media-libs/portaudio
+   media-libs/portaudio[alsa]
media-libs/portmidi
media-libs/rubberband
media-libs/taglib

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 3c49c3f0fa15..02bf0f67af44 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -45,7 +45,7 @@ RDEPEND="
media-libs/libsndfile
media-libs/libsoundtouch
media-libs/libvorbis
-   media-libs/portaudio
+   media-libs/portaudio[alsa]
media-libs/portmidi
media-libs/rubberband
media-libs/taglib



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-01-18 Thread Lars Wendler
commit: 7e10611526e55bc4bd005fc9166f3b4f1514b5ed
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 18 11:47:09 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 18 11:47:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e106115

media-sound/mixxx: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/mixxx-2.3..ebuild | 45 ++---
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 8b5963df7ac6..3c49c3f0fa15 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,28 +7,25 @@ inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" ==  || ?.?. ]] ; then
+if [[ "${PV}" == * ]] ; then
inherit git-r3
+   if [[ "${PV}" == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+   fi
EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
 else
-   SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/${PN}-release-${PV}"
+   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   #S="${WORKDIR}/${PN}-release-${PV}"
KEYWORDS="~amd64 ~x86"
 fi
-
-if [[ "${PV}" == ?.?. ]] ; then
-   EGIT_BRANCH=${PV%.}
-fi
-
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+IUSE="aac doc ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
 
 RDEPEND="
dev-db/sqlite
dev-libs/glib:2
dev-libs/protobuf:0=
-   dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -53,6 +50,7 @@ RDEPEND="
media-libs/rubberband
media-libs/taglib
media-libs/vamp-plugin-sdk
+   media-sound/lame
sci-libs/fftw:3.0=
sys-power/upower
virtual/glu
@@ -68,6 +66,7 @@ RDEPEND="
hid? ( dev-libs/hidapi )
keyfinder? ( media-libs/libkeyfinder )
lv2? ( media-libs/lilv )
+   modplug? ( media-libs/libmodplug )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
@@ -76,7 +75,9 @@ RDEPEND="
wavpack? ( media-sound/wavpack )
"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+"
 BDEPEND="virtual/pkgconfig
dev-qt/qttest:5
dev-qt/qtxmlpatterns:5"
@@ -90,29 +91,31 @@ src_prepare() {
 }
 
 src_configure() {
-
local mycmakeargs=(
+   # Not available on Linux yet and requires additional deps
+   -DBATTERY="off"
+   -DBROADCAST="$(usex shout on off)"
+   -DCCACHE_SUPPORT="off"
-DFAAD="$(usex aac on off)"
-DFFMPEG="$(usex ffmpeg on off)"
-DHID="$(usex hid on off)"
+   -DINSTALL_USER_UDEV_RULES=OFF
+   -DKEYFINDER="$(usex keyfinder on off)"
-DLILV="$(usex lv2 on off)"
-DMAD="$(usex mp3 on off)"
+   -DMODPLUG="$(usex modplug on off)"
-DOPTIMIZE="off"
-   -DCCACHE_SUPPORT="off"
-DOPUS="$(usex opus on off)"
-   -DBROADCAST="$(usex shout on off)"
+   -DQTKEYCHAIN="$(usex qtkeychain on off)"
-DVINYLCONTROL="on"
-   -DINSTALL_USER_UDEV_RULES=OFF
-DWAVPACK="$(usex wavpack on off)"
-   -DQTKEYCHAIN="$(usex qtkeychain on off)"
-   -DKEYFINDER="$(usex keyfinder on off)"
)
 
if [[ "${PV}" ==  ]] ; then
-   local mycmakeargs+=(
-   -DENGINEPRIME="OFF"
+   mycmakeargs+=(
+   -DENGINEPRIME="OFF"
 
-   )
+   )
fi
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2022-01-18 Thread Lars Wendler
commit: 30545fc0b6b7c3ed713e188ed42a3891a96d0b84
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 18 11:42:14 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 18 11:43:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30545fc0

media-sound/mixxx: Revbump to fix dependencies

Closes: https://bugs.gentoo.org/831399
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/metadata.xml |  1 +
 .../{mixxx-2.3.1.ebuild => mixxx-2.3.1-r1.ebuild}  | 22 ++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 6cfda3f97a3e..38deddc8020f 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -8,6 +8,7 @@

Enable HID controller support
Enable musical key detection support via 
media-libs/libkeyfinder
+   Add libmodplug support
Add support for Ladspa V2 via 
media-libs/lilv
Enable Secure credential storage 
support via dev-libs/qtkeychain
Enable broadcasting support via 
media-libs/libshout

diff --git a/media-sound/mixxx/mixxx-2.3.1.ebuild 
b/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
similarity index 90%
rename from media-sound/mixxx/mixxx-2.3.1.ebuild
rename to media-sound/mixxx/mixxx-2.3.1-r1.ebuild
index c949498e285a..e29605db4680 100644
--- a/media-sound/mixxx/mixxx-2.3.1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
@@ -20,13 +20,12 @@ else
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+IUSE="aac doc ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
 
 RDEPEND="
dev-db/sqlite
dev-libs/glib:2
dev-libs/protobuf:0=
-   dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -51,6 +50,7 @@ RDEPEND="
media-libs/rubberband
media-libs/taglib
media-libs/vamp-plugin-sdk
+   media-sound/lame
sci-libs/fftw:3.0=
sys-power/upower
virtual/glu
@@ -66,6 +66,7 @@ RDEPEND="
hid? ( dev-libs/hidapi )
keyfinder? ( media-libs/libkeyfinder )
lv2? ( media-libs/lilv )
+   modplug? ( media-libs/libmodplug )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
@@ -74,7 +75,9 @@ RDEPEND="
wavpack? ( media-sound/wavpack )
"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+"
 BDEPEND="virtual/pkgconfig
dev-qt/qttest:5
dev-qt/qtxmlpatterns:5"
@@ -91,20 +94,23 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   # Not available on Linux yet and requires additional deps
+   -DBATTERY="off"
+   -DBROADCAST="$(usex shout on off)"
+   -DCCACHE_SUPPORT="off"
-DFAAD="$(usex aac on off)"
-DFFMPEG="$(usex ffmpeg on off)"
-DHID="$(usex hid on off)"
+   -DINSTALL_USER_UDEV_RULES=OFF
+   -DKEYFINDER="$(usex keyfinder on off)"
-DLILV="$(usex lv2 on off)"
-DMAD="$(usex mp3 on off)"
+   -DMODPLUG="$(usex modplug on off)"
-DOPTIMIZE="off"
-   -DCCACHE_SUPPORT="off"
-DOPUS="$(usex opus on off)"
-   -DBROADCAST="$(usex shout on off)"
+   -DQTKEYCHAIN="$(usex qtkeychain on off)"
-DVINYLCONTROL="on"
-   -DINSTALL_USER_UDEV_RULES=OFF
-DWAVPACK="$(usex wavpack on off)"
-   -DQTKEYCHAIN="$(usex qtkeychain on off)"
-   -DKEYFINDER="$(usex keyfinder on off)"
)
 
if [[ "${PV}" ==  ]] ; then



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2022-01-18 Thread Lars Wendler
commit: cdc315bb36142dafc122e6338bb64c4da84f62dd
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 18 08:50:34 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 18 08:50:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc315bb

media-sound/mixxx: Bump to version 2.3.1

Closes: https://bugs.gentoo.org/809305
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest |   1 +
 media-sound/mixxx/files/mixxx-2.3.0-cmake.patch|  11 ++
 media-sound/mixxx/files/mixxx-2.3.0-docs.patch |  26 +
 .../files/mixxx-2.3.1-benchmark_compile_fix.patch  |  10 ++
 media-sound/mixxx/mixxx-2.3.1.ebuild   | 130 +
 5 files changed, 178 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 34cfc9a0f4f6..21aab8965e21 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1 +1,2 @@
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 
3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f
 SHA512 
34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
+DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 
08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be
 SHA512 
17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcda3062f5b4f1f550722c5033c516e046816

diff --git a/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch 
b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
new file mode 100644
index ..b573a624d31e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
@@ -0,0 +1,11 @@
+--- mixxx-2.3.0/CMakeLists.txt
 mixxx-2.3.0/CMakeLists.txt
+@@ -53,8 +53,6 @@
+ set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the 
type of build." FORCE)
+ # Set the possible values of build type for cmake-gui
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" 
"RelWithDebInfo")
+-  elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo)$")
+-message(FATAL_ERROR "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} is not 
supported, use one of Debug, Release or RelWithDebInfo.")
+   endif()
+ endif()
+ 

diff --git a/media-sound/mixxx/files/mixxx-2.3.0-docs.patch 
b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
new file mode 100644
index ..e956e1ce2401
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
@@ -0,0 +1,26 @@
+--- mixxx-2.3.0/CMakeLists.txt
 mixxx-2.3.0/CMakeLists.txt
+@@ -1320,23 +1320,6 @@
+ "${MIXXX_INSTALL_LICENSEDIR}"
+ )
+ 
+-# Documentation
+-install(
+-  FILES
+-"${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-"${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
+-  DESTINATION
+-"${MIXXX_INSTALL_DOCDIR}"
+-)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-FILES
+-  "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-DESTINATION
+-  "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
+-
+ # Additional Linux-only files
+ if(UNIX AND NOT APPLE)
+   # .desktop file for KDE/GNOME menu

diff --git a/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch 
b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
new file mode 100644
index ..2ab50c85309e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
@@ -0,0 +1,10 @@
+--- mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
 mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
+@@ -2,6 +2,7 @@
+ #define BENCHMARK_REGISTER_H
+ 
+ #include 
++#include 
+ 
+ #include "check.h"
+ 

diff --git a/media-sound/mixxx/mixxx-2.3.1.ebuild 
b/media-sound/mixxx/mixxx-2.3.1.ebuild
new file mode 100644
index ..c949498e285a
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/;
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   if [[ "${PV}" == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+   fi
+   EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
+else
+   
SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${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 keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+   dev-db/sqlite
+   dev-libs/glib:2
+   dev-libs/protobuf:0=
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2021-10-14 Thread Sam James
commit: f8ed35f55c54975905d50c213837bfa6559e810c
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 14 09:13:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 14 09:13:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ed35f5

media-sound/mixxx: depend on older scons

A PR is pending for the CMake port.

Bug: https://bugs.gentoo.org/806085
Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4-r1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4-r1.ebuild 
b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
index 06e567d0809..8cb76558f56 100644
--- a/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
@@ -74,10 +74,14 @@ RDEPEND="
 "
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
 DEPEND="${RDEPEND}
-   virtual/pkgconfig
dev-qt/qttest:5
dev-qt/qtxmlpatterns:5
-   ${PYTHON_DEPS}
+"
+# See bug #806085 for scons upper bound, newer versions drop scons dependency
+# altogether.
+BDEPEND="${PYTHON_DEPS}
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2021-08-16 Thread Sam James
commit: 7a8c9e7be5c18dde7265591309bad5fe026957ca
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 16 21:15:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 21:22:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8c9e7b

media-sound/mixxx: add missing slot operator dep (libid3tag)

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/{mixxx-2.2.4.ebuild => mixxx-2.2.4-r1.ebuild} | 4 ++--
 media-sound/mixxx/mixxx-2.3..ebuild | 2 +-
 media-sound/mixxx/mixxx-.ebuild | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
similarity index 98%
rename from media-sound/mixxx/mixxx-2.2.4.ebuild
rename to media-sound/mixxx/mixxx-2.2.4-r1.ebuild
index 12f5c4bf11d..06e567d0809 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9})
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
@@ -43,7 +43,7 @@ RDEPEND="
dev-qt/qtxml:5
media-libs/chromaprint
media-libs/flac
-   media-libs/libid3tag
+   media-libs/libid3tag:=
media-libs/libogg
media-libs/libsndfile
>=media-libs/libsoundtouch-1.5

diff --git a/media-sound/mixxx/mixxx-2.3..ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
index 437d4ca2e35..8b5963df7ac 100644
--- a/media-sound/mixxx/mixxx-2.3..ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -43,7 +43,7 @@ RDEPEND="
media-libs/chromaprint
media-libs/flac
media-libs/libebur128
-   media-libs/libid3tag
+   media-libs/libid3tag:=
media-libs/libogg
media-libs/libsndfile
media-libs/libsoundtouch

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 437d4ca2e35..8b5963df7ac 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
media-libs/chromaprint
media-libs/flac
media-libs/libebur128
-   media-libs/libid3tag
+   media-libs/libid3tag:=
media-libs/libogg
media-libs/libsndfile
media-libs/libsoundtouch



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2021-06-12 Thread Lars Wendler
commit: 580ab449e19eb3f196a24e70069e8f0f60103460
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jun 12 14:20:19 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jun 12 14:20:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580ab449

media-sound/mixxx: Version 2.2.4 also builds with python3_9

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index da8c58ae71b..12f5c4bf11d 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8})
+PYTHON_COMPAT=( python3_{7..9})
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2021-05-08 Thread Rémi Cardona
commit: 87d9d3175dcbcb7b9aecb9a50bd896cdc8b6feab
Author: Rémi Cardona  gentoo  org>
AuthorDate: Sat May  8 17:58:03 2021 +
Commit: Rémi Cardona  gentoo  org>
CommitDate: Sat May  8 17:58:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d9d317

media-sound/mixxx: add patch to fix build with scons 4.1

Closes: https://bugs.gentoo.org/767838
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Rémi Cardona  gentoo.org>

 .../mixxx/files/mixxx-2.2.4-fix-scons-compat.patch | 24 ++
 media-sound/mixxx/mixxx-2.2.4.ebuild   |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch 
b/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch
new file mode 100644
index 000..816d888a734
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch
@@ -0,0 +1,24 @@
+diff -dNur a/build/qt4.py b/build/qt4.py
+--- a/build/qt4.py 2020-05-15 23:26:10.0 +0200
 b/build/qt4.py 2021-03-17 11:13:58.867445884 +0100
+@@ -42,7 +42,7 @@
+ import SCons.Tool
+ import SCons.Util
+ 
+-class ToolQt4Warning(SCons.Warnings.Warning):
++class ToolQt4Warning(SCons.Warnings.SConsWarning):
+ pass
+ 
+ class GeneratedMocFileNotIncluded(ToolQt4Warning):
+diff -dNur a/build/qt5.py b/build/qt5.py
+--- a/build/qt5.py 2020-05-15 23:26:10.0 +0200
 b/build/qt5.py 2021-03-17 11:12:39.568689777 +0100
+@@ -43,7 +43,7 @@
+ import SCons.Tool
+ import SCons.Util
+ 
+-class ToolQt5Warning(SCons.Warnings.Warning):
++class ToolQt5Warning(SCons.Warnings.SConsWarning):
+ pass
+ 
+ class GeneratedMocFileNotIncluded(ToolQt5Warning):

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index 5e8d641266f..da8c58ae71b 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.0.0-docs.patch
"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
"${FILESDIR}"/${PN}-2.2.4-metadata.patch
+   "${FILESDIR}"/${PN}-2.2.4-fix-scons-compat.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2021-01-28 Thread Miroslav Šulc
commit: fdadb26eb2d9387d3ed37eb6f7ed397ed08e20c3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jan 28 12:12:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jan 28 12:12:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdadb26e

media-libs/mixxx: updated live + added 2.3.

by jospezial  gmx.de>

Bug: https://bugs.gentoo.org/739498
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../mixxx/{mixxx-.ebuild => mixxx-2.3..ebuild}   | 12 +++-
 media-sound/mixxx/mixxx-.ebuild  | 12 +++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-2.3..ebuild
similarity index 92%
copy from media-sound/mixxx/mixxx-.ebuild
copy to media-sound/mixxx/mixxx-2.3..ebuild
index bbfbe57f1f0..437d4ca2e35 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-2.3..ebuild
@@ -7,7 +7,7 @@ inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" ==  ]] ; then
+if [[ "${PV}" ==  || ?.?. ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
 else
@@ -16,6 +16,10 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
+if [[ "${PV}" == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
@@ -104,6 +108,12 @@ src_configure() {
-DKEYFINDER="$(usex keyfinder on off)"
)
 
+   if [[ "${PV}" ==  ]] ; then
+   local mycmakeargs+=(
+   -DENGINEPRIME="OFF"
+
+   )
+   fi
cmake_src_configure
 }
 

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index bbfbe57f1f0..437d4ca2e35 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -7,7 +7,7 @@ inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
-if [[ "${PV}" ==  ]] ; then
+if [[ "${PV}" ==  || ?.?. ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git;
 else
@@ -16,6 +16,10 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
+if [[ "${PV}" == ?.?. ]] ; then
+   EGIT_BRANCH=${PV%.}
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
@@ -104,6 +108,12 @@ src_configure() {
-DKEYFINDER="$(usex keyfinder on off)"
)
 
+   if [[ "${PV}" ==  ]] ; then
+   local mycmakeargs+=(
+   -DENGINEPRIME="OFF"
+
+   )
+   fi
cmake_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/

2021-01-04 Thread Miroslav Šulc
commit: 95405ee565634ef39e06dd44566141e2da623b70
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jan  4 09:16:02 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jan  4 09:17:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95405ee5

media-sond/mixxx: live migrated to cmake + some improvements

thanks to jospezial  gmx.de for the updated ebuild

Bug: https://bugs.gentoo.org/739498
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/files/mixxx--docs.patch |  20 +
 media-sound/mixxx/metadata.xml|   2 +
 media-sound/mixxx/mixxx-.ebuild   | 101 --
 3 files changed, 67 insertions(+), 56 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx--docs.patch 
b/media-sound/mixxx/files/mixxx--docs.patch
new file mode 100644
index 000..d1de4e6e944
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx--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 da78302375e..5e69aa297bf 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,7 +7,9 @@


Enable HID controller support
+   Enable musical key detection support via 
media-libs/libkeyfinder
Add support for Ladspa V2 via 
media-libs/lilv
+   Enable Secure credential storage 
support via dev-libs/qtkeychain
Enable broadcasting support via 
media-libs/libshout



diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 8b6b845279e..bbfbe57f1f0 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.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}" ==  ]] ; 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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-09-19 Thread Michał Górny
commit: bacf83099055c669e0e6f9cf1626508a5c684caf
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Sep 19 10:34:09 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep 19 11:27:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacf8309

media-sound/mixxx: Remove python2

Signed-off-by: Michał Górny  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 2 +-
 media-sound/mixxx/mixxx-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index 931b5e47cce..d26bd4e971f 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 7656de621ce..8b6b845279e 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-09-02 Thread Miroslav Šulc
commit: 07944728f3aa7f23c2129588734952e8dec0b5cf
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Sep  2 12:20:12 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep  2 12:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07944728

media-sound/mixxx: added scons py3 compatibility

thanks for the patch to jospezial  gmx.de>

Closes: https://bugs.gentoo.org/704856
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 15 +--
 media-sound/mixxx/mixxx-.ebuild  | 15 +--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index da8269b4fbe..931b5e47cce 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic scons-utils toolchain-funcs
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
@@ -75,6 +77,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
dev-qt/qttest:5
dev-qt/qtxmlpatterns:5
+   ${PYTHON_DEPS}
 "
 
 PATCHES=(
@@ -102,7 +105,7 @@ src_configure() {
fi
done
 
-   myesconsargs=(
+   MYSCONS=(
prefix="${EPREFIX}/usr"
qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
faad="$(usex aac 1 0)"
@@ -123,13 +126,13 @@ src_configure() {
 
 src_compile() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
 }
 
 src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-   install_root="${ED%/}"/usr install
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
+   install_root="${ED}"/usr install
 
dodoc README Mixxx-Manual.pdf
 }

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index a0693776834..7656de621ce 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic scons-utils toolchain-funcs
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/;
@@ -75,6 +77,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
dev-qt/qttest:5
dev-qt/qtxmlpatterns:5
+   ${PYTHON_DEPS}
 "
 
 src_prepare() {
@@ -96,7 +99,7 @@ src_configure() {
fi
done
 
-   myesconsargs=(
+   MYSCONS=(
prefix="${EPREFIX}/usr"
qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
faad="$(usex aac 1 0)"
@@ -117,13 +120,13 @@ src_configure() {
 
 src_compile() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
 }
 
 src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-   install_root="${ED%/}"/usr install
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
+   install_root="${ED}"/usr install
 
dodoc README Mixxx-Manual.pdf
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-09-02 Thread Miroslav Šulc
commit: 1df22a59e1d44d7e3ce138f0771cfb95b3cc9fe2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Sep  2 07:44:38 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep  2 07:44:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df22a59

media-sound/mixxx: removed old 2.2.3-r2

Closes: https://bugs.gentoo.org/655806
Closes: https://bugs.gentoo.org/704856
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/Manifest  |   1 -
 media-sound/mixxx/mixxx-2.2.3-r2.ebuild | 137 
 2 files changed, 138 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index dd43f190c85..34cfc9a0f4f 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,2 +1 @@
-DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B 
eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35
 SHA512 
dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 
3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f
 SHA512 
34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa

diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild 
b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
deleted file mode 100644
index a0feed265b7..000
--- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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/glu
-   virtual/libusb:1
-   virtual/opengl
-   x11-libs/libX11
-   aac? (
-   media-libs/faad2
-   media-libs/libmp4v2:0
-   )
-   hid? ( dev-libs/hidapi )
-   lv2? ( >=media-libs/lilv-0.24.2-r3 )
-   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}"/${P}-qt-5.14.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
-   lilv="$(usex lv2 1 0)"
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-09-01 Thread Sam James
commit: 6d5170e5d8ae217b0c01d4a8d74c17157dea1fc1
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep  2 02:42:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  2 02:42:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5170e5

media-sound/mixxx: Stabilize 2.2.4 amd64, #739390

Signed-off-by: Sam James  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index f9f8d3c85f0..da8269b4fbe 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-08-30 Thread Thomas Deutschmann
commit: 20874cd283783f03f44d387a054659dddc8b5c8a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug 30 19:06:47 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug 30 19:10:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20874cd2

media-sound/mixxx: x86 stable (bug #739390)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index dcdf1d5edbb..f9f8d3c85f0 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-08-28 Thread Miroslav Šulc
commit: 3c6c2085af4e8ad7d46b2a91da0c9cb03f699d9d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Aug 28 10:51:12 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Aug 28 10:51:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6c2085

media-sound/mixxx: 'append-cxxflags -std=c++11' not needed anymore

Closes: https://bugs.gentoo.org/590690
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/mixxx/mixxx-2.2.4.ebuild | 3 ---
 media-sound/mixxx/mixxx-.ebuild  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index 070c9470c18..dcdf1d5edbb 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -93,9 +93,6 @@ src_prepare() {
 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

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index cac6bd5d4fe..a0693776834 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -87,9 +87,6 @@ src_prepare() {
 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



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/

2020-08-11 Thread Miroslav Šulc
commit: 714f6ee85781670b29190f2eb1744d0cabe2409e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug 11 07:27:05 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug 11 07:27:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714f6ee8

media-sound/mixxx: dropped lilv patch - not needed anymore

Closes: https://bugs.gentoo.org/736671
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../mixxx/files/mixxx-2.2.0-lilv_include_fix.patch | 33 --
 media-sound/mixxx/mixxx-2.2.3-r2.ebuild|  1 -
 media-sound/mixxx/mixxx-2.2.4.ebuild   |  1 -
 media-sound/mixxx/mixxx-.ebuild|  4 ---
 4 files changed, 39 deletions(-)

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
deleted file mode 100644
index 4addc98b1e1..000
--- a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 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.3-r2.ebuild 
b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index a985c3d324a..a0feed265b7 100644
--- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -79,7 +79,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.0.0-docs.patch
-   "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
"${FILESDIR}"/${P}-qt-5.14.patch
 )
 

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
index f0d8272d43a..070c9470c18 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -79,7 +79,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.0.0-docs.patch
-   "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
"${FILESDIR}"/${PN}-2.2.4-metadata.patch
 )

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 3c4c7d006b0..cac6bd5d4fe 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -77,10 +77,6 @@ DEPEND="${RDEPEND}
dev-qt/qtxmlpatterns:5
 "
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
-)
-
 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



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/

2020-06-08 Thread Lars Wendler
commit: cb4e45189b1db64a8d509eb767160bf5ebc0e2f4
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun  8 09:19:15 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun  8 09:19:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4e4518

media-sound/mixxx: Bump to version 2.2.4

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest |   1 +
 media-sound/mixxx/files/mixxx-2.2.4-metadata.patch |  11 ++
 media-sound/mixxx/mixxx-2.2.4.ebuild   | 139 +
 3 files changed, 151 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 2b6188a40f7..dd43f190c85 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1 +1,2 @@
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B 
eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35
 SHA512 
dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
+DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 
3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f
 SHA512 
34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa

diff --git a/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch 
b/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
new file mode 100644
index 000..cf1e43654fe
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
@@ -0,0 +1,11 @@
+--- mixxx-release-2.2.4/src/SConscript
 mixxx-release-2.2.4/src/SConscript
+@@ -405,7 +405,7 @@
+ translations = env.Install(os.path.join(unix_share_path, 
'mixxx', 'translations'), translation_files)
+ keyboardmappings = env.Install(os.path.join(unix_share_path, 
'mixxx', 'keyboard'), keyboardmappings_files)
+ dotdesktop = env.Install(os.path.join(unix_share_path, 
'applications'), dotdesktop_files)
+-dotappstream = env.Install(os.path.join(unix_share_path, 
'appdata'), dotappstream_files)
++dotappstream = env.Install(os.path.join(unix_share_path, 
'metadata'), dotappstream_files)
+ docs = env.Install(os.path.join(unix_share_path, 'doc', 
'mixxx'), docs_files)
+ icon = env.Install(os.path.join(unix_share_path, 'pixmaps'), 
icon_files)
+ 

diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild 
b/media-sound/mixxx/mixxx-2.2.4.ebuild
new file mode 100644
index 000..f0d8272d43a
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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/glu
+   virtual/libusb:1
+   virtual/opengl
+   x11-libs/libX11
+   aac? (
+   media-libs/faad2
+   media-libs/libmp4v2:0
+   )
+   hid? ( dev-libs/hidapi )
+   lv2? ( >=media-libs/lilv-0.24.2-r3 )
+   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

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-02-26 Thread Andreas Sturmlechner
commit: 43a851fcef1771efbd1f29031c61b127ed957a6f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 26 22:53:44 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 26 22:57:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a851fc

media-sound/mixxx: Drop 2.1.8

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.1.8.ebuild | 132 ---
 2 files changed, 133 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 531cc339290..2b6188a40f7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,2 +1 @@
-DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B 
eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35
 SHA512 
dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395

diff --git a/media-sound/mixxx/mixxx-2.1.8.ebuild 
b/media-sound/mixxx/mixxx-2.1.8.ebuild
deleted file mode 100644
index 5604a69b447..000
--- a/media-sound/mixxx/mixxx-2.1.8.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 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}" ==  ]] ; 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
-)
-
-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
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-02-23 Thread Agostino Sarubbo
commit: e50dab85ea1c181cd80ef7e61d0fbcf22d444d26
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 24 07:40:44 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 24 07:40:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50dab85

media-sound/mixxx: amd64 stable wrt bug #708812

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/mixxx/mixxx-2.2.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild 
b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index 62efd69ed3a..a985c3d324a 100644
--- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-02-16 Thread Thomas Deutschmann
commit: f9b2e130b4695229038af91597b8075784d7ae0b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 16 20:56:42 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 16 21:13:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b2e130

media-sound/mixxx: x86 stable (bug #708812)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/mixxx/mixxx-2.2.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild 
b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index e6c04ed417b..62efd69ed3a 100644
--- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-02-13 Thread Andreas Sturmlechner
commit: 49fcbe40bc36d839a359c77277e7e690f596
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 13 23:16:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 13 23:19:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fcbe40

media-sound/mixxx: Drop 2.2.2

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.2.2.ebuild | 137 ---
 2 files changed, 138 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 1ba313a75ba..531cc339290 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,3 +1,2 @@
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 
7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259
 SHA512 
3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B 
eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35
 SHA512 
dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395

diff --git a/media-sound/mixxx/mixxx-2.2.2.ebuild 
b/media-sound/mixxx/mixxx-2.2.2.ebuild
deleted file mode 100644
index 87572640dca..000
--- a/media-sound/mixxx/mixxx-2.2.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
-   lv2? ( >=media-libs/lilv-0.24.2-r3 )
-   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"
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-02-13 Thread Andreas Sturmlechner
commit: 234822d1a53605d1e89453038a14d542398a1fe7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 13 23:16:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 13 23:19:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234822d1

media-sound/mixxx: Drop 2.2.3-r1

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/mixxx/mixxx-2.2.3-r1.ebuild | 138 
 1 file changed, 138 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.3-r1.ebuild 
b/media-sound/mixxx/mixxx-2.2.3-r1.ebuild
deleted file mode 100644
index d6c94204c6f..000
--- a/media-sound/mixxx/mixxx-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
-   lv2? ( >=media-libs/lilv-0.24.2-r3 )
-   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
-   "${FILESDIR}"/${P}-qt-5.14.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
-   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)"
-   )
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-02-13 Thread Andreas Sturmlechner
commit: 5bdb3b2fa3861ca76c7481192e33e4fce7c2ddde
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 13 23:15:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 13 23:19:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdb3b2f

media-sound/mixxx: Add missing dependency

Closes: https://bugs.gentoo.org/704616
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/mixxx/{mixxx-.ebuild => mixxx-2.2.3-r2.ebuild} | 10 ++
 media-sound/mixxx/mixxx-.ebuild|  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
similarity index 93%
copy from media-sound/mixxx/mixxx-.ebuild
copy to media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index c3949aa84c2..e6c04ed417b 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="
media-libs/vamp-plugin-sdk
sci-libs/fftw:3.0=
sys-power/upower
+   virtual/glu
virtual/libusb:1
virtual/opengl
x11-libs/libX11
@@ -70,20 +71,21 @@ RDEPEND="
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
 "
 
 PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.0-docs.patch
"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
+   "${FILESDIR}"/${P}-qt-5.14.patch
 )
 
 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
+   sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || 
die
 
default
 }

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index c3949aa84c2..3c4c7d006b0 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="
media-libs/vamp-plugin-sdk
sci-libs/fftw:3.0=
sys-power/upower
+   virtual/glu
virtual/libusb:1
virtual/opengl
x11-libs/libX11
@@ -70,8 +71,7 @@ RDEPEND="
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



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/

2020-01-24 Thread Andreas Sturmlechner
commit: d68b84ea00dcc1a0e29d99ce8c07d0c76a72e720
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 24 21:57:54 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 24 22:47:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68b84ea

media-sound/mixxx: Fix disappearing fader handles w/ Qt 5.14

Closes: https://bugs.gentoo.org/704176
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch | 215 ++
 media-sound/mixxx/mixxx-2.2.3-r1.ebuild   | 138 ++
 2 files changed, 353 insertions(+)

diff --git a/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch 
b/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch
new file mode 100644
index 000..686b16e159f
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.3-qt-5.14.patch
@@ -0,0 +1,215 @@
+From e581b59fa838f471259ea24089d663bec4c02a1a Mon Sep 17 00:00:00 2001
+From: "S.Brandt" 
+Date: Fri, 17 Jan 2020 13:03:58 +0100
+Subject: [PATCH 1/2] Fixes faders become invisible for the Deere skin with QT
+ 5.14.0 . Simplified the affected svg graphics. There was some transformation
+ going on (that rotates a shape around the point 0,0), also the unscaled
+ handle graphics were bigger than the slider graphics. That was apparently not
+ an issue pre-QT5.14.0.
+
+---
+ res/skins/Deere/handle-crossfader-blue.svg   | 8 ++--
+ res/skins/Deere/handle-crossfader-grey.svg   | 8 ++--
+ res/skins/Deere/handle-crossfader-lime.svg   | 8 ++--
+ res/skins/Deere/handle-crossfader-orange.svg | 8 ++--
+ res/skins/Deere/handle-vertical-blue.svg | 8 ++--
+ res/skins/Deere/handle-vertical-carmine.svg  | 8 ++--
+ res/skins/Deere/handle-vertical-grey.svg | 8 ++--
+ res/skins/Deere/handle-vertical-lime.svg | 8 ++--
+ res/skins/Deere/handle-vertical-orange.svg   | 8 ++--
+ res/skins/Deere/handle-vertical-purple.svg   | 8 ++--
+ res/skins/Deere/slider-crossfader-AutoDJ.svg | 6 +-
+ res/skins/Deere/slider-crossfader.svg| 8 ++--
+ res/skins/Deere/slider-vertical.svg  | 8 ++--
+ 13 files changed, 77 insertions(+), 25 deletions(-)
+
+diff --git a/res/skins/Deere/handle-crossfader-blue.svg 
b/res/skins/Deere/handle-crossfader-blue.svg
+index d17d769ec93..673ab8c304f 100644
+--- a/res/skins/Deere/handle-crossfader-blue.svg
 b/res/skins/Deere/handle-crossfader-blue.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-crossfader-grey.svg 
b/res/skins/Deere/handle-crossfader-grey.svg
+index 6c08871bae8..eb80ee8306e 100644
+--- a/res/skins/Deere/handle-crossfader-grey.svg
 b/res/skins/Deere/handle-crossfader-grey.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-crossfader-lime.svg 
b/res/skins/Deere/handle-crossfader-lime.svg
+index d17d769ec93..581868854b1 100644
+--- a/res/skins/Deere/handle-crossfader-lime.svg
 b/res/skins/Deere/handle-crossfader-lime.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-crossfader-orange.svg 
b/res/skins/Deere/handle-crossfader-orange.svg
+index c3587a775e1..15f2949153e 100644
+--- a/res/skins/Deere/handle-crossfader-orange.svg
 b/res/skins/Deere/handle-crossfader-orange.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-vertical-blue.svg 
b/res/skins/Deere/handle-vertical-blue.svg
+index b12a90b8194..c595936fb43 100644
+--- a/res/skins/Deere/handle-vertical-blue.svg
 b/res/skins/Deere/handle-vertical-blue.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-vertical-carmine.svg 
b/res/skins/Deere/handle-vertical-carmine.svg
+index 2ed243a60de..e1e700d8814 100644
+--- a/res/skins/Deere/handle-vertical-carmine.svg
 b/res/skins/Deere/handle-vertical-carmine.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-vertical-grey.svg 
b/res/skins/Deere/handle-vertical-grey.svg
+index c93bbfdf0b8..3bc72218911 100644
+--- a/res/skins/Deere/handle-vertical-grey.svg
 b/res/skins/Deere/handle-vertical-grey.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git a/res/skins/Deere/handle-vertical-lime.svg 
b/res/skins/Deere/handle-vertical-lime.svg
+index 5cd4d0c76bd..158d494d62a 100644
+--- a/res/skins/Deere/handle-vertical-lime.svg
 b/res/skins/Deere/handle-vertical-lime.svg
+@@ -1,2 +1,6 @@
+-
+-http://www.w3.org/2000/svg;>
++
++http://www.w3.org/2000/svg;>
++ 
++ 
++ 
++
+diff --git 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2020-01-24 Thread Andreas Sturmlechner
commit: 23778ba27e35429201a7fbb1df9c09c7900d9b45
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 24 22:38:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 24 22:47:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23778ba2

media-sound/mixxx: Drop 2.2.3 (r0)

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/mixxx/mixxx-2.2.3.ebuild | 137 ---
 1 file changed, 137 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.2.3.ebuild 
b/media-sound/mixxx/mixxx-2.2.3.ebuild
deleted file mode 100644
index 87572640dca..000
--- a/media-sound/mixxx/mixxx-2.2.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
-   lv2? ( >=media-libs/lilv-0.24.2-r3 )
-   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
-   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)"
-   )
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-12-12 Thread Lars Wendler
commit: 428dbcda0466c43fe044b2bf6b05f880f4ebb8a6
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 12 16:36:24 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 12 17:00:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428dbcda

media-sound/mixxx: Bump to version 2.2.3

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.2.3.ebuild | 137 +++
 2 files changed, 138 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index c650f520c76..44db7e162a0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,3 +1,4 @@
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
 DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 
7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259
 SHA512 
3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
+DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B 
eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35
 SHA512 
dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395

diff --git a/media-sound/mixxx/mixxx-2.2.3.ebuild 
b/media-sound/mixxx/mixxx-2.2.3.ebuild
new file mode 100644
index 000..87572640dca
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
+   lv2? ( >=media-libs/lilv-0.24.2-r3 )
+   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.
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-12-12 Thread Lars Wendler
commit: 2eed2ff04ac4d53bb2e394b499ec47e8b47069c9
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 12 16:37:06 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 12 17:00:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eed2ff0

media-sound/mixxx: Removed old

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.2.1.ebuild | 137 ---
 2 files changed, 138 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 44db7e162a0..1ba313a75ba 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
 DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 
7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259
 SHA512 
3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B 
eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35
 SHA512 
dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395

diff --git a/media-sound/mixxx/mixxx-2.2.1.ebuild 
b/media-sound/mixxx/mixxx-2.2.1.ebuild
deleted file mode 100644
index 87572640dca..000
--- a/media-sound/mixxx/mixxx-2.2.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
-   lv2? ( >=media-libs/lilv-0.24.2-r3 )
-   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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-08-19 Thread Lars Wendler
commit: 8ac2d3199f7832069b554c5e697f284ba5d1643b
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug 19 10:34:29 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug 19 11:00:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac2d319

media-sound/mixxx: Removed old.

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.2.0.ebuild | 137 ---
 2 files changed, 138 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 5f8419e7440..c650f520c76 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
 DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 
7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259
 SHA512 
3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f

diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild 
b/media-sound/mixxx/mixxx-2.2.0.ebuild
deleted file mode 100644
index 7de8d9c9434..000
--- a/media-sound/mixxx/mixxx-2.2.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
-   lv2? ( >=media-libs/lilv-0.24.2-r3 )
-   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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-08-19 Thread Lars Wendler
commit: 7047863d56d753b7ae242c045d6f715f549b25c8
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug 19 10:30:30 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug 19 11:00:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7047863d

media-sound/mixxx: Bump to version 2.2.2

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.2.2.ebuild | 137 +++
 2 files changed, 138 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index c9bcda99e57..5f8419e7440 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,3 +1,4 @@
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
+DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 
7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259
 SHA512 
3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f

diff --git a/media-sound/mixxx/mixxx-2.2.2.ebuild 
b/media-sound/mixxx/mixxx-2.2.2.ebuild
new file mode 100644
index 000..87572640dca
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
+   lv2? ( >=media-libs/lilv-0.24.2-r3 )
+   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.
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-05-20 Thread Lars Wendler
commit: 7ab5c7af461b619f791afce0617c575ad3df1b7e
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 20 11:31:03 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 20 11:31:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab5c7af

media-sound/mixxx: Removed old.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest  |   1 -
 media-sound/mixxx/mixxx-2.1.1-r1.ebuild | 132 
 2 files changed, 133 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index b19eb213d75..c9bcda99e57 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
-DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3

diff --git a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild 
b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
deleted file mode 100644
index 6134b2177b3..000
--- a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}" ==  ]] ; 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
-)
-
-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
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-05-20 Thread Mikle Kolyada
commit: 3cc0aa51a82c76aa175ea1d9562e610591fc97c6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 20 11:16:38 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 20 11:16:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc0aa51

media-sound/mixxx: amd64 stable wrt bug #684474

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-sound/mixxx/mixxx-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.1.8.ebuild 
b/media-sound/mixxx/mixxx-2.1.8.ebuild
index e5fdc6b3857..5604a69b447 100644
--- a/media-sound/mixxx/mixxx-2.1.8.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.8.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-05-19 Thread Thomas Deutschmann
commit: 49bc95c47211e76f2856b5ec2e27bd142a366c69
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 19 15:09:28 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 19 15:09:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49bc95c4

media-sound/mixxx: x86 stable (bug #684474)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/mixxx/mixxx-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.1.8.ebuild 
b/media-sound/mixxx/mixxx-2.1.8.ebuild
index ab11da0490b..e5fdc6b3857 100644
--- a/media-sound/mixxx/mixxx-2.1.8.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.8.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-04-27 Thread Lars Wendler
commit: 9ea009b16de6e7c58fabb96f17020ee5303164fa
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Apr 27 09:43:02 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 27 16:06:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea009b1

media-sound/mixxx: Bump to version 2.2.1

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.2.1.ebuild | 137 +++
 2 files changed, 138 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 63212185b0e..a6c179516c3 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,3 +2,4 @@ DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d3962660
 DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 
63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6
 SHA512 
976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
+DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3

diff --git a/media-sound/mixxx/mixxx-2.2.1.ebuild 
b/media-sound/mixxx/mixxx-2.2.1.ebuild
new file mode 100644
index 000..87572640dca
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 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}" ==  ]] ; 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 lv2 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/qtdbus: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/qtx11extras: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 )
+   lv2? ( >=media-libs/lilv-0.24.2-r3 )
+   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)
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-04-27 Thread Lars Wendler
commit: f6dc9cf68621366dd79bd2570a73b2f0d1697608
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Apr 27 09:46:09 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 27 16:06:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dc9cf6

media-sound/mixxx: Removed old.

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.1.7.ebuild | 132 ---
 2 files changed, 133 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index a6c179516c3..b19eb213d75 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,4 @@
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
-DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 
63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6
 SHA512 
976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 3476 BLAKE2B 
246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a
 SHA512 
16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3

diff --git a/media-sound/mixxx/mixxx-2.1.7.ebuild 
b/media-sound/mixxx/mixxx-2.1.7.ebuild
deleted file mode 100644
index ab11da0490b..000
--- a/media-sound/mixxx/mixxx-2.1.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 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}" ==  ]] ; 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
-)
-
-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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-04-20 Thread Lars Wendler
commit: c4edad23ba7a1e5e4432297cb1974edf069b0457
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Apr 20 23:53:08 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 20 23:53:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4edad23

media-sound/mixxx: Bump to version 2.1.8

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.1.8.ebuild | 132 +++
 2 files changed, 133 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 6fad19a1ca2..17a51f0a221 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 
3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4
 SHA512 
f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
 DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 
63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6
 SHA512 
976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
+DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134

diff --git a/media-sound/mixxx/mixxx-2.1.8.ebuild 
b/media-sound/mixxx/mixxx-2.1.8.ebuild
new file mode 100644
index 000..ab11da0490b
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.8.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 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}" ==  ]] ; 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
+)
+
+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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-04-20 Thread Lars Wendler
commit: 2a925d66c04a982fa20c3a8ec754ec71264ffb30
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Apr 20 23:53:30 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 20 23:53:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a925d66

media-sound/mixxx: Removed old.

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.1.5.ebuild | 132 ---
 2 files changed, 133 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 17a51f0a221..63212185b0e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,4 @@
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
-DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 
3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4
 SHA512 
f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
 DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 
63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6
 SHA512 
976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B 
d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab
 SHA512 
c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134

diff --git a/media-sound/mixxx/mixxx-2.1.5.ebuild 
b/media-sound/mixxx/mixxx-2.1.5.ebuild
deleted file mode 100644
index 1b5e84701fd..000
--- a/media-sound/mixxx/mixxx-2.1.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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}" ==  ]] ; 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
-)
-
-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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-03-24 Thread Lars Wendler
commit: c853539046b1a468cbae9abf948b3a1115e34bea
Author: Gerion Entrup  flump  de>
AuthorDate: Sat Mar 23 20:39:33 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Mar 24 12:56:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8535390

media-sound/mixxx: fix compilation of live ebuild

SConscript file was moved by upstream.

Closes: https://bugs.gentoo.org/669552
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Gerion Entrup  flump.de>
Closes: https://github.com/gentoo/gentoo/pull/11471
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/mixxx-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 7de8d9c9434..c3949aa84c2 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -78,13 +78,12 @@ DEPEND="
 "
 
 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
+   sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path 
=/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die
 
default
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2019-03-11 Thread Lars Wendler
commit: d9691e44fff428dc4792e015ee855372e94fdef7
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 11 13:43:34 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 11 13:43:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9691e44

media-sound/mixxx: Bump to version 2.1.7

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.1.7.ebuild | 132 +++
 2 files changed, 133 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index aa42d274c7b..6fad19a1ca2 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.5.tar.gz 34474975 BLAKE2B 
3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4
 SHA512 
f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
+DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 
63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6
 SHA512 
976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B 
b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530
 SHA512 
8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134

diff --git a/media-sound/mixxx/mixxx-2.1.7.ebuild 
b/media-sound/mixxx/mixxx-2.1.7.ebuild
new file mode 100644
index 000..ab11da0490b
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 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}" ==  ]] ; 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
+)
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-12-28 Thread Lars Wendler
commit: abd92793db1b9021ae70f4565f8858bb4d1c2845
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 28 16:18:39 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 28 16:18:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd92793

media-sound/mixxx: Added missing dependencies.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/mixxx-2.2.0.ebuild | 2 ++
 media-sound/mixxx/mixxx-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild 
b/media-sound/mixxx/mixxx-2.2.0.ebuild
index aac60d50482..7de8d9c9434 100644
--- a/media-sound/mixxx/mixxx-2.2.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.0.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/protobuf:0=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
@@ -36,6 +37,7 @@ RDEPEND="
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
dev-qt/qtxml:5
media-libs/chromaprint
media-libs/flac

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index aac60d50482..7de8d9c9434 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/protobuf:0=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
@@ -36,6 +37,7 @@ RDEPEND="
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
dev-qt/qtxml:5
media-libs/chromaprint
media-libs/flac



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-12-28 Thread Lars Wendler
commit: 53d096f49b8221c63364a40aae98b185cca3577c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 28 16:11:57 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 28 16:12:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d096f4

media-sound/mixxx: Synced live ebuild.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/mixxx-.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 465a2c26cde..aac60d50482 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
 
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
@@ -59,6 +59,7 @@ RDEPEND="
media-libs/libmp4v2:0
)
hid? ( dev-libs/hidapi )
+   lv2? ( >=media-libs/lilv-0.24.2-r3 )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
@@ -76,6 +77,7 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.0.0-docs.patch
+   "${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 )
 
 src_prepare() {
@@ -107,6 +109,7 @@ src_configure() {
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}"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-12-27 Thread Lars Wendler
commit: a850543fc4f0fb84d600796416cc52b843021df8
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 27 18:47:29 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 27 18:47:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a850543f

media-sound/mixxx: Make dependency on media-libs/lilv optional

and no longer automagic.

Closes: https://bugs.gentoo.org/673818
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/metadata.xml   | 1 +
 media-sound/mixxx/mixxx-2.2.0.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 4627d1b0b25..da78302375e 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,6 +7,7 @@


Enable HID controller support
+   Add support for Ladspa V2 via 
media-libs/lilv
Enable broadcasting support via 
media-libs/libshout



diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild 
b/media-sound/mixxx/mixxx-2.2.0.ebuild
index de84f4ec868..aac60d50482 100644
--- a/media-sound/mixxx/mixxx-2.2.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.0.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
 
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
@@ -59,6 +59,7 @@ RDEPEND="
media-libs/libmp4v2:0
)
hid? ( dev-libs/hidapi )
+   lv2? ( >=media-libs/lilv-0.24.2-r3 )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2:= )
opus? ( media-libs/opusfile )
@@ -108,6 +109,7 @@ src_configure() {
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}"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/

2018-12-25 Thread Lars Wendler
commit: a4f0694c7e378b3ff0c2241a1cfacc8a683b2921
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Dec 26 00:03:30 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Dec 26 00:03:30 2018 +
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 000..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 000..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}" ==  ]] ; 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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-12-25 Thread Lars Wendler
commit: faef2c808fce93d018a94a6150d65649edc9fb59
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Dec 26 00:03:55 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Dec 26 00:03:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faef2c80

media-sound/mixxx: Removed old.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.1.4.ebuild | 132 ---
 2 files changed, 133 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 5850046889c..aa42d274c7b 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
 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/mixxx-2.1.4.ebuild 
b/media-sound/mixxx/mixxx-2.1.4.ebuild
deleted file mode 100644
index 465a2c26cde..000
--- a/media-sound/mixxx/mixxx-2.1.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}" ==  ]] ; 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
-)
-
-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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-11-02 Thread Lars Wendler
commit: 0af15bbc5321367438e808cd75c5a6285454651a
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov  2 16:16:05 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov  2 16:16:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af15bbc

media-sound/mixxx: Removed old.

Signed-off-by: Lars Wendler  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.1.3.ebuild | 132 ---
 2 files changed, 133 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 5de8d74a71e..04685a35bc1 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,3 @@
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
-DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 
88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae
 SHA512 
3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
 DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B 
d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51
 SHA512 
082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8
 DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 
3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4
 SHA512 
f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854

diff --git a/media-sound/mixxx/mixxx-2.1.3.ebuild 
b/media-sound/mixxx/mixxx-2.1.3.ebuild
deleted file mode 100644
index 465a2c26cde..000
--- a/media-sound/mixxx/mixxx-2.1.3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}" ==  ]] ; 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
-)
-
-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"

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-11-02 Thread Lars Wendler
commit: 8f431a5ad15ba03ef2790a5d2e8b049fd56b81c7
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov  2 16:15:25 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov  2 16:15:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f431a5a

media-sound/mixxx: Bump to version 2.1.5

Signed-off-by: Lars Wendler  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.1.5.ebuild | 132 +++
 2 files changed, 133 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 750877c3775..5de8d74a71e 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.3.tar.gz 34471372 BLAKE2B 
88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae
 SHA512 
3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
 DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B 
d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51
 SHA512 
082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8
+DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 
3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4
 SHA512 
f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854

diff --git a/media-sound/mixxx/mixxx-2.1.5.ebuild 
b/media-sound/mixxx/mixxx-2.1.5.ebuild
new file mode 100644
index 000..1b5e84701fd
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.5.ebuild
@@ -0,0 +1,132 @@
+# 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}" ==  ]] ; 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
+)
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-tv/tvheadend/, media-libs/allegro/, ...

2018-10-20 Thread Michał Górny
commit: 2acef7780c905ef73d00bac46712265ddb54aae4
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 20 06:55:52 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 20 06:55:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acef778

*/*: Remove redundant descriptions of 'opus' flag

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/virtualbox/metadata.xml   | 1 -
 games-fps/urbanterror/metadata.xml  | 1 -
 kde-apps/kwave/metadata.xml | 1 -
 media-libs/allegro/metadata.xml | 1 -
 media-libs/avidemux-plugins/metadata.xml| 1 -
 media-libs/mediastreamer/metadata.xml   | 1 -
 media-plugins/gst-plugins-meta/metadata.xml | 1 -
 media-sound/abcde/metadata.xml  | 1 -
 media-sound/asunder/metadata.xml| 1 -
 media-sound/cmus/metadata.xml   | 1 -
 media-sound/darkice/metadata.xml| 1 -
 media-sound/easytag/metadata.xml| 3 ---
 media-sound/gogglesmm/metadata.xml  | 3 ---
 media-sound/jack2/metadata.xml  | 1 -
 media-sound/mangler/metadata.xml| 1 -
 media-sound/mixxx/metadata.xml  | 1 -
 media-sound/mpd/metadata.xml| 1 -
 media-sound/mumble/metadata.xml | 1 -
 media-sound/potamus/metadata.xml| 3 ---
 media-sound/qmmp/metadata.xml   | 1 -
 media-sound/soundconverter/metadata.xml | 3 ---
 media-sound/sox/metadata.xml| 1 -
 media-sound/xmms2/metadata.xml  | 1 -
 media-tv/tvheadend/metadata.xml | 1 -
 media-video/ffmpeg/metadata.xml | 1 -
 media-video/vlc/metadata.xml| 1 -
 net-libs/pjproject/metadata.xml | 1 -
 net-libs/qxmpp/metadata.xml | 1 -
 28 files changed, 36 deletions(-)

diff --git a/app-emulation/virtualbox/metadata.xml 
b/app-emulation/virtualbox/metadata.xml
index e75aaef2f83..0c28b5e7197 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -8,7 +8,6 @@
   
   Build without any graphic frontend
   Build VBoxVolInfo that needs devicemapper from 
sys-fs/lvm2.
-  Adds support for the Opus codec via 
media-libs/opus
   Apply patch needed for pax enabled kernels.
   Enable building of SDK
   Controls installation of special USB udev rules.

diff --git a/games-fps/urbanterror/metadata.xml 
b/games-fps/urbanterror/metadata.xml
index 38fad51f813..c57b90db2fc 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -17,7 +17,6 @@
Alternative way for gamma setting with 
modesetting driver
Build binary for client (includes code for 
non-dedicated server)
Use Mumble for ingame VoIP 
(experimental)
-   Use opus as sound codec
Build binary for dedicated server
Build support for skeetshoot mod for 
specific maps
Use ioq3 ingame VoIP (experimental)

diff --git a/kde-apps/kwave/metadata.xml b/kde-apps/kwave/metadata.xml
index 61824ce786d..e53b8a3ea81 100644
--- a/kde-apps/kwave/metadata.xml
+++ b/kde-apps/kwave/metadata.xml
@@ -7,7 +7,6 @@

With Kwave you can edit many sorts of wav-files 
including multi-channel files. You are able to alter and play back each channel 
on its own. Kwave also includes many plugins (most are still under development) 
to transform the wave-file in several ways and presents a graphical view with a 
complete zoom- and scroll capability.

-   Enable Opus audio codec support
Enable playback via Qt5Multimedia

 

diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 0c51c0b4e8a..1a6f9338ec6 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -16,7 +16,6 @@ and a GUI.
 
   
 Enable media-libs/dumb module library 
support
-Enable Opus codec support
 Enable physfs support
 Enables the VGA graphics driver
   

diff --git a/media-libs/avidemux-plugins/metadata.xml 
b/media-libs/avidemux-plugins/metadata.xml
index 410f705011c..54c157d3ff2 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -12,7 +12,6 @@
 Adds support for encoding AAC using 
media-libs/fdk-aac.
 Enable unicode bidirectional algorithm support via 
dev-libs/fribidi.
 Adds support for NVIDIA Encoder (NVENC) API for 
hardware accelerated encoding on NVIDIA cards.
-Adds support for the Opus codec via 
media-libs/opus.
 Enable TwoLAME support via 
media-sound/twolame, an optimised MPEG Audio Layer 2 (MP2) 
encoder.
 Enable WebM VP8 Codec SDK support via 
media-libs/libvpx.
 Enables HEVC support with 
media-libs/x265.

diff --git a/media-libs/mediastreamer/metadata.xml 
b/media-libs/mediastreamer/metadata.xml
index f49ee62249f..4f26788fccd 100644
--- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-09-10 Thread Lars Wendler
commit: 66df0c7bc77bf5e7c55769ee34a109329e0f1ad9
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Sep 10 12:33:31 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Sep 10 12:37:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66df0c7b

media-sound/mixxx: Bump to version 2.1.4

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.1.4.ebuild | 132 +++
 2 files changed, 133 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 878c9c13d2a..750877c3775 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,2 +1,3 @@
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 
88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae
 SHA512 
3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
+DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B 
d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51
 SHA512 
082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8

diff --git a/media-sound/mixxx/mixxx-2.1.4.ebuild 
b/media-sound/mixxx/mixxx-2.1.4.ebuild
new file mode 100644
index 000..465a2c26cde
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}" ==  ]] ; 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
+)
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2018-09-07 Thread Andreas Sturmlechner
commit: 13663ab3d2b090900cb411d0df9ad6a89b887f22
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 30 22:45:56 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep  7 20:33:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13663ab3

media-sound/mixxx: Drop 2.0.0

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/mixxx/Manifest |   3 -
 .../mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch  |  40 ---
 ...nate-unnecessary-heap-allocation-of-qtime.patch |  55 
 ...xx-2.0.0-fix-formatting-of-time-durations.patch |  24 --
 ...x-2.0.0-fix-formatting-of-time-durations2.patch | 139 --
 ...-2.0.0-fix-missing-pointer-initialization.patch | 271 
 media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch|  24 --
 ...n-of-time-formatseconds-into-dot-cpp-file.patch |  88 ---
 ...xx-2.0.0-rmx2-backport-controller-scripts.patch | 280 -
 media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch  |  14 --
 media-sound/mixxx/mixxx-2.0.0-r5.ebuild| 144 ---
 11 files changed, 1082 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 81cb96df556..878c9c13d2a 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,2 @@
-DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 
00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b
 SHA512 
60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
-DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B 
ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205
 SHA512 
7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
-DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B 
a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00
 SHA512 
8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 
88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae
 SHA512 
3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
deleted file mode 100644
index 77827f3d8d8..000
--- a/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Backported chromaprint-1.4 API changes based on the fix suggested in:
-https://github.com/mixxxdj/mixxx/pull/1073
-
-and the work done by Charlie Gehlin in:
-https://bugs.gentoo.org/604528
-
 mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
-+++ mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
-@@ -25,6 +25,16 @@
- 
- QString ChromaPrinter::calcFingerPrint(const Mixxx::SoundSourcePointer& 
pSoundSource) {
- 
-+// Type declarations of *fprint and *encoded pointers need to account for 
Chromaprint API version
-+// (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 
or later -- alyptik 12/2016
-+#if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
-+  typedef uint32_t* uint32_p;
-+  typedef char* char_p;
-+#else
-+  typedef void* uint32_p;
-+  typedef void* char_p;
-+#endif
-+
- // this is worth 2min of audio, multiply by 2 because we have 2 channels
- // AcoustID only stores a fingerprint for the first two minutes of a song
- // on their server so we need only a fingerprint of the first two minutes
-@@ -57,12 +67,12 @@
- }
- chromaprint_finish(ctx);
- 
--void* fprint = NULL;
-+uint32_p fprint = NULL;
- int size = 0;
- int ret = chromaprint_get_raw_fingerprint(ctx, , );
- QByteArray fingerprint;
- if (ret == 1) {
--void* encoded = NULL;
-+char_p encoded = NULL;
- int encoded_size = 0;
- chromaprint_encode_fingerprint(fprint, size,
-CHROMAPRINT_ALGORITHM_DEFAULT,

diff --git 
a/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
 
b/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
deleted file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-09-01 Thread Mikle Kolyada
commit: f6ddc0401b5114189a10c47d7d5e1cb0fb137ef2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Sep  1 22:42:39 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Sep  1 22:42:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ddc040

media-sound/mixxx: amd64 stable wrt bug #664274

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/mixxx/mixxx-2.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild 
b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
index 6ddad2e85e4..6134b2177b3 100644
--- a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-08-28 Thread Thomas Deutschmann
commit: f541f9dd8d9abaefac19849a7ffe93680bbd0056
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 29 00:57:42 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 29 00:57:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f541f9dd

media-sound/mixxx: x86 stable (bug #664274)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/mixxx/mixxx-2.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild 
b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
index 465a2c26cde..6ddad2e85e4 100644
--- a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-08-25 Thread Andreas Sturmlechner
commit: 23ab0ec5b1c399c38626b4d2817d054ee5d82daf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 25 11:08:48 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 25 12:30:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ab0ec5

media-sound/mixxx: Add missing dependency

Thanks-to: Risto A. Paju  iki.fi>
Bug: https://bugs.gentoo.org/664274
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/mixxx/{mixxx-.ebuild => mixxx-2.1.1-r1.ebuild} | 1 +
 media-sound/mixxx/mixxx-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
similarity index 99%
copy from media-sound/mixxx/mixxx-.ebuild
copy to media-sound/mixxx/mixxx-2.1.1-r1.ebuild
index 89b59a96ab6..465a2c26cde 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
media-libs/taglib
media-libs/vamp-plugin-sdk
sci-libs/fftw:3.0=
+   sys-power/upower
virtual/libusb:1
virtual/opengl
x11-libs/libX11

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 89b59a96ab6..465a2c26cde 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
media-libs/taglib
media-libs/vamp-plugin-sdk
sci-libs/fftw:3.0=
+   sys-power/upower
virtual/libusb:1
virtual/opengl
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-08-25 Thread Andreas Sturmlechner
commit: 50fddda2f0089741f2324329c00c5f7250025ab4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 25 11:10:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 25 12:30:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50fddda2

media-sound/mixxx: Drop 2.1.0, 2.1.1

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/mixxx/Manifest   |   1 -
 media-sound/mixxx/mixxx-2.1.0.ebuild | 127 -
 media-sound/mixxx/mixxx-2.1.1.ebuild | 131 ---
 3 files changed, 259 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 13f7f311608..81cb96df556 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,6 +1,5 @@
 DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 
00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b
 SHA512 
60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B 
ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205
 SHA512 
7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B 
a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00
 SHA512 
8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
-DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 
7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567
 SHA512 
d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 
88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae
 SHA512 
3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324

diff --git a/media-sound/mixxx/mixxx-2.1.0.ebuild 
b/media-sound/mixxx/mixxx-2.1.0.ebuild
deleted file mode 100644
index ff679b82348..000
--- a/media-sound/mixxx/mixxx-2.1.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/;
-#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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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=
-   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
-"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.0-docs.patch
-)
-
-src_prepare() {
-  

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-08-23 Thread Lars Wendler
commit: 8ff44dabbd5696782e918140f5ff455db23d42b7
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 23 22:41:04 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 23 22:41:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff44dab

media-sound/mixxx: Bump to version 2.1.3

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.1.3.ebuild | 132 +++
 2 files changed, 133 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 69703d864ab..13f7f311608 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -3,3 +3,4 @@ DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B 
ee44c1da8af553cff478d12bc4fb05ae50b
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B 
a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00
 SHA512 
8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
 DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 
7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567
 SHA512 
d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
+DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 
88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae
 SHA512 
3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324

diff --git a/media-sound/mixxx/mixxx-2.1.3.ebuild 
b/media-sound/mixxx/mixxx-2.1.3.ebuild
new file mode 100644
index 000..465a2c26cde
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}" ==  ]] ; 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
+)
+
+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 ]] 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-06-19 Thread Lars Wendler
commit: e0056001f611c8a644fd713bc5741d3a9e7e3595
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun 19 09:52:55 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun 19 09:52:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0056001

media-sound/mixxx: Synced live ebuild.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/mixxx/mixxx-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
index 6ab9fb77f7c..89b59a96ab6 100644
--- a/media-sound/mixxx/mixxx-.ebuild
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -125,7 +125,7 @@ src_compile() {
 src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-   install_root="${ED}"/usr install
+   install_root="${ED%/}"/usr install
 
dodoc README Mixxx-Manual.pdf
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-06-19 Thread Lars Wendler
commit: 19d96955ba707bbffb732c10b3536731d839065c
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun 19 09:28:27 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun 19 09:49:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d96955

media-sound/mixxx: Bump to version 2.1.1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/mixxx-2.1.1.ebuild | 131 +++
 2 files changed, 132 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 4bc6ce33900..69703d864ab 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,3 +2,4 @@ DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 
00c5cdc233262e64fa52abcc97fc15d1347a
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B 
ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205
 SHA512 
7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B 
a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00
 SHA512 
8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
 DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 
7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567
 SHA512 
d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
+DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B 
cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166
 SHA512 
c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20

diff --git a/media-sound/mixxx/mixxx-2.1.1.ebuild 
b/media-sound/mixxx/mixxx-2.1.1.ebuild
new file mode 100644
index 000..89b59a96ab6
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}" ==  ]] ; 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=
+   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
+)
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-05-10 Thread Lars Wendler
commit: 4e20c01201f98332289d843bc9c0b1084616d52a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 10 22:02:12 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 10 22:08:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e20c012

media-sound/mixxx: Revbump fixing opus automagic.

Closes: https://bugs.gentoo.org/637424
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-sound/mixxx/{mixxx-2.0.0-r4.ebuild => mixxx-2.0.0-r5.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
similarity index 95%
rename from media-sound/mixxx/mixxx-2.0.0-r4.ebuild
rename to media-sound/mixxx/mixxx-2.0.0-r5.ebuild
index d8a4bb17998..a8fcb5ca5c8 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI+=" 
https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772a
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"
+IUSE="aac debug 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
@@ -56,6 +56,7 @@ RDEPEND="
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= )
@@ -120,6 +121,7 @@ src_configure() {
m4a="$(usex mp4 1 0)"
mad="$(usex mp3 1 0)"
optimize="${myoptimize}"
+   opus="$(usex opus 1 0)"
qdebug="$(usex debug 1 0)"
qt5=1
shoutcast="$(usex shout 1 0)"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-05-10 Thread Lars Wendler
commit: d4c8bfa924b8b2f70914eaf9eb34b90107275d6c
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 10 22:08:04 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 10 22:08:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c8bfa9

media-sound/mixxx: Added live ebuild.

Closes: https://bugs.gentoo.org/631988
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-sound/mixxx/mixxx-.ebuild | 131 
 1 file changed, 131 insertions(+)

diff --git a/media-sound/mixxx/mixxx-.ebuild 
b/media-sound/mixxx/mixxx-.ebuild
new file mode 100644
index 000..6ab9fb77f7c
--- /dev/null
+++ b/media-sound/mixxx/mixxx-.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}" ==  ]] ; 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=
+   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
+)
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2018-05-10 Thread Lars Wendler
commit: 6ff404a723a95fec30cbb336a8fb2e71aa3aed49
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 10 22:00:04 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 10 22:08:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff404a7

media-sound/mixxx: Bump to version 2.1.0

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-sound/mixxx/Manifest   |   1 +
 media-sound/mixxx/metadata.xml   |   1 +
 media-sound/mixxx/mixxx-2.1.0.ebuild | 127 +++
 3 files changed, 129 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index f983abfc547..4bc6ce33900 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,3 +1,4 @@
 DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 
00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b
 SHA512 
60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B 
ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205
 SHA512 
7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B 
a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00
 SHA512 
8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
+DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 
7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567
 SHA512 
d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 4627d1b0b25..3c563007a7b 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,6 +7,7 @@


Enable HID controller support
+   Enable support for opus codec via 
media-libs/opusfile.
Enable broadcasting support via 
media-libs/libshout



diff --git a/media-sound/mixxx/mixxx-2.1.0.ebuild 
b/media-sound/mixxx/mixxx-2.1.0.ebuild
new file mode 100644
index 000..ff679b82348
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/;
+#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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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=
+   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
+"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.0-docs.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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/

2017-12-03 Thread Patrice Clement
commit: bb7eb5e793651709ca29431a1933d01c86e890a5
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Dec  3 08:56:24 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec  3 23:39:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7eb5e7

media-sound/mixxx: remove unused patches.

 media-sound/mixxx/files/mixxx-1.10.0-cflags.patch  |  13 --
 media-sound/mixxx/files/mixxx-1.10.0-docs.patch|  10 -
 media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch  |  37 
 .../mixxx/files/mixxx-1.10.0-system-libs.patch | 172 
 media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch  |  35 
 .../mixxx/files/mixxx-1.11.0-system-libs.patch | 223 -
 6 files changed, 490 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch 
b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
deleted file mode 100644
index b6c8655a73a..000
--- a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 mixxx-1.10.0/build/depends.py
-+++ mixxx-1.10.0/build/depends.py
-@@ -623,10 +555,8 @@
- if build.toolchain_is_gnu:
- # Default GNU Options
- # TODO(XXX) always generate debugging info?
--build.env.Append(CCFLAGS = '-pipe')
- build.env.Append(CCFLAGS = '-Wall')
- build.env.Append(CCFLAGS = '-Wextra')
--build.env.Append(CCFLAGS = '-g')
- 
- # Check that g++ is present (yeah, SCONS is a bit dumb here)
- if os.system("which g++ > /dev/null"): #Checks for non-zero 
return code

diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch 
b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
deleted file mode 100644
index c9205179881..000
--- a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 mixxx-1.10.0/src/SConscript
-+++ mixxx-1.10.0/src/SConscript
-@@ -219,7 +218,6 @@
-   env.Alias('install', keyboardmappings)
-   if int(flags['ladspa']):
-   env.Alias('install', ladspapresets)
--  env.Alias('install', docs)
-   env.Alias('install', dotdesktop)
-   env.Alias('install', icon)
-   env.Alias('install', promotracks)

diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch 
b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
deleted file mode 100644
index 40f32266bb5..000
--- a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
 mixxx-1.10.0/src/SConscript.env
-+++ mixxx-1.10.0/src/SConscript.env
-@@ -19,21 +19,6 @@
- print "Deleting deprecated build file: %s" % defs
- os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing 
this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything 
:)
--f = open("build.h","w")
--try:
--branch_name = util.get_bzr_branch_name()
--modified = util.get_bzr_modified() > 0
--# Do not emit BUILD_BRANCH on release branches.
--if not branch_name.startswith('release'):
--f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
--f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
--'+' if modified else ''))
--finally:
--f.close()
--
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, 
['-h', '--help']):
- conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : 
util.CheckForPKGConfig,
 mixxx-1.10.0/src/SConscript
-+++ mixxx-1.10.0/src/SConscript
-@@ -12,8 +12,8 @@
- from build import util
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []

diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch 
b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
deleted file mode 100644
index d2e21f3e005..000
--- a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
+++ /dev/null
@@ -1,172 +0,0 @@
 mixxx-1.10.0/build/depends.py
-+++ mixxx-1.10.0/build/depends.py
-@@ -21,7 +21,7 @@
- 
- def configure(self, build, conf):
- #Check for PortTime
--if not conf.CheckLib(['porttime', 'libporttime']) and \
-+if not conf.CheckLib(['porttime', 'libportmidi']) and \
- not conf.CheckHeader(['porttime.h']):
- raise Exception("Did not find PortTime or its development 
headers.")
- if not conf.CheckLib(['portmidi', 'libportmidi']) and \
-@@ -189,25 +189,10 @@
- 
- class FidLib(Dependence):
- 
--def sources(self, build):
--

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2017-08-31 Thread Tim Harder
commit: be891509537eaa8d4f4f8c4de51a2937c673de3b
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 13:15:47 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 13:15:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be891509

media-sound/mixxx: use https for HOMEPAGE and SRC_URI

 media-sound/mixxx/mixxx-2.0.0-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
index 1d968f368e3..d8a4bb17998 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic scons-utils toolchain-funcs
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="http://www.mixxx.org/;
-SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz;
+HOMEPAGE="https://www.mixxx.org/;
+SRC_URI="https://downloads.${PN}.org/${P}/${P}-src.tar.gz;
 
 # Upstream patches
 SRC_URI+=" 
https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch
 -> ${PN}-2.0.0-ffmpeg30.patch"



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2017-08-10 Thread Lars Wendler
commit: a97286de5285e5dcb4f707c5fa3b24c5a5ed8c21
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 10 23:55:26 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 10 23:55:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286de

media-sound/mixxx: Fixed build with recent sqlite versions (bug #622776).

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch | 14 ++
 media-sound/mixxx/mixxx-2.0.0-r4.ebuild   |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
new file mode 100644
index 000..a8cb15e63c6
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/622776
+
+--- mixxx-2.0.0/src/library/trackcollection.h
 mixxx-2.0.0/src/library/trackcollection.h
+@@ -34,8 +34,7 @@
+ #include "library/dao/libraryhashdao.h"
+ 
+ #ifdef __SQLITE3__
+-typedef struct sqlite3_context sqlite3_context;
+-typedef struct Mem sqlite3_value;
++#include 
+ #endif
+ 
+ class TrackInfoObject;

diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
index 3b71fc236f6..1d968f368e3 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
@@ -77,6 +77,8 @@ PATCHES=(
"${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



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2017-07-01 Thread Michael Palimaka
commit: 4bc4e70ab2ac5f747e554fff50f003fbe8878693
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jul  1 10:04:20 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jul  1 10:05:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc4e70a

media-sound/mixxx: remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/mixxx/Manifest   |   2 -
 media-sound/mixxx/metadata.xml   |   1 -
 media-sound/mixxx/mixxx-1.10.1.ebuild|  84 -
 media-sound/mixxx/mixxx-1.11.0-r1.ebuild |  97 
 media-sound/mixxx/mixxx-2.0.0-r3.ebuild  | 126 ---
 5 files changed, 310 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index cb3150a1e72..6ecb5227750 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,3 @@
-DIST mixxx-1.10.1-src.tar.gz 15948956 SHA256 
eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 SHA512 
eff18cba96d781830d33a35cf74dcac0dc33c9d2c16e9533d171d2acc2fd0ad602f5bb46d62212e224e61357332a5d9ed078ca86532f39ee01057eb3aaf09af3
 WHIRLPOOL 
39fda17c512030da1c4de4e495ad22ff9fda9b5aeccfcdd3a7f35d08ebed79c2e6655bef409a43bfd25a072a01e3512669a566048f40b46c9d1c3143f58f821c
-DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 
00961b5d6c1e6d6686d76e55de474b943bbeff4e59b1633d9940dc1b0331 SHA512 
a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2
 WHIRLPOOL 
9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
 DIST mixxx-2.0.0-ffmpeg30.patch 714 SHA256 
a5b6e8fd94ae6572efbff79529dcdb8ec2fc78a2c8fc0864d222516c8dc7b272 SHA512 
60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
 WHIRLPOOL 
8c780336a5f86ba8134603c1f5e3dd310006f62abe228edb2390e611f2734b0ee7c0bfe5cd91de7fab28e56809804c95fd26da6d198513fc705263e8ceca1612
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 SHA256 
d03109463fa1191ca07bc2be6b6503c4b57272e97064f99aae812e132737f905 SHA512 
7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 WHIRLPOOL 
9284dd52c4ffe04ca7977dc4ee1b6c3a6396375a48dcb9673f39a5ceb2698021f93984d57a774b36b3dfaffa15f9ca603eeae169fa146e9951da0a587fed34dd
 DIST mixxx-2.0.0-src.tar.gz 25300881 SHA256 
e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d SHA512 
8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
 WHIRLPOOL 
d3e4cf26846b54380f9b11eed26b90cf031a902ca82f20e71f85fb495f99179e8d783f2ba92b51d21fcc77d4779b7bcc16d8456a68e890cfe77daa57f0d3b431

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 127ec81d774..4627d1b0b25 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -8,7 +8,6 @@

Enable HID controller support
Enable broadcasting support via 
media-libs/libshout
-   Enable vamp analyzing plugins support


mixxx

diff --git a/media-sound/mixxx/mixxx-1.10.1.ebuild 
b/media-sound/mixxx/mixxx-1.10.1.ebuild
deleted file mode 100644
index 8f02fbc767f..000
--- a/media-sound/mixxx/mixxx-1.10.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib scons-utils toolchain-funcs
-
-DESCRIPTION="A Qt based Digital DJ tool"
-HOMEPAGE="http://mixxx.sourceforge.net;
-SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac debug doc mp3 pulseaudio shout wavpack"
-
-RDEPEND="media-libs/fidlib
-   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/taglib
-   virtual/glu
-   virtual/opengl
-   dev-qt/qtgui:4
-   dev-qt/qtopengl:4
-   dev-qt/qtsql:4
-   dev-qt/qtsvg:4
-   dev-qt/qtwebkit:4
-   dev-qt/qtxmlpatterns:4
-   aac? (
-   media-libs/faad2
-   media-libs/libmp4v2:0
-   )
-   mp3? ( media-libs/libmad )
-   pulseaudio? ( media-sound/pulseaudio )
-   shout? ( media-libs/libshout )
-   wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.10.0-system-libs.patch
-   epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch
-   epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch
-   epatch "${FILESDIR}"/${PN}-1.10.0-no-bzr.patch
-
-   # use 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2017-06-30 Thread Agostino Sarubbo
commit: 08df409628b39da92eb414d156353fb043b723ed
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 30 11:09:15 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 30 11:09:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08df4096

media-sound/mixxx: x86 stable wrt bug #620712

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/mixxx/mixxx-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
index 386297dae6f..3b71fc236f6 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" 
https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 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



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2017-06-25 Thread Agostino Sarubbo
commit: c717a52911c170529c201ba08cd150f7e7662cb7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 25 16:32:08 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 25 16:32:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c717a529

media-sound/mixxx: amd64 stable wrt bug #620712

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/mixxx/mixxx-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
index a67c794493a..386297dae6f 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" 
https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 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



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2017-05-06 Thread Lars Wendler
commit: 13cb9bf35c722ff7207da51ecdd16d24df710aab
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat May  6 22:50:37 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat May  6 22:51:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cb9bf3

media-sound/mixxx: Revbump to fix compilation with gcc-6 (bug #595090).

This revbump also comes with a couple of fixes backported and provided
by David Guglielmi (sunny-overlay) in bug #608430.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 ...nate-unnecessary-heap-allocation-of-qtime.patch |  55 
 ...xx-2.0.0-fix-formatting-of-time-durations.patch |  24 ++
 ...x-2.0.0-fix-formatting-of-time-durations2.patch | 139 ++
 ...-2.0.0-fix-missing-pointer-initialization.patch | 271 
 media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch|  24 ++
 ...n-of-time-formatseconds-into-dot-cpp-file.patch |  88 +++
 ...xx-2.0.0-rmx2-backport-controller-scripts.patch | 280 +
 media-sound/mixxx/mixxx-2.0.0-r4.ebuild| 140 +++
 8 files changed, 1021 insertions(+)

diff --git 
a/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
 
b/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
new file mode 100644
index 000..04538a01e15
--- /dev/null
+++ 
b/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
@@ -0,0 +1,55 @@
+diff -dNur a/src/analyserwaveform.cpp b/src/analyserwaveform.cpp
+--- a/src/analyserwaveform.cpp 2015-12-29 17:10:41.0 +0100
 b/src/analyserwaveform.cpp 2017-02-04 21:12:30.127952910 +0100
+@@ -1,6 +1,3 @@
+-#include 
+-#include 
+-#include 
+ #include 
+ 
+ #include "analyserwaveform.h"
+@@ -40,7 +37,6 @@
+ }
+ }
+ 
+-m_timer = new QTime();
+ m_analysisDao = new AnalysisDao(m_database, pConfig);
+ }
+ 
+@@ -48,14 +44,13 @@
+ qDebug() << "AnalyserWaveform::~AnalyserWaveform()";
+ destroyFilters();
+ m_database.close();
+-delete m_timer;
+ delete m_analysisDao;
+ }
+ 
+ bool AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int 
totalSamples) {
+ m_skipProcessing = false;
+ 
+-m_timer->start();
++m_timer.start();
+ 
+ if (totalSamples == 0) {
+ qWarning() << "AnalyserWaveform::initialise - no waveform/waveform 
summary";
+@@ -320,7 +315,7 @@
+ #endif
+ 
+ qDebug() << "Waveform generation for track" << tio->getId() << "done"
+- << m_timer->elapsed()/1000.0 << "s";
++ << m_timer.elapsed()/1000.0 << "s";
+ }
+ 
+ void AnalyserWaveform::storeIfGreater(float* pDest, float source) {
+diff -dNur a/src/analyserwaveform.h b/src/analyserwaveform.h
+--- a/src/analyserwaveform.h   2015-12-29 17:10:41.0 +0100
 b/src/analyserwaveform.h   2017-02-04 21:12:45.367713395 +0100
+@@ -171,7 +171,7 @@
+ EngineFilterIIRBase* m_filter[FilterCount];
+ std::vector m_buffers[FilterCount];
+ 
+-QTime* m_timer;
++QTime m_timer;
+ QSqlDatabase m_database;
+ AnalysisDao* m_analysisDao;
+ 

diff --git 
a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch
new file mode 100644
index 000..654c01f53b9
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch
@@ -0,0 +1,24 @@
+From 76c53b0f0a2be7b5cf85fa523f3521a5725affb2 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz 
+Date: Fri, 8 Jan 2016 18:22:33 +0100
+Subject: [PATCH] Fix formatting of time durations
+
+---
+ src/util/time.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/time.h b/src/util/time.h
+index 29187ad..7b38eb4 100644
+--- a/src/util/time.h
 b/src/util/time.h
+@@ -75,7 +75,9 @@ class Time {
+ const int days = static_cast(dSeconds) / kSecondsPerDay;
+ dSeconds -= days * kSecondsPerDay;
+ 
+-QTime t = QTime().addMSecs(dSeconds * kMillisPerSecond);
++// NOTE(uklotzde): Time() constructs a 'null' object, but
++// we need 'zero' here.
++QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
+ 
+ QString formatString =
+ (days > 0 ? (QString::number(days) %

diff --git 
a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch
new file mode 100644
index 000..f8c041e4043
--- /dev/null
+++ 
b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch
@@ -0,0 +1,139 @@
+diff -dNur a/src/library/basesqltablemodel.cpp 
b/src/library/basesqltablemodel.cpp
+--- a/src/library/basesqltablemodel.cpp2015-12-29 17:10:41.0 
+0100
 b/src/library/basesqltablemodel.cpp2017-02-04 21:33:39.403861857 
+0100
+@@ -559,7 +559,7 @@
+ if (column == 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

2017-01-18 Thread Lars Wendler
commit: 8a278563748e136559a6cc193ae3895c6412c882
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 18 22:04:49 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 18 23:36:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a278563

media-sound/mixxx: Fixed compilation with >=media-libs/chromaprint-1.4

Fixes Gentoo bug #604528

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch  | 40 ++
 media-sound/mixxx/mixxx-2.0.0-r3.ebuild|  3 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
new file mode 100644
index ..77827f3
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
@@ -0,0 +1,40 @@
+Backported chromaprint-1.4 API changes based on the fix suggested in:
+https://github.com/mixxxdj/mixxx/pull/1073
+
+and the work done by Charlie Gehlin in:
+https://bugs.gentoo.org/604528
+
+--- mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
 mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
+@@ -25,6 +25,16 @@
+ 
+ QString ChromaPrinter::calcFingerPrint(const Mixxx::SoundSourcePointer& 
pSoundSource) {
+ 
++// Type declarations of *fprint and *encoded pointers need to account for 
Chromaprint API version
++// (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 
or later -- alyptik 12/2016
++#if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
++  typedef uint32_t* uint32_p;
++  typedef char* char_p;
++#else
++  typedef void* uint32_p;
++  typedef void* char_p;
++#endif
++
+ // this is worth 2min of audio, multiply by 2 because we have 2 channels
+ // AcoustID only stores a fingerprint for the first two minutes of a song
+ // on their server so we need only a fingerprint of the first two minutes
+@@ -57,12 +67,12 @@
+ }
+ chromaprint_finish(ctx);
+ 
+-void* fprint = NULL;
++uint32_p fprint = NULL;
+ int size = 0;
+ int ret = chromaprint_get_raw_fingerprint(ctx, , );
+ QByteArray fingerprint;
+ if (ret == 1) {
+-void* encoded = NULL;
++char_p encoded = NULL;
+ int encoded_size = 0;
+ chromaprint_encode_fingerprint(fprint, size,
+CHROMAPRINT_ALGORITHM_DEFAULT,

diff --git a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
index 3856e2e..c9ae13a 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.0.0-docs.patch
"${DISTDIR}"/${P}-ffmpeg30.patch
"${DISTDIR}"/${P}-ffmpeg31.patch
+   "${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/

2017-01-03 Thread Patrice Clement
commit: 67d074551394266ce44c1330fbce01b8113c79ba
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Jan  1 15:41:03 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan  3 23:05:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d07455

media-sound/mixxx: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/3297

 .../mixxx/files/mixxx-2.0.0-system-libs.patch  | 158 -
 1 file changed, 158 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch 
b/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch
deleted file mode 100644
index f0c86c8..
--- a/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -Naur mixxx-2.0.0/build/depends.py mixxx-2.0.0_patch/build/depends.py
 mixxx-2.0.0/build/depends.py   2015-12-29 08:10:41.0 -0800
-+++ mixxx-2.0.0_patch/build/depends.py 2016-01-11 20:23:40.641866196 -0800
-@@ -369,25 +369,10 @@
- 
- class FidLib(Dependence):
- 
--def sources(self, build):
--symbol = None
--if build.platform_is_windows:
--if build.toolchain_is_msvs:
--symbol = 'T_MSVC'
--elif build.crosscompile:
--# Not sure why, but fidlib won't build with mingw32msvc and
--# T_MINGW
--symbol = 'T_LINUX'
--elif build.toolchain_is_gnu:
--symbol = 'T_MINGW'
--else:
--symbol = 'T_LINUX'
--
--return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
--   CPPDEFINES=symbol)]
--
- def configure(self, build, conf):
--build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
-+if not conf.CheckLib('fidlib'):
-+raise Exception('Did not find fidlib library, exiting!')
-+build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + 
'/include/fidlib'])
- 
- 
- class ReplayGain(Dependence):
-@@ -400,42 +385,17 @@
- 
- 
- class SoundTouch(Dependence):
--SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
- 
- def sources(self, build):
--return ['engine/enginebufferscalest.cpp',
--'#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--# SoundTouch CPU optimizations are only for x86
--# architectures. SoundTouch automatically ignores these files
--# when it is not being built for an architecture that supports
--# them.
--'#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--'#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH]
-+return ['engine/enginebufferscalest.cpp']
- 
- def configure(self, build, conf, env=None):
- if env is None:
- env = build.env
--env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--# Prevents circular import.
--from features import Optimize
--
--# If we do not want optimizations then disable them.
--optimize = (build.flags['optimize'] if 'optimize' in build.flags
--else Optimize.get_optimization_level(build))
--if optimize == Optimize.LEVEL_OFF:
--env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
-+if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+raise Exception('Did not find SoundTouch library, exiting!')
-+build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + 
'/include/soundtouch'])
-+build.env.Append(LIBS='SoundTouch')
- 
- 
- class RubberBand(Dependence):
-diff -Naur mixxx-2.0.0/build/features.py mixxx-2.0.0_patch/build/features.py
 mixxx-2.0.0/build/features.py  2015-12-29 08:10:41.0 -0800
-+++ mixxx-2.0.0_patch/build/features.py2016-01-11 20:27:05.342990424 
-0800
-@@ -62,10 +62,6 @@
- def configure(self, build, conf):
- if not self.enabled(build):
- return
--# TODO(XXX) allow external hidapi install, but for now we just use our
--# internal one.
--build.env.Append(
--CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
- 
- if 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2016-12-09 Thread Lars Wendler
commit: 6d6ed0bed1c82084cebb16f098e26eb48f891683
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec  9 08:47:52 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec  9 08:58:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6ed0be

media-sound/mixxx: Added sub-slot dep for dev-libs/protobuf.

Package-Manager: portage-2.3.3

 media-sound/mixxx/mixxx-2.0.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
index 705eeb2..3856e2e 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
@@ -22,7 +22,7 @@ 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
-   dev-libs/protobuf
+   dev-libs/protobuf:0=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5



[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2016-10-23 Thread David Seifert
commit: 3551b9af4d1ac2f5d9dc2e540a032eb6088307aa
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 15:34:59 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct 23 09:40:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3551b9af

media-sound/mixxx: Drop old

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2631

Signed-off-by: David Seifert  gentoo.org>

 media-sound/mixxx/mixxx-2.0.0-r2.ebuild | 145 
 1 file changed, 145 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r2.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r2.ebuild
deleted file mode 100644
index 9baebd1..
--- a/media-sound/mixxx/mixxx-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2016 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="A advanced Digital DJ tool based on Qt"
-HOMEPAGE="http://www.mixxx.org/;
-SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz;
-
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac debug doc hid mp3 mp4 qt4 +qt5 shout wavpack ffmpeg"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="dev-db/sqlite
-   virtual/libusb:1
-   dev-libs/protobuf
-   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
-   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:= )
-   qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   dev-qt/qtopengl:4
-   dev-qt/qtscript:4
-   dev-qt/qtsql:4
-   dev-qt/qtsvg:4
-   )
-   qt5? (
-   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
-   )
-   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}
-   sci-libs/fftw:3.0
-   virtual/pkgconfig
-   qt5? (
-   dev-qt/qttest:5
-   dev-qt/qtxmlpatterns:5
-   )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.0-docs.patch
-   "${DISTDIR}"/${P}-ffmpeg30.patch
-   "${DISTDIR}"/${P}-ffmpeg31.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 myqtdir=qt5
-   local myoptimize=0
-
-   if use qt4 ; then
-   myqtdir="qt4"
-   fi
-
-   if use qt5 ; then
-   # Required for >=qt-5.7.0 (bug #590690)
-   append-cxxflags -std=c++11
-   fi
-
-   # 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)/${myqtdir}"
-   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}"
-   qdebug="$(usex debug 1 0)"
-   qt5="$(usex qt5 1 0)"
-   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)" 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

2016-10-23 Thread David Seifert
commit: c343e9714a8ba66d50594529228d433ba60bd3a5
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 13:57:52 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct 23 09:39:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c343e971

media-sound/mixxx: Unconditionally build with Qt5

Get rid of unnecessary REQUIRED_USE.
Sort USE and RDEPEND.
Add fftw to RDEPEND with slot op.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2631

Signed-off-by: David Seifert  gentoo.org>

 media-sound/mixxx/mixxx-2.0.0-r3.ebuild | 126 
 1 file changed, 126 insertions(+)

diff --git a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild 
b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
new file mode 100644
index ..705eeb2
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 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/;
+SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz;
+
+# 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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
+   dev-libs/protobuf
+   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=
+   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:= )
+   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
+   "${DISTDIR}"/${P}-ffmpeg30.patch
+   "${DISTDIR}"/${P}-ffmpeg31.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}"
+   qdebug="$(usex debug 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
+}



  1   2   >