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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2016-07-21 21:16 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2016-07-21 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     9723eefbe026f6ce88b084de3a9637a054d88661
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 21:16:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 21:16:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9723eefb

media-sound/mixxx: Bump to version 2.0.0

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/mixxx/Manifest                     |  1 +
 media-sound/mixxx/files/mixxx-2.0.0-docs.patch | 10 +++
 media-sound/mixxx/mixxx-2.0.0.ebuild           | 86 ++++++++++++++++++++++++++
 3 files changed, 97 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index abcdcd8..ca29669 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,2 +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 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
+DIST mixxx-2.0.0-src.tar.gz 25300881 SHA256 e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a WHIRLPOOL d3e4cf26846b54380f9b11eed26b90cf031a902ca82f20e71f85fb495f99179e8d783f2ba92b51d21fcc77d4779b7bcc16d8456a68e890cfe77daa57f0d3b431

diff --git a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
new file mode 100644
index 0000000..702ce6c
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
@@ -0,0 +1,10 @@
+--- mixxx-9999/src/SConscript
++++ mixxx-9999/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/mixxx-2.0.0.ebuild b/media-sound/mixxx/mixxx-2.0.0.ebuild
new file mode 100644
index 0000000..f93d439
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc hid mp3 mp4 shout wavpack ffmpeg"
+
+RDEPEND="dev-db/sqlite
+	dev-libs/libusb:1
+	dev-libs/protobuf
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	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:= )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize=native
+		qdebug="$(usex debug 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)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2016-07-22  0:22 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2016-07-22  0:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6abca74d6a9f9b8a44bd884faecbce9a1cd27bf7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 00:20:03 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 00:21:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abca74d

media-sound/mixxx: Added qt5 support.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../mixxx/files/mixxx-2.0.0-system-libs.patch      | 158 +++++++++++++++++++++
 .../{mixxx-2.0.0.ebuild => mixxx-2.0.0-r1.ebuild}  |  53 +++++--
 2 files changed, 202 insertions(+), 9 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
new file mode 100644
index 0000000..f0c86c8
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-system-libs.patch
@@ -0,0 +1,158 @@
+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.000000000 -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.000000000 -0800
++++ mixxx-2.0.0_patch/build/features.py	2016-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 build.platform_is_linux:
+             build.env.ParseConfig(
+@@ -90,23 +86,17 @@
+ 
+         build.env.Append(CPPDEFINES='__HID__')
+ 
++        if not conf.CheckLib('hidapi-libusb'):
++            raise Exception('Did not find HID API library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
++        build.env.Append(LIBS='hidapi-libusb')
++
++
+     def sources(self, build):
+         sources = ['controllers/hid/hidcontroller.cpp',
+                    'controllers/hid/hidenumerator.cpp',
+                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
+ 
+-        if build.platform_is_windows:
+-            # Requires setupapi.lib which is included by the above check for
+-            # setupapi.
+-            sources.append(
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
+-        elif build.platform_is_linux:
+-            # hidapi compiles the libusb implementation by default on Linux
+-            sources.append(
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
+-        elif build.platform_is_osx:
+-            sources.append(
+-                os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
+         return sources
+ 
+ 
+@@ -745,24 +735,15 @@
+             test_env.Append(CCFLAGS='-pthread')
+             test_env.Append(LINKFLAGS='-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.7.0")
+-        # gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        # build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example,
+-        # optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.7.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.7.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
+-        # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
+-
+-        env.SConscript(env.File('SConscript', gmock_dir))
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
++
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+ 
+         return []
+ 

diff --git a/media-sound/mixxx/mixxx-2.0.0.ebuild b/media-sound/mixxx/mixxx-2.0.0-r1.ebuild
similarity index 63%
rename from media-sound/mixxx/mixxx-2.0.0.ebuild
rename to media-sound/mixxx/mixxx-2.0.0-r1.ebuild
index f93d439..ffe8c33 100644
--- a/media-sound/mixxx/mixxx-2.0.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r1.ebuild
@@ -13,17 +13,14 @@ SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac debug doc hid mp3 mp4 shout wavpack ffmpeg"
+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
 	dev-libs/libusb:1
 	dev-libs/protobuf
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
 	media-libs/chromaprint
 	media-libs/flac
 	media-libs/libid3tag
@@ -45,27 +42,65 @@ RDEPEND="dev-db/sqlite
 	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 )"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	sci-libs/fftw:3.0
+	virtual/pkgconfig
+	qt5? ( dev-qt/qtxmlpatterns:5 )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+	#"${FILESDIR}"/${PN}-2.0.0-system-libs.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
+	if use qt4 ; then
+		myqtdir="qt4"
+	fi
+
 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
+		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=native
 		qdebug="$(usex debug 1 0)"
+		qt5="$(usex qt5 1 0)"
 		shoutcast="$(usex shout 1 0)"
 		vinylcontrol=1
 		wv="$(usex wavpack 1 0)"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2018-12-26  0:04 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-12-26  0:04 UTC (permalink / raw
  To: gentoo-commits

commit:     a4f0694c7e378b3ff0c2241a1cfacc8a683b2921
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 26 00:03:30 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Dec 26 00:03:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f0694c

media-sound/mixxx: Bump to version 2.2.0

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

 media-sound/mixxx/Manifest                         |   1 +
 .../mixxx/files/mixxx-2.2.0-lilv_include_fix.patch |  33 +++++
 media-sound/mixxx/mixxx-2.2.0.ebuild               | 133 +++++++++++++++++++++
 3 files changed, 167 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 04685a35bc1..5850046889c 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,3 +1,4 @@
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51 SHA512 082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8
 DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4 SHA512 f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
+DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134

diff --git a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
new file mode 100644
index 00000000000..4addc98b1e1
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
@@ -0,0 +1,33 @@
+--- mixxx-release-2.2.0/src/effects/lv2/lv2backend.h
++++ mixxx-release-2.2.0/src/effects/lv2/lv2backend.h
+@@ -5,7 +5,7 @@
+ #include "effects/effectsbackend.h"
+ #include "effects/lv2/lv2manifest.h"
+ #include "preferences/usersettings.h"
+-#include <lilv-0/lilv/lilv.h>
++#include <lilv/lilv.h>
+ 
+ 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 <lilv-0/lilv/lilv.h>
++#include <lilv/lilv.h>
+ #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 <lilv-0/lilv/lilv.h>
++#include <lilv/lilv.h>
+ 
+ class LV2Manifest {
+   public:

diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild b/media-sound/mixxx/mixxx-2.2.0.ebuild
new file mode 100644
index 00000000000..de84f4ec868
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED%/}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2020-01-24 22:48 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-01-24 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d68b84ea00dcc1a0e29d99ce8c07d0c76a72e720
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 21:57:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 22:47:56 2020 +0000
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 <asturm <AT> 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 00000000000..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" <s.brandt@mixxx.org>
+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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#c5d11f"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#378df7"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#939393"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#939393"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#c5d11f"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#c5d11f"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#ffb108"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#ffb108"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#378df7"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#378df7"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#e02f00"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#e02f00"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#939393"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#939393"/>
++</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 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#c5d11f"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#c5d11f"/>
++</svg>
+diff --git a/res/skins/Deere/handle-vertical-orange.svg b/res/skins/Deere/handle-vertical-orange.svg
+index 1b6b91152df..10f79b79b87 100644
+--- a/res/skins/Deere/handle-vertical-orange.svg
++++ b/res/skins/Deere/handle-vertical-orange.svg
+@@ -1,2 +1,6 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#e3ca1f"/><rect id="rect5888" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#ffb108"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#ffb108"/>
++</svg>
+diff --git a/res/skins/Deere/handle-vertical-purple.svg b/res/skins/Deere/handle-vertical-purple.svg
+index c606eac9b8c..1ccd440a239 100644
+--- a/res/skins/Deere/handle-vertical-purple.svg
++++ b/res/skins/Deere/handle-vertical-purple.svg
+@@ -1,2 +1,6 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#f2d440"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
++ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#f2d440"/>
++</svg>
+diff --git a/res/skins/Deere/slider-crossfader-AutoDJ.svg b/res/skins/Deere/slider-crossfader-AutoDJ.svg
+index 3d4ee50b5a6..281dd06c32a 100644
+--- a/res/skins/Deere/slider-crossfader-AutoDJ.svg
++++ b/res/skins/Deere/slider-crossfader-AutoDJ.svg
+@@ -1 +1,5 @@
+-<svg id="svg2" width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect2984" x="3.9767" y="12.759" width="172.05" height="14.483" color="#000000" fill="#f60"/><!-- marker lines every 5px --><!-- end marker --><!-- quarter marker --><!-- middle marker --><!-- quarter marker --><!-- end marker --></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <rect x="1" y="12" width="178" height="16" color="#000000" fill="#f60"/>
++</svg>
+diff --git a/res/skins/Deere/slider-crossfader.svg b/res/skins/Deere/slider-crossfader.svg
+index 3ff945454de..ac5cb8cb52b 100644
+--- a/res/skins/Deere/slider-crossfader.svg
++++ b/res/skins/Deere/slider-crossfader.svg
+@@ -1,2 +1,6 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4167" transform="rotate(90)" x="12.633" y="-176.2" width="14.734" height="172.4" rx=".92518" ry="1.0809" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/><path id="path4175" d="m170.32 18.062h-160.64v3.875h160.64v-3.875z" fill="#222" stroke="#222" stroke-linecap="round" stroke-width="2.5"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <rect x="1.75" y="12.75" width="176.5" height="14.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/>
++ <path d="m6.4826 20h167.03z" fill="none" stroke="#222" stroke-width="6"/>
++</svg>
+diff --git a/res/skins/Deere/slider-vertical.svg b/res/skins/Deere/slider-vertical.svg
+index 6876b84e028..30bc5061623 100644
+--- a/res/skins/Deere/slider-vertical.svg
++++ b/res/skins/Deere/slider-vertical.svg
+@@ -1,2 +1,6 @@
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg id="svg2" width="40" height="162" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4167" x="12.633" y="1.25" width="14.734" height="159.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/><path id="path4175" transform="translate(0,-9)" d="m18.062 15.688v148.62h3.875v-148.62h-3.875z" fill="#222" stroke="#222" stroke-linecap="round" stroke-width="2.5"/></svg>
++<?xml version="1.0" encoding="UTF-8"?>
++<svg width="40" height="162" version="1.1" xmlns="http://www.w3.org/2000/svg">
++ <style/>
++ <rect x="12.75" y="1.75" width="14.5" height="158.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/>
++ <path d="m20 156v-150z" fill="none" stroke="#222" stroke-width="6"/>
++</svg>
+
+From 8d1e0e2aabb8c95c0ca06faa93d50dbc75f537db Mon Sep 17 00:00:00 2001
+From: "S.Brandt" <s.brandt@mixxx.org>
+Date: Fri, 17 Jan 2020 13:05:25 +0100
+Subject: [PATCH 2/2] Deere skin:  Add maximum size for the crossfader slider
+ image to stop the crossfader handle from overflowing the background graphic.
+
+---
+ res/skins/Deere/mixer.xml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
+index b27e3e8b4e0..315d1f30709 100644
+--- a/res/skins/Deere/mixer.xml
++++ b/res/skins/Deere/mixer.xml
+@@ -122,6 +122,7 @@
+                       <SliderComposed>
+                         <TooltipId>crossfader</TooltipId>
+                         <Size>1me,40f</Size>
++                        <MaximumSize>200,40</MaximumSize>
+                         <Slider scalemode="STRETCH">slider-crossfader.svg</Slider>
+                         <Handle scalemode="STRETCH_ASPECT">handle-crossfader-orange.svg</Handle>
+                         <Horizontal>true</Horizontal>

diff --git a/media-sound/mixxx/mixxx-2.2.3-r1.ebuild b/media-sound/mixxx/mixxx-2.2.3-r1.ebuild
new file mode 100644
index 00000000000..d6c94204c6f
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.3-r1.ebuild
@@ -0,0 +1,138 @@
+# 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}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid 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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2020-06-08  9:19 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-06-08  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     cb4e45189b1db64a8d509eb767160bf5ebc0e2f4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 09:19:15 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 09:19:24 2020 +0000
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 <polynomial-c <AT> 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 00000000000..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 00000000000..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}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid 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}"/${PN}-2.2.0-lilv_include_fix.patch
+	"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
+	"${FILESDIR}"/${PN}-2.2.4-metadata.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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2020-08-11  7:27 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-08-11  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     714f6ee85781670b29190f2eb1744d0cabe2409e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 07:27:05 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 07:27:20 2020 +0000
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 <fordfrog <AT> 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-9999.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..00000000000
--- 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 <lilv-0/lilv/lilv.h>
-+#include <lilv/lilv.h>
- 
- 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 <lilv-0/lilv/lilv.h>
-+#include <lilv/lilv.h>
- #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 <lilv-0/lilv/lilv.h>
-+#include <lilv/lilv.h>
- 
- 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-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 3c4c7d006b0..cac6bd5d4fe 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2021-01-04  9:17 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2021-01-04  9:17 UTC (permalink / raw
  To: gentoo-commits

commit:     95405ee565634ef39e06dd44566141e2da623b70
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 09:16:02 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 09:17:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95405ee5

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

thanks to jospezial <AT> 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 <fordfrog <AT> gentoo.org>

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

diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-9999-docs.patch
new file mode 100644
index 00000000000..d1de4e6e944
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0cc5b3a7ba..63f18bfda4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1142,15 +1142,6 @@ install(
+     "${MIXXX_INSTALL_LICENSEDIR}"
+ )
+ 
+-# Documentation
+-install(
+-  FILES
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
+-  DESTINATION
+-    "${MIXXX_INSTALL_DOCDIR}"
+-)
+-
+ # Additional Linux-only files
+ if(UNIX AND NOT APPLE)
+   # .desktop file for KDE/GNOME menu

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index da78302375e..5e69aa297bf 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,7 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
+		<flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag>
 		<flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
+		<flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 8b6b845279e..bbfbe57f1f0 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8})
-
-inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
+inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
@@ -13,7 +11,6 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
 	KEYWORDS="~amd64 ~x86"
@@ -21,10 +18,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
 
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
@@ -43,12 +38,13 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
+	media-libs/libebur128
 	media-libs/libid3tag
 	media-libs/libogg
 	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
+	media-libs/libsoundtouch
 	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
+	media-libs/portaudio
 	media-libs/portmidi
 	media-libs/rubberband
 	media-libs/taglib
@@ -58,75 +54,68 @@ RDEPEND="
 	virtual/glu
 	virtual/libusb:1
 	virtual/opengl
+	virtual/udev
 	x11-libs/libX11
 	aac? (
 		media-libs/faad2
 		media-libs/libmp4v2:0
 	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	hid? ( dev-libs/hidapi )
-	lv2? ( >=media-libs/lilv-0.24.2-r3 )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
+	qtkeychain? ( dev-libs/qtkeychain )
+	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-	${PYTHON_DEPS}
-"
+	dev-qt/qtxmlpatterns:5"
 
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die
+PATCHES=(
+	"${FILESDIR}"/mixxx-9999-docs.patch
+	)
 
-	default
+src_prepare() {
+	cmake_src_prepare
 }
 
 src_configure() {
-	local myoptimize=0
 
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	MYSCONS=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		lilv="$(usex lv2 1 0)"
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
+	local mycmakeargs=(
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DOPTIMIZE="off"
+		-DCCACHE_SUPPORT="off"
+		-DOPUS="$(usex opus on off)"
+		-DBROADCAST="$(usex shout on off)"
+		-DVINYLCONTROL="on"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DWAVPACK="$(usex wavpack on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DKEYFINDER="$(usex keyfinder on off)"
 	)
+
+	cmake_src_configure
 }
 
 src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
+	cmake_src_compile
 }
 
 src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
-		install_root="${ED}"/usr install
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 
-	dodoc README Mixxx-Manual.pdf
+	if use doc ; then
+		dodoc README Mixxx-Manual.pdf
+	fi
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2022-05-10 17:53 Miroslav Šulc
  0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2022-05-10 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     94a60438d525dc8aa11a9c91df8fdbf24127b351
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 17:53:11 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 10 17:53:23 2022 +0000
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 <fordfrog <AT> 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 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
 DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4 SHA512 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c 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..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mixxx-9999/src/SConscript
-+++ mixxx-9999/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..000000000000
--- 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" <s.brandt@mixxx.org>
-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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#c5d11f"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#378df7"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#939393"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#939393"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#c5d11f"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#c5d11f"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="80" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="scale(-1)" x="-75" y="-195" width="70" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="rotate(90)" x="22.134" y="-57.263" width="155.73" height="34.525" rx="2" ry="2" fill="#ffb108"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="15" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m3 1h9c1.108 0 2 0.892 2 2v34c0 1.108-0.892 2-2 2h-9c-1.108 0-2-0.892-2-2v-34c0-1.108 0.892-2 2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m4 35.589v-31.178c0-0.22768 0.21148-0.41097 0.47417-0.41097h6.0517c0.26269 0 0.47417 0.18329 0.47417 0.41097v31.178c0 0.22768-0.21148 0.41097-0.47417 0.41097h-6.0517c-0.26269 0-0.47417-0.18329-0.47417-0.41097z" fill="#ffb108"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#378df7"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#378df7"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#e02f00"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#e02f00"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#939393"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#939393"/>
-+</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 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#c5d11f"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#c5d11f"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-orange.svg b/res/skins/Deere/handle-vertical-orange.svg
-index 1b6b91152df..10f79b79b87 100644
---- a/res/skins/Deere/handle-vertical-orange.svg
-+++ b/res/skins/Deere/handle-vertical-orange.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#e3ca1f"/><rect id="rect5888" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#ffb108"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#ffb108"/>
-+</svg>
-diff --git a/res/skins/Deere/handle-vertical-purple.svg b/res/skins/Deere/handle-vertical-purple.svg
-index c606eac9b8c..1ccd440a239 100644
---- a/res/skins/Deere/handle-vertical-purple.svg
-+++ b/res/skins/Deere/handle-vertical-purple.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="200" height="75" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4138" transform="rotate(-90)" x="-70" y="5" width="65" height="190" rx="10" ry="10" fill="#333" stroke="#e0e0e0" stroke-width="10"/><rect id="rect4151-3" transform="scale(-1)" x="-177.87" y="-52.263" width="155.73" height="29.525" rx="2" ry="2" fill="#f2d440"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
-+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#f2d440"/>
-+</svg>
-diff --git a/res/skins/Deere/slider-crossfader-AutoDJ.svg b/res/skins/Deere/slider-crossfader-AutoDJ.svg
-index 3d4ee50b5a6..281dd06c32a 100644
---- a/res/skins/Deere/slider-crossfader-AutoDJ.svg
-+++ b/res/skins/Deere/slider-crossfader-AutoDJ.svg
-@@ -1 +1,5 @@
--<svg id="svg2" width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect2984" x="3.9767" y="12.759" width="172.05" height="14.483" color="#000000" fill="#f60"/><!-- marker lines every 5px --><!-- end marker --><!-- quarter marker --><!-- middle marker --><!-- quarter marker --><!-- end marker --></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <rect x="1" y="12" width="178" height="16" color="#000000" fill="#f60"/>
-+</svg>
-diff --git a/res/skins/Deere/slider-crossfader.svg b/res/skins/Deere/slider-crossfader.svg
-index 3ff945454de..ac5cb8cb52b 100644
---- a/res/skins/Deere/slider-crossfader.svg
-+++ b/res/skins/Deere/slider-crossfader.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4167" transform="rotate(90)" x="12.633" y="-176.2" width="14.734" height="172.4" rx=".92518" ry="1.0809" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/><path id="path4175" d="m170.32 18.062h-160.64v3.875h160.64v-3.875z" fill="#222" stroke="#222" stroke-linecap="round" stroke-width="2.5"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="180" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <rect x="1.75" y="12.75" width="176.5" height="14.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/>
-+ <path d="m6.4826 20h167.03z" fill="none" stroke="#222" stroke-width="6"/>
-+</svg>
-diff --git a/res/skins/Deere/slider-vertical.svg b/res/skins/Deere/slider-vertical.svg
-index 6876b84e028..30bc5061623 100644
---- a/res/skins/Deere/slider-vertical.svg
-+++ b/res/skins/Deere/slider-vertical.svg
-@@ -1,2 +1,6 @@
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg id="svg2" width="40" height="162" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4167" x="12.633" y="1.25" width="14.734" height="159.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/><path id="path4175" transform="translate(0,-9)" d="m18.062 15.688v148.62h3.875v-148.62h-3.875z" fill="#222" stroke="#222" stroke-linecap="round" stroke-width="2.5"/></svg>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<svg width="40" height="162" version="1.1" xmlns="http://www.w3.org/2000/svg">
-+ <style/>
-+ <rect x="12.75" y="1.75" width="14.5" height="158.5" rx="1" ry="1" fill="none" stroke="#555" stroke-linecap="round" stroke-width="1.5"/>
-+ <path d="m20 156v-150z" fill="none" stroke="#222" stroke-width="6"/>
-+</svg>
-
-From 8d1e0e2aabb8c95c0ca06faa93d50dbc75f537db Mon Sep 17 00:00:00 2001
-From: "S.Brandt" <s.brandt@mixxx.org>
-Date: Fri, 17 Jan 2020 13:05:25 +0100
-Subject: [PATCH 2/2] Deere skin:  Add maximum size for the crossfader slider
- image to stop the crossfader handle from overflowing the background graphic.
-
----
- res/skins/Deere/mixer.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
-index b27e3e8b4e0..315d1f30709 100644
---- a/res/skins/Deere/mixer.xml
-+++ b/res/skins/Deere/mixer.xml
-@@ -122,6 +122,7 @@
-                       <SliderComposed>
-                         <TooltipId>crossfader</TooltipId>
-                         <Size>1me,40f</Size>
-+                        <MaximumSize>200,40</MaximumSize>
-                         <Slider scalemode="STRETCH">slider-crossfader.svg</Slider>
-                         <Handle scalemode="STRETCH_ASPECT">handle-crossfader-orange.svg</Handle>
-                         <Horizontal>true</Horizontal>

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
deleted file mode 100644
index 816d888a734d..000000000000
--- a/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dNur a/build/qt4.py b/build/qt4.py
---- a/build/qt4.py	2020-05-15 23:26:10.000000000 +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.000000000 +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/files/mixxx-2.2.4-metadata.patch b/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
deleted file mode 100644
index cf1e43654fec..000000000000
--- a/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-r1.ebuild b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
deleted file mode 100644
index 8cb76558f56b..000000000000
--- a/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac doc ffmpeg hid 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}
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-"
-# See bug #806085 for scons upper bound, newer versions drop scons dependency
-# altogether.
-BDEPEND="${PYTHON_DEPS}
-	<dev-util/scons-4.2.0
-	virtual/pkgconfig
-"
-
-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() {
-	# 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
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	MYSCONS=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		lilv="$(usex lv2 1 0)"
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \
-		install_root="${ED}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}

diff --git a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
deleted file mode 100644
index 1fa6847ab681..000000000000
--- a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
+++ /dev/null
@@ -1,157 +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}" == *9999 ]] ; then
-	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
-		EGIT_BRANCH=${PV%.9999}
-	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="
-	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
-"
-
-mixxx_set_globals() {
-	local lang
-	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
-	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/ en/ +en}"
-	done
-	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
-}
-mixxx_set_globals
-
-src_prepare() {
-	cmake_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"
-		-DOPUS="$(usex opus on off)"
-		-DQTKEYCHAIN="$(usex qtkeychain on off)"
-		-DVINYLCONTROL="on"
-		-DWAVPACK="$(usex wavpack on off)"
-	)
-
-	if [[ "${PV}" == 9999 ]] ; 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
-	dodoc README.md CHANGELOG.md
-	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
-		fi
-	done
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-05-10 17:53 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-24 22:48 [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-05-10 17:53 Miroslav Šulc
2021-01-04  9:17 Miroslav Šulc
2020-08-11  7:27 Miroslav Šulc
2020-06-08  9:19 Lars Wendler
2018-12-26  0:04 Lars Wendler
2016-07-22  0:22 Lars Wendler
2016-07-21 21:16 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox