[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; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ messages in thread

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

commit:     4acce30f14476d8b2f99e64275abe57054bf8d05
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Jan 21 22:56:02 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 22:34:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acce30f

media-sound/mixxx: taglib-2 blocker

Even if upstream has produced a patch to compile with taglib2, it is
advised against using it because of new '/' separator for
multi value tags.
Blocker could be remove soon (pull/12854).

See :
issues 12708 12790
https://github.com/Holzhaus/mixxx/commit/4e4d4e866ef86bb4d196a1903778697552cca05a
https://github.com/mixxxdj/mixxx/pull/12854.patch

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/40251
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch        | 14 --------------
 .../mixxx/{mixxx-2.3.6-r1.ebuild => mixxx-2.3.6-r2.ebuild} |  5 ++---
 media-sound/mixxx/mixxx-2.3.9999.ebuild                    |  5 ++---
 media-sound/mixxx/mixxx-9999.ebuild                        |  4 ++--
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch b/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch
deleted file mode 100644
index 1a00a455e6ea..000000000000
--- a/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/mixxxdj/mixxx/commit/1dd2ae25e065401371800ad76cb813021702a9e1.patch
-diff --git a/src/track/taglib/trackmetadata_ape.cpp b/src/track/taglib/trackmetadata_ape.cpp
-index c370c6a7f93..b4af3b5afbc 100644
---- a/src/track/taglib/trackmetadata_ape.cpp
-+++ b/src/track/taglib/trackmetadata_ape.cpp
-@@ -59,7 +59,7 @@ bool importCoverImageFromTag(QImage* pCoverArt, const TagLib::APE::Tag& tag) {
-     if (tag.itemListMap().contains("COVER ART (FRONT)")) {
-         const TagLib::ByteVector nullStringTerminator(1, 0);
-         TagLib::ByteVector item =
--                tag.itemListMap()["COVER ART (FRONT)"].value();
-+                tag.itemListMap()["COVER ART (FRONT)"].binaryData();
-         int pos = item.find(nullStringTerminator); // skip the filename
-         if (++pos > 0) {
-             const TagLib::ByteVector data(item.mid(pos));

diff --git a/media-sound/mixxx/mixxx-2.3.6-r1.ebuild b/media-sound/mixxx/mixxx-2.3.6-r2.ebuild
similarity index 97%
rename from media-sound/mixxx/mixxx-2.3.6-r1.ebuild
rename to media-sound/mixxx/mixxx-2.3.6-r2.ebuild
index d1cbb797177d..429f29d55113 100644
--- a/media-sound/mixxx/mixxx-2.3.6-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,7 +49,7 @@ RDEPEND="
 	media-libs/portaudio[alsa]
 	media-libs/portmidi
 	media-libs/rubberband
-	media-libs/taglib:=
+	<media-libs/taglib-2
 	media-libs/vamp-plugin-sdk
 	media-sound/lame
 	sci-libs/fftw:3.0=
@@ -92,7 +92,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-docs.patch
 	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
 	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
-	"${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch
 )
 
 PLOCALES="

diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 442ba0752f5f..e6988a2060f6 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,7 +49,7 @@ RDEPEND="
 	media-libs/portaudio[alsa]
 	media-libs/portmidi
 	media-libs/rubberband
-	media-libs/taglib:=
+	<media-libs/taglib-2
 	media-libs/vamp-plugin-sdk
 	media-sound/lame
 	sci-libs/fftw:3.0=
@@ -90,7 +90,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-docs.patch
-	"${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch
 )
 
 PLOCALES="

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 7f200f135d0b..cf915aaeb49f 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,7 +50,7 @@ RDEPEND="
 	media-libs/portaudio
 	media-libs/portmidi
 	media-libs/rubberband
-	media-libs/taglib:=
+	<media-libs/taglib-2
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2025-02-10 20:42 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2025-02-10 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     5184a59aa626c6bda8eee053f633354595687596
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Jan 20 13:08:26 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 20:41:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5184a59a

media-sound/mixxx: update 9999 qt6, tests

*qt6 port

*eclass:
add flag-o-matic/toolchain-funcs to prevent ld error with lto

*deps:
add dev-libs/hidapi (required even with HID=OFF)
add dev-qt/qtbase:6[icu] for utf16 (test too)
add dev-util/spirv-tools for qsb (bdep)
add media-libs/libid3tag for mp3 support
add media-sound/lame, required
del sci-libs/fftw, only required with static keyfinder
del virtual/opengl, redundant
del media-libs/vamp-plugin-sdk is no more a dep (2.3.0)
del media-libs/libshout, use internal libshout-idjc instead

*deps benchmark:
add dev-cpp/benchmark
add dev-cpp/gtest
add dev-util/gperftools

*useflag:
add benchmark midi modplug test upower
del doc because no bdep

Closes: https://bugs.gentoo.org/914764
Closes: https://bugs.gentoo.org/822357
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../mixxx-2.5.0-fix-strict-aliasing-kaitai.patch   | 115 +++++++++++++++
 media-sound/mixxx/files/mixxx-9999-docs.patch      |  28 ----
 media-sound/mixxx/metadata.xml                     |   6 +-
 media-sound/mixxx/mixxx-9999.ebuild                | 159 +++++++++++++--------
 4 files changed, 217 insertions(+), 91 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx-2.5.0-fix-strict-aliasing-kaitai.patch b/media-sound/mixxx/files/mixxx-2.5.0-fix-strict-aliasing-kaitai.patch
new file mode 100644
index 000000000000..2f06bbbb9c78
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.5.0-fix-strict-aliasing-kaitai.patch
@@ -0,0 +1,115 @@
+https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/commit/c01f5300159a698b6e706caba21e1965d5fc94a7.patch
+diff --git a/lib/kaitai/kaitai/kaitaistream.cpp b/lib/kaitai/kaitai/kaitaistream.cpp
+index bd914c3..d3b2fcd 100644
+--- a/lib/kaitai/kaitai/kaitaistream.cpp
++++ b/lib/kaitai/kaitai/kaitaistream.cpp
+@@ -32,10 +32,57 @@
+ #include <byteswap.h>
+ #endif
+ 
++#include <cstring> // std::memcpy
+ #include <iostream>
+ #include <vector>
+ #include <stdexcept>
+ 
++#ifdef KAITAI_STREAM_H_CPP11_SUPPORT
++#include <type_traits> // std::enable_if, std::is_trivially_copyable, std::is_trivially_constructible
++
++// Taken from https://en.cppreference.com/w/cpp/numeric/bit_cast#Possible_implementation
++// (only adjusted for C++11 compatibility)
++template<class To, class From>
++typename std::enable_if<
++        sizeof(To) == sizeof(From) &&
++        std::is_trivially_copyable<From>::value &&
++        std::is_trivially_copyable<To>::value,
++        To
++>::type
++// constexpr support needs compiler magic
++static bit_cast(const From &src) noexcept
++{
++    static_assert(std::is_trivially_constructible<To>::value,
++                  "This implementation additionally requires "
++                  "destination type to be trivially constructible");
++
++    To dst;
++    std::memcpy(&dst, &src, sizeof(To));
++    return dst;
++}
++#else
++// The following implementation of `StaticAssert` was inspired by https://stackoverflow.com/a/6765840
++
++// empty default template
++template <bool b>
++struct StaticAssert;
++
++// template specialized on true
++template <>
++struct StaticAssert<true> {};
++
++template<class To, class From>
++To
++static bit_cast(const From &src)
++{
++    StaticAssert<sizeof(To) == sizeof(From)>();
++
++    To dst;
++    std::memcpy(&dst, &src, sizeof(To));
++    return dst;
++}
++#endif
++
+ kaitai::kstream::kstream(std::istream *io) {
+     m_io = io;
+     init();
+@@ -263,7 +310,7 @@ float kaitai::kstream::read_f4be() {
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+     t = bswap_32(t);
+ #endif
+-    return reinterpret_cast<float &>(t);
++    return bit_cast<float>(t);
+ }
+ 
+ double kaitai::kstream::read_f8be() {
+@@ -272,7 +319,7 @@ double kaitai::kstream::read_f8be() {
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+     t = bswap_64(t);
+ #endif
+-    return reinterpret_cast<double &>(t);
++    return bit_cast<double>(t);
+ }
+ 
+ // ........................................................................
+@@ -285,7 +332,7 @@ float kaitai::kstream::read_f4le() {
+ #if __BYTE_ORDER == __BIG_ENDIAN
+     t = bswap_32(t);
+ #endif
+-    return reinterpret_cast<float &>(t);
++    return bit_cast<float>(t);
+ }
+ 
+ double kaitai::kstream::read_f8le() {
+@@ -294,7 +341,7 @@ double kaitai::kstream::read_f8le() {
+ #if __BYTE_ORDER == __BIG_ENDIAN
+     t = bswap_64(t);
+ #endif
+-    return reinterpret_cast<double &>(t);
++    return bit_cast<double>(t);
+ }
+ 
+ // ========================================================================
+diff --git a/lib/kaitai/kaitai/kaitaistream.h b/lib/kaitai/kaitai/kaitaistream.h
+index c8b5a3a..d58ae8e 100644
+--- a/lib/kaitai/kaitai/kaitaistream.h
++++ b/lib/kaitai/kaitai/kaitaistream.h
+@@ -4,6 +4,11 @@
+ // Kaitai Struct runtime API version: x.y.z = 'xxxyyyzzz' decimal
+ #define KAITAI_STRUCT_VERSION 11000L
+ 
++// check for C++11 support - https://stackoverflow.com/a/40512515
++#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
++#define KAITAI_STREAM_H_CPP11_SUPPORT
++#endif
++
+ #include <istream>
+ #include <sstream>
+ #include <stdint.h>

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

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 38deddc8020f..8b62b2d0884f 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -6,15 +6,19 @@
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<use>
+		<flag name="benchmark">Build and install benchmark binary: mixxx-test --benchmark</flag>
 		<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="modplug">Add libmodplug support</flag>
 		<flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
+		<flag name="midi">Enable MIDI support via <pkg>media-libs/portmidi</pkg></flag>
+		<flag name="modplug">Add libmodplug support</flag>
 		<flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag>
+		<flag name="rubberband">Enable audio pitch-shifting via <pkg>media-libs/rubberband</pkg></flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mixxx</remote-id>
 		<remote-id type="github">mixxxdj/mixxx</remote-id>
+		<doc>https://downloads.mixxx.org/manual/</doc>
 	</upstream>
 </pkgmetadata>

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index cf915aaeb49f..f443853c094a 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake xdg udev
+inherit cmake flag-o-matic toolchain-funcs udev xdg
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://mixxx.org/"
@@ -14,119 +14,154 @@ if [[ ${PV} == *9999 ]] ; then
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+IUSE="aac benchmark ffmpeg keyfinder lv2 midi modplug mp3 mp4 opus"
+IUSE+=" qtkeychain rubberband shout test upower wavpack"
+REQUIRED_USE="
+	benchmark? ( test )
+	qtkeychain? ( shout )
+	test? ( aac ffmpeg midi mp3 opus rubberband )
+"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
+	dev-db/sqlite:3
+	dev-libs/hidapi
 	dev-libs/protobuf:=
-	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
+	dev-qt/qt5compat:6[qml]
+	dev-qt/qtbase:6[concurrent,dbus,gui,icu,network,opengl,sql,sqlite,ssl,widgets,xml,X]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtshadertools:6
+	dev-qt/qtsvg:6
+	media-libs/chromaprint:=
 	media-libs/flac:=
-	media-libs/libebur128
-	media-libs/libid3tag:=
+	media-libs/libebur128:=
+	media-libs/libglvnd[X]
 	media-libs/libogg
 	media-libs/libsndfile
-	media-libs/libsoundtouch
+	media-libs/libsoundtouch:=
 	media-libs/libvorbis
 	media-libs/portaudio
-	media-libs/portmidi
-	media-libs/rubberband
 	<media-libs/taglib-2
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	sys-power/upower
+	media-sound/lame
 	virtual/glu
 	virtual/libusb:1
-	virtual/opengl
 	virtual/udev
 	x11-libs/libX11
 	aac? (
 		media-libs/faad2
 		media-libs/libmp4v2
 	)
+	benchmark? (
+		dev-cpp/benchmark:=
+		dev-cpp/gtest
+		dev-util/google-perftools:=
+	)
 	ffmpeg? ( media-video/ffmpeg:= )
-	hid? ( dev-libs/hidapi )
 	keyfinder? ( media-libs/libkeyfinder )
 	lv2? ( media-libs/lilv )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
-	shout? ( >=media-libs/libshout-2.4.5 )
+	midi? ( media-libs/portmidi )
+	modplug? ( media-libs/libmodplug )
+	mp3? (
+		media-libs/libid3tag:=
+		media-libs/libmad
+	)
+	mp4? ( media-libs/libmp4v2 )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	qtkeychain? ( >=dev-libs/qtkeychain-0.14.2:=[qt6(+)] )
+	rubberband? ( media-libs/rubberband:= )
+	shout? ( dev-libs/openssl:= )
+	upower? (
+		dev-libs/glib:2
+		sys-power/upower:=
+	)
 	wavpack? ( media-sound/wavpack )
 "
 DEPEND="${RDEPEND}
 	dev-cpp/ms-gsl
+	test? ( dev-cpp/gtest )
 "
 BDEPEND="
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
+	dev-util/spirv-tools
 	virtual/pkgconfig
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-docs.patch
+	# Fix strict-aliasing violations in vendored katai_cpp_stl_runtime
+	# https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/commit/c01f530.patch
+	"${FILESDIR}"/${PN}-2.5.0-fix-strict-aliasing-kaitai.patch
+)
+
+CMAKE_SKIP_TESTS=(
+	# need HID controller
+	LegacyControllerMappingValidationTest.HidMappingsValid
+	# randomly fails
+	# https://github.com/mixxxdj/mixxx/issues/12554
+	EngineBufferE2ETest
 )
 
 src_configure() {
+	# prevent ld error as package builds static libs.
+	tc-is-lto && append-flags $(test-flags -ffat-lto-objects)
+
 	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"
+		-DBATTERY="$(usex upower)"
+		-DBROADCAST="$(usex shout)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_BENCH="$(usex benchmark)"
+		# prevent duplicate call
+		-DCCACHE_SUPPORT=OFF
+		-DENGINEPRIME=OFF
+		-DFAAD="$(usex aac)"
+		-DFFMPEG="$(usex ffmpeg)"
+		-DGPERFTOOLS="$(usex benchmark)"
+		-DGPERFTOOLSPROFILER="$(usex benchmark)"
+		-DHID=ON
 		-DINSTALL_USER_UDEV_RULES=OFF
-		-DWAVPACK="$(usex wavpack on off)"
-		-DQTKEYCHAIN="$(usex qtkeychain on off)"
-		-DKEYFINDER="$(usex keyfinder on off)"
-		-DDOWNLOAD_MANUAL=OFF
-		-DBUILD_SHARED_LIBS=OFF
+		-DKEYFINDER="$(usex keyfinder)"
+		-DLILV="$(usex lv2)"
+		-DMAD="$(usex mp3)"
+		-DMODPLUG="$(usex modplug)"
+		-DOPTIMIZE=OFF
+		-DOPUS="$(usex opus)"
+		-DPORTMIDI="$(usex midi)"
+		-DQML=ON
+		-DQTKEYCHAIN="$(usex qtkeychain)"
+		-DRUBBERBAND="$(usex rubberband)"
+		-DVINYLCONTROL=ON
+		-DWAVPACK="$(usex wavpack)"
 	)
 
-	if [[ ${PV} == 9999 ]] ; then
-		mycmakeargs+=(
-			-DENGINEPRIME="OFF"
-		)
-	fi
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
+	use benchmark && dobin "${BUILD_DIR}"/mixxx-test
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
-
-	if use doc ; then
-		dodoc README res/Mixxx-Keyboard-Shortcuts.pdf
-	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 	udev_reload
+
+	elog "Manuals are no longer part of the package."
+	elog "Please refer to https://downloads.mixxx.org/manual/ for up-to-date manuals."
+	if use benchmark; then
+		elog ""
+		elog "Launch benchmark : ${EROOT}/usr/bin/mixxx-test --benchmark"
+		elog "Launch Unittests : ${EROOT}/usr/bin/mixxx-test"
+		elog "Some test suites may not be available without source files."
+	fi
 }
 
 pkg_postrm() {


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2025-02-10 20:42 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2025-02-10 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     539b05c45b2d0f5800ae69e2e0865e0b9dd64d30
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Jan 21 16:41:39 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 20:41:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539b05c4

media-sound/mixxx: add 2.5.0

sync with live
patch for tests/benchmark

Bug: https://bugs.gentoo.org/899564
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/40226
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/mixxx/Manifest                      |   1 +
 media-sound/mixxx/files/mixxx-2.5.0-tests.patch | 444 ++++++++++++++++++++++++
 media-sound/mixxx/mixxx-2.5.0.ebuild            | 172 +++++++++
 3 files changed, 617 insertions(+)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 4ed0e4c162a6..39003609bcc1 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
 DIST mixxx-2.3.6.tar.gz 41285084 BLAKE2B 35bedb5f41a56577bc59411ca979e3e780c1da2420bc0a7ad98d998c89f8c272202ba42e8b8089904ca8e1a1b6ac5155d08d556538245ce3242b4ea5a670e6d2 SHA512 a92c2c92dc7619ac135d940f23ffdc101c528eca6322517805afb9eb48a84c6339cefb88b96bdac6ffb23967c2f93f621daf3e98bfecbf7f3fe7626ddcec4398
+DIST mixxx-2.5.0.tar.gz 39580922 BLAKE2B e5c5aa02a4b13228857eb620ad174144562d7b4675a40565fda1e641138e0e65dbb2bbe8c7fb32ead242a5bdf8581368ea604c93afbfc5c991ac92065e7bdae7 SHA512 ee3c682d40267358025aba5bfdc378fee1cb6691dc899280132f7e69d315b9ce3d8568ca182752bac96a38310c2f2d71ddc80eea4448b8b32bf6ec6a61a9d608
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86 SHA512 fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc

diff --git a/media-sound/mixxx/files/mixxx-2.5.0-tests.patch b/media-sound/mixxx/files/mixxx-2.5.0-tests.patch
new file mode 100644
index 000000000000..05c0a9924991
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.5.0-tests.patch
@@ -0,0 +1,444 @@
+https://github.com/mixxxdj/mixxx/pull/14269.patch
+From 78a45819563ff4ff49e8806c49d8a680a9481b0b Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Fri, 31 Jan 2025 16:28:10 +0000
+Subject: [PATCH 1/2] Building without tests-tools
+
+Today, we can't build mixxx without links to gtest/gperftools/benchmark
+
+This PR allows building only mixxx and mixxx-lib targets without
+tests-tools.
+
+Two common cmake-definitions are added :
+* BUILD_TESTING
+* BUILD_BENCH
+
+And one compile definition for test.main.cpp :
+* USE_BENCH
+
+This is helpful for packaging (gentoo here).
+
+The negative effect is sorting of tests source files as soon
+as they are called by mixxx-benchmark target.
+---
+ CMakeLists.txt | 344 +++++++++++++++++++++++++++----------------------
+ 1 file changed, 193 insertions(+), 151 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a0c12a0f267..89abbdfc6d4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2061,156 +2061,194 @@ endif()
+ # Tests
+ #
+ 
+-add_executable(mixxx-test
+-  src/test/analyserwaveformtest.cpp
+-  src/test/analyzersilence_test.cpp
+-  src/test/audiotaperpot_test.cpp
+-  src/test/autodjprocessor_test.cpp
+-  src/test/beatgridtest.cpp
+-  src/test/beatmaptest.cpp
+-  src/test/beatstest.cpp
+-  src/test/beatstranslatetest.cpp
+-  src/test/bpmtest.cpp
+-  src/test/bpmcontrol_test.cpp
+-  src/test/broadcastprofile_test.cpp
+-  src/test/broadcastsettings_test.cpp
+-  src/test/cache_test.cpp
+-  src/test/channelhandle_test.cpp
+-  src/test/chrono_clock_resolution_test.cpp
+-  src/test/colorconfig_test.cpp
+-  src/test/colormapperjsproxy_test.cpp
+-  src/test/colorpalette_test.cpp
+-  src/test/configobject_test.cpp
+-  src/test/controller_mapping_validation_test.cpp
+-  src/test/controller_mapping_settings_test.cpp
+-  src/test/controllers/controller_columnid_regression_test.cpp
+-  src/test/controllerscriptenginelegacy_test.cpp
+-  src/test/controlobjecttest.cpp
+-  src/test/controlobjectaliastest.cpp
+-  src/test/controlobjectscripttest.cpp
+-  src/test/controlpotmetertest.cpp
+-  src/test/coreservicestest.cpp
+-  src/test/coverartcache_test.cpp
+-  src/test/coverartutils_test.cpp
+-  src/test/cratestorage_test.cpp
+-  src/test/cue_test.cpp
+-  src/test/cuecontrol_test.cpp
+-  src/test/dbconnectionpool_test.cpp
+-  src/test/dbidtest.cpp
+-  src/test/directorydaotest.cpp
+-  src/test/duration_test.cpp
+-  src/test/durationutiltest.cpp
+-  #TODO: write useful tests for refactored effects system
+-  #src/test/effectchainslottest.cpp
+-  src/test/enginebufferscalelineartest.cpp
+-  src/test/enginebuffertest.cpp
+-  src/test/engineeffectsdelay_test.cpp
+-  src/test/enginefilterbiquadtest.cpp
+-  src/test/enginemixertest.cpp
+-  src/test/enginemicrophonetest.cpp
+-  src/test/enginesynctest.cpp
+-  src/test/fileinfo_test.cpp
+-  src/test/frametest.cpp
+-  src/test/globaltrackcache_test.cpp
+-  src/test/hotcuecontrol_test.cpp
+-  src/test/imageutils_test.cpp
+-  src/test/indexrange_test.cpp
+-  src/test/itunesxmlimportertest.cpp
+-  src/test/keyfactorytest.cpp
+-  src/test/keyutilstest.cpp
+-  src/test/lcstest.cpp
+-  src/test/learningutilstest.cpp
+-  src/test/libraryscannertest.cpp
+-  src/test/librarytest.cpp
+-  src/test/looping_control_test.cpp
+-  src/test/main.cpp
+-  src/test/mathutiltest.cpp
+-  src/test/metadatatest.cpp
+-  #TODO: make this build again
+-  #src/test/metaknob_link_test.cpp
+-  src/test/midicontrollertest.cpp
+-  src/test/mixxxtest.cpp
+-  src/test/mock_networkaccessmanager.cpp
+-  src/test/movinginterquartilemean_test.cpp
+-  src/test/musicbrainzrecordingstasktest.cpp
+-  src/test/nativeeffects_test.cpp
+-  src/test/performancetimer_test.cpp
+-  src/test/playcountertest.cpp
+-  src/test/playermanagertest.cpp
+-  src/test/playlisttest.cpp
+-  src/test/portmidicontroller_test.cpp
+-  src/test/portmidienumeratortest.cpp
+-  src/test/queryutiltest.cpp
+-  src/test/rangelist_test.cpp
+-  src/test/readaheadmanager_test.cpp
+-  src/test/replaygaintest.cpp
+-  src/test/rescalertest.cpp
+-  src/test/rgbcolor_test.cpp
+-  src/test/ringdelaybuffer_test.cpp
+-  src/test/samplebuffertest.cpp
+-  src/test/sampleutiltest.cpp
+-  src/test/schemamanager_test.cpp
+-  src/test/searchqueryparsertest.cpp
+-  src/test/seratobeatgridtest.cpp
+-  src/test/seratomarkerstest.cpp
+-  src/test/seratomarkers2test.cpp
+-  src/test/seratotagstest.cpp
+-  src/test/signalpathtest.cpp
+-  src/test/skincontext_test.cpp
+-  src/test/softtakeover_test.cpp
+-  src/test/soundproxy_test.cpp
+-  src/test/soundsourceproviderregistrytest.cpp
+-  src/test/sqliteliketest.cpp
+-  src/test/synccontroltest.cpp
+-  src/test/synctrackmetadatatest.cpp
+-  src/test/tableview_test.cpp
+-  src/test/taglibtest.cpp
+-  src/test/trackdao_test.cpp
+-  src/test/trackexport_test.cpp
+-  src/test/trackmetadata_test.cpp
+-  src/test/trackmetadataexport_test.cpp
+-  src/test/tracknumberstest.cpp
+-  src/test/trackreftest.cpp
+-  src/test/trackupdate_test.cpp
+-  src/test/uuid_test.cpp
+-  src/test/wbatterytest.cpp
+-  src/test/wpushbutton_test.cpp
+-  src/test/wwidgetstack_test.cpp
+-  src/util/moc_included_test.cpp
+-)
+-target_precompile_headers(mixxx-test REUSE_FROM mixxx-lib)
+-find_package(GTest CONFIG REQUIRED)
+-set_target_properties(mixxx-test PROPERTIES AUTOMOC ON)
+-target_link_libraries(mixxx-test PRIVATE mixxx-lib mixxx-gitinfostore GTest::gtest GTest::gmock)
++find_package(GTest CONFIG)
++default_option(BUILD_TESTING "Build with Unittests" "GTest_FOUND")
++if(BUILD_TESTING)
++  if(GTest_FOUND)
++    message(STATUS "Found GTest: Unittests enabled")
++  else()
++    message(FATAL_ERROR "GTest: not found")
++  endif()
++endif()
+ 
+ find_package(benchmark)
+-target_link_libraries(mixxx-test PRIVATE benchmark::benchmark)
+-
+-# Test Suite
+-include(CTest)
+-include(GoogleTest)
+-enable_testing()
+-gtest_add_tests(
+-  TARGET mixxx-test
+-  EXTRA_ARGS --logLevel info
+-  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-  TEST_LIST testsuite
+-)
+-if (NOT WIN32)
+-  # Default to offscreen rendering during tests.
+-  # This is required if the build system like Fedora koji/mock does not
+-  # allow to pass environment variables into the ctest macro expansion.
+-  set_tests_properties(${testsuite} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen")
+-endif()
++default_option(BUILD_BENCH "Build mixxx-benchmark" "benchmark_FOUND")
++if(BUILD_BENCH AND BUILD_TESTING)
++  if(benchmark_FOUND)
++    message(STATUS "Found google-benchmark: mixxx-benchmark enabled")
++  else()
++    message(FATAL_ERROR "google-benchmark: not found")
++  endif()
++elseif(BUILD_BENCH AND NOT BUILD_TESTING)
++  message(FATAL_ERROR "Benchmark needs Unittests (-DBUILD_TESTING=ON)")
++endif()
++
++if(BUILD_TESTING)
++  set(
++    src-mixxx-test
++    src/test/analyserwaveformtest.cpp
++    src/test/analyzersilence_test.cpp
++    src/test/audiotaperpot_test.cpp
++    src/test/autodjprocessor_test.cpp
++    src/test/beatgridtest.cpp
++    src/test/beatmaptest.cpp
++    src/test/beatstest.cpp
++    src/test/beatstranslatetest.cpp
++    src/test/bpmtest.cpp
++    src/test/bpmcontrol_test.cpp
++    src/test/broadcastprofile_test.cpp
++    src/test/broadcastsettings_test.cpp
++    src/test/cache_test.cpp
++    src/test/channelhandle_test.cpp
++    src/test/chrono_clock_resolution_test.cpp
++    src/test/colorconfig_test.cpp
++    src/test/colormapperjsproxy_test.cpp
++    src/test/colorpalette_test.cpp
++    src/test/configobject_test.cpp
++    src/test/controller_mapping_validation_test.cpp
++    src/test/controller_mapping_settings_test.cpp
++    src/test/controllers/controller_columnid_regression_test.cpp
++    src/test/controllerscriptenginelegacy_test.cpp
++    src/test/controlobjecttest.cpp
++    src/test/controlobjectaliastest.cpp
++    src/test/controlobjectscripttest.cpp
++    src/test/controlpotmetertest.cpp
++    src/test/coreservicestest.cpp
++    src/test/coverartcache_test.cpp
++    src/test/coverartutils_test.cpp
++    src/test/cratestorage_test.cpp
++    src/test/cue_test.cpp
++    src/test/cuecontrol_test.cpp
++    src/test/dbconnectionpool_test.cpp
++    src/test/dbidtest.cpp
++    src/test/directorydaotest.cpp
++    src/test/duration_test.cpp
++    src/test/durationutiltest.cpp
++    #TODO: write useful tests for refactored effects system
++    #src/test/effectchainslottest.cpp
++    src/test/enginebufferscalelineartest.cpp
++    src/test/enginebuffertest.cpp
++    src/test/enginefilterbiquadtest.cpp
++    src/test/enginemixertest.cpp
++    src/test/enginemicrophonetest.cpp
++    src/test/enginesynctest.cpp
++    src/test/fileinfo_test.cpp
++    src/test/frametest.cpp
++    src/test/globaltrackcache_test.cpp
++    src/test/hotcuecontrol_test.cpp
++    src/test/imageutils_test.cpp
++    src/test/indexrange_test.cpp
++    src/test/itunesxmlimportertest.cpp
++    src/test/keyfactorytest.cpp
++    src/test/keyutilstest.cpp
++    src/test/lcstest.cpp
++    src/test/learningutilstest.cpp
++    src/test/libraryscannertest.cpp
++    src/test/librarytest.cpp
++    src/test/looping_control_test.cpp
++    src/test/main.cpp
++    src/test/mathutiltest.cpp
++    src/test/metadatatest.cpp
++    #TODO: make this build again
++    #src/test/metaknob_link_test.cpp
++    src/test/midicontrollertest.cpp
++    src/test/mixxxtest.cpp
++    src/test/mock_networkaccessmanager.cpp
++    src/test/musicbrainzrecordingstasktest.cpp
++    src/test/performancetimer_test.cpp
++    src/test/playcountertest.cpp
++    src/test/playermanagertest.cpp
++    src/test/playlisttest.cpp
++    src/test/portmidicontroller_test.cpp
++    src/test/portmidienumeratortest.cpp
++    src/test/queryutiltest.cpp
++    src/test/rangelist_test.cpp
++    src/test/readaheadmanager_test.cpp
++    src/test/replaygaintest.cpp
++    src/test/rescalertest.cpp
++    src/test/rgbcolor_test.cpp
++    src/test/samplebuffertest.cpp
++    src/test/schemamanager_test.cpp
++    src/test/searchqueryparsertest.cpp
++    src/test/seratobeatgridtest.cpp
++    src/test/seratomarkerstest.cpp
++    src/test/seratomarkers2test.cpp
++    src/test/seratotagstest.cpp
++    src/test/signalpathtest.cpp
++    src/test/skincontext_test.cpp
++    src/test/softtakeover_test.cpp
++    src/test/soundproxy_test.cpp
++    src/test/soundsourceproviderregistrytest.cpp
++    src/test/sqliteliketest.cpp
++    src/test/synccontroltest.cpp
++    src/test/synctrackmetadatatest.cpp
++    src/test/tableview_test.cpp
++    src/test/taglibtest.cpp
++    src/test/trackdao_test.cpp
++    src/test/trackexport_test.cpp
++    src/test/trackmetadata_test.cpp
++    src/test/trackmetadataexport_test.cpp
++    src/test/tracknumberstest.cpp
++    src/test/trackreftest.cpp
++    src/test/trackupdate_test.cpp
++    src/test/uuid_test.cpp
++    src/test/wbatterytest.cpp
++    src/test/wpushbutton_test.cpp
++    src/test/wwidgetstack_test.cpp
++    src/util/moc_included_test.cpp
++  )
++  if(BUILD_BENCH)
++    set(
++      src-mixxx-test
++      ${src-mixxx-test}
++      src/test/engineeffectsdelay_test.cpp
++      src/test/movinginterquartilemean_test.cpp
++      src/test/nativeeffects_test.cpp
++      src/test/ringdelaybuffer_test.cpp
++      src/test/sampleutiltest.cpp
++    )
++  endif()
+ 
+-# Benchmarking
+-add_custom_target(mixxx-benchmark
+-  COMMAND $<TARGET_FILE:mixxx-test> --benchmark
+-  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-  COMMENT "Mixxx Benchmarks"
+-  VERBATIM
+-)
+-add_dependencies(mixxx-benchmark mixxx-test)
++  add_executable(mixxx-test ${src-mixxx-test})
++
++  target_precompile_headers(mixxx-test REUSE_FROM mixxx-lib)
++  set_target_properties(mixxx-test PROPERTIES AUTOMOC ON)
++  target_link_libraries(mixxx-test PRIVATE mixxx-lib mixxx-gitinfostore GTest::gtest GTest::gmock)
++
++  if(BUILD_BENCH)
++    add_compile_definitions(USE_BENCH)
++    target_link_libraries(mixxx-test PRIVATE benchmark::benchmark)
++  endif()
++
++  # Test Suite
++  include(CTest)
++  include(GoogleTest)
++  enable_testing()
++  gtest_add_tests(
++    TARGET mixxx-test
++    EXTRA_ARGS --logLevel info
++    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++    TEST_LIST testsuite
++  )
++
++  if (NOT WIN32)
++    # Default to offscreen rendering during tests.
++    # This is required if the build system like Fedora koji/mock does not
++    # allow to pass environment variables into the ctest macro expansion.
++    set_tests_properties(${testsuite} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen")
++  endif()
++
++  if(BUILD_BENCH)
++    # Benchmarking
++    add_custom_target(mixxx-benchmark
++      COMMAND $<TARGET_FILE:mixxx-test> --benchmark
++      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++      COMMENT "Mixxx Benchmarks"
++      VERBATIM
++    )
++    add_dependencies(mixxx-benchmark mixxx-test)
++  endif()
++endif() # BUILD_TESTING
+ 
+ #
+ # Resources
+@@ -2245,8 +2283,10 @@ endif()
+ 
+ target_sources(mixxx PRIVATE res/mixxx.qrc)
+ set_target_properties(mixxx PROPERTIES AUTORCC ON)
+-target_sources(mixxx-test PRIVATE res/mixxx.qrc)
+-set_target_properties(mixxx-test PROPERTIES AUTORCC ON)
++if(BUILD_TESTING)
++  target_sources(mixxx-test PRIVATE res/mixxx.qrc)
++  set_target_properties(mixxx-test PROPERTIES AUTORCC ON)
++endif()
+ 
+ if (MIXXX_VERSION_PRERELEASE STREQUAL "")
+    set(MIXXX_VERSION "${CMAKE_PROJECT_VERSION}")
+@@ -3510,7 +3550,7 @@ endif()
+ # Google PerfTools
+ option(GPERFTOOLS "Google PerfTools libtcmalloc linkage" OFF)
+ option(GPERFTOOLSPROFILER "Google PerfTools libprofiler linkage" OFF)
+-if(GPERFTOOLS OR GPERFTOOLSPROFILER)
++if((BUILD_BENCH) AND (GPERFTOOLS OR GPERFTOOLSPROFILER))
+   find_package(GPerfTools REQUIRED)
+   if(GPERFTOOLS)
+     target_link_libraries(mixxx-lib PRIVATE GPerfTools::tcmalloc)
+@@ -3556,7 +3596,9 @@ if(LILV)
+   )
+   target_compile_definitions(mixxx-lib PUBLIC __LILV__)
+   target_link_libraries(mixxx-lib PRIVATE lilv::lilv)
+-  target_link_libraries(mixxx-test PRIVATE lilv::lilv)
++  if(BUILD_TESTING)
++    target_link_libraries(mixxx-test PRIVATE lilv::lilv)
++  endif()
+ endif()
+ 
+ # Live Broadcasting (Shoutcast)
+
+From 25769771e3b70047c8c52256a804454510707e4b Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Fri, 31 Jan 2025 16:28:31 +0000
+Subject: [PATCH 2/2] Slight adaptation for test.main.cpp
+
+---
+ src/test/main.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/test/main.cpp b/src/test/main.cpp
+index 80d58bcd41b..58ba97a85e4 100644
+--- a/src/test/main.cpp
++++ b/src/test/main.cpp
+@@ -1,4 +1,6 @@
++#ifdef USE_BENCH
+ #include <benchmark/benchmark.h>
++#endif
+ 
+ #include "errordialoghandler.h"
+ #include "mixxxtest.h"
+@@ -8,6 +10,7 @@ int main(int argc, char **argv) {
+     // We never want to popup error dialogs when running tests.
+     ErrorDialogHandler::setEnabled(false);
+ 
++#ifdef USE_BENCH
+     bool run_benchmarks = false;
+     for (int i = 0; i < argc; ++i) {
+         if (strcmp(argv[i], "--benchmark") == 0) {
+@@ -33,4 +36,9 @@ int main(int argc, char **argv) {
+     } else {
+         return RUN_ALL_TESTS();
+     }
++#else
++    testing::InitGoogleTest(&argc, argv);
++    MixxxTest::ApplicationScope applicationScope(argc, argv);
++    return RUN_ALL_TESTS();
++#endif
+ }

diff --git a/media-sound/mixxx/mixxx-2.5.0.ebuild b/media-sound/mixxx/mixxx-2.5.0.ebuild
new file mode 100644
index 000000000000..46c613f56911
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.5.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs udev xdg
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://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/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac benchmark ffmpeg keyfinder lv2 midi modplug mp3 mp4 opus"
+IUSE+=" qtkeychain rubberband shout test upower wavpack"
+REQUIRED_USE="
+	benchmark? ( test )
+	qtkeychain? ( shout )
+	test? ( aac ffmpeg midi mp3 opus rubberband )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/hidapi
+	dev-libs/protobuf:=
+	dev-qt/qt5compat:6[qml]
+	dev-qt/qtbase:6[concurrent,dbus,gui,icu,network,opengl,sql,sqlite,ssl,widgets,xml,X]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtshadertools:6
+	dev-qt/qtsvg:6
+	media-libs/chromaprint:=
+	media-libs/flac:=
+	media-libs/libebur128:=
+	media-libs/libglvnd[X]
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/libvorbis
+	media-libs/portaudio
+	<media-libs/taglib-2
+	media-sound/lame
+	virtual/glu
+	virtual/libusb:1
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2
+	)
+	benchmark? (
+		dev-cpp/benchmark:=
+		dev-cpp/gtest
+		dev-util/google-perftools:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	midi? ( media-libs/portmidi )
+	modplug? ( media-libs/libmodplug )
+	mp3? (
+		media-libs/libid3tag:=
+		media-libs/libmad
+	)
+	mp4? ( media-libs/libmp4v2 )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	qtkeychain? ( >=dev-libs/qtkeychain-0.14.2:=[qt6(+)] )
+	rubberband? ( media-libs/rubberband:= )
+	shout? ( dev-libs/openssl:= )
+	upower? (
+		dev-libs/glib:2
+		sys-power/upower:=
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/ms-gsl
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	dev-util/spirv-tools
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Building mixxx-test target only with explicit test useflag
+	"${FILESDIR}"/${P}-tests.patch
+	# Fix strict-aliasing violations in vendored katai_cpp_stl_runtime
+	# https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/commit/c01f530.patch
+	"${FILESDIR}"/${PN}-2.5.0-fix-strict-aliasing-kaitai.patch
+)
+
+CMAKE_SKIP_TESTS=(
+	# need HID controller
+	LegacyControllerMappingValidationTest.HidMappingsValid
+	# randomly fails
+	# https://github.com/mixxxdj/mixxx/issues/12554
+	EngineBufferE2ETest
+)
+
+src_configure() {
+	# prevent ld error as package builds static libs.
+	tc-is-lto && append-flags $(test-flags -ffat-lto-objects)
+
+	local mycmakeargs=(
+		-DBATTERY="$(usex upower)"
+		-DBROADCAST="$(usex shout)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_BENCH="$(usex benchmark)"
+		# prevent duplicate call
+		-DCCACHE_SUPPORT=OFF
+		-DENGINEPRIME=OFF
+		-DFAAD="$(usex aac)"
+		-DFFMPEG="$(usex ffmpeg)"
+		-DGPERFTOOLS="$(usex benchmark)"
+		-DGPERFTOOLSPROFILER="$(usex benchmark)"
+		-DHID=ON
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder)"
+		-DLILV="$(usex lv2)"
+		-DMAD="$(usex mp3)"
+		-DMODPLUG="$(usex modplug)"
+		-DOPTIMIZE=OFF
+		-DOPUS="$(usex opus)"
+		-DPORTMIDI="$(usex midi)"
+		-DQML=ON
+		-DQTKEYCHAIN="$(usex qtkeychain)"
+		-DRUBBERBAND="$(usex rubberband)"
+		-DVINYLCONTROL=ON
+		-DWAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use benchmark && dobin "${BUILD_DIR}"/mixxx-test
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+
+	elog "Manuals are no longer part of the package."
+	elog "Please refer to https://downloads.mixxx.org/manual/ for up-to-date manuals."
+	if use benchmark; then
+		elog ""
+		elog "Launch benchmark : ${EROOT}/usr/bin/mixxx-test --benchmark"
+		elog "Launch Unittests : ${EROOT}/usr/bin/mixxx-test"
+		elog "Some test suites may not be available without source files."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
@ 2025-03-10 17:05 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2025-03-10 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2335023959f9d886cf5295e23e4d06a3f96d5e3b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 10 17:04:30 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 17:05:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23350239

media-sound/mixxx: drop 2.3.6-r2

Closes: https://bugs.gentoo.org/949928
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/mixxx/Manifest                         |  24 ---
 media-sound/mixxx/files/mixxx-2.3.0-cmake.patch    |  11 --
 media-sound/mixxx/files/mixxx-2.3.0-docs.patch     |  26 ----
 .../files/mixxx-2.3.1-benchmark_compile_fix.patch  |  10 --
 media-sound/mixxx/metadata.xml                     |   1 -
 media-sound/mixxx/mixxx-2.3.6-r2.ebuild            | 161 ---------------------
 6 files changed, 233 deletions(-)

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 39003609bcc1..5218e44640b7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,25 +1 @@
-DIST mixxx-2.3.6.tar.gz 41285084 BLAKE2B 35bedb5f41a56577bc59411ca979e3e780c1da2420bc0a7ad98d998c89f8c272202ba42e8b8089904ca8e1a1b6ac5155d08d556538245ce3242b4ea5a670e6d2 SHA512 a92c2c92dc7619ac135d940f23ffdc101c528eca6322517805afb9eb48a84c6339cefb88b96bdac6ffb23967c2f93f621daf3e98bfecbf7f3fe7626ddcec4398
 DIST mixxx-2.5.0.tar.gz 39580922 BLAKE2B e5c5aa02a4b13228857eb620ad174144562d7b4675a40565fda1e641138e0e65dbb2bbe8c7fb32ead242a5bdf8581368ea604c93afbfc5c991ac92065e7bdae7 SHA512 ee3c682d40267358025aba5bfdc378fee1cb6691dc899280132f7e69d315b9ce3d8568ca182752bac96a38310c2f2d71ddc80eea4448b8b32bf6ec6a61a9d608
-DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
-DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
-DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86 SHA512 fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc
-DIST mixxx-manual-2.3-en.pdf 34055279 BLAKE2B 1d4dac58d1d51dec0868f584b7c338a0f5889811c8c1770f89fb86a8ff25c189f68e58c39fb8d279622df1ae5955c3d5d476026976ea4c2144f1d264e0026273 SHA512 ae050aac9d10767de4f1793b9147a85cb41b2070d4747e50b4e17308dd6a4a54e049559473bb1c1dd0dcf0c50a51a649fd2e70aebde78139073adb4068e0ac77
-DIST mixxx-manual-2.3-es.pdf 34063874 BLAKE2B 9a08615f7f01051c01585b967ca82829e264335462874b42bab4314079d1cc08dd5678472403451dde83bd57097be0f827d1e15b4cfe6567a96e817403eea942 SHA512 0bfb5d45a950e08120856ebbd4af771ae4da646a5d77994f2423166b3f9c8c8c90087ccf7eb6ccd81d596867f351ea935623b7299d077d587e1265c7ecf196c1
-DIST mixxx-manual-2.3-fi.pdf 34061528 BLAKE2B e7408e8efec4fab095f6e46f8c25ec0410895cf3d4fac6e11b7ad048d27fa6226b5516c9fba5428f357bf979d7878811bbb719490675da20a06190a6b93e775d SHA512 70fa602c2c90c629a0b5b671f63ffff0110e8945ed76c7e9fe5b09ee167bb75e6a73d1d7c0a23ea30736710555cd1626c4c313cd45436488d3ecd254e245cd58
-DIST mixxx-manual-2.3-fr.pdf 34104354 BLAKE2B fd9b0c2d3a2705018771ca2ad4e609ec6a4a969148dc711bee4bd829f60a71713277cd94d0d95c6ca080a2c75233c7e395532aa816b1e2150c2fe45fe8242364 SHA512 cf8f9a0559845f1d4540d2a27ffa8b251e85aab6408166b352416f357ea045387ab8dd60c746b99c7d84eaf708f8d173bc16d4b92ebf726042b7aea59d3c460d
-DIST mixxx-manual-2.3-gl.pdf 34059337 BLAKE2B 27cc942a0fd9994c573913e246d833e5014b535d152c338d18cd30d3f4f6cf2ffaf782a076862a7df638d0c7b2b61fb23dee61fa51f0cd3e4a4abed47ec48843 SHA512 17460fba1e754018b67d010fd529218b26a0218cc22c3da3ad92db837c5e5cc7d81ae463b168e965a296fff7fb790ee1e04a8228b5596450027cec12bb445a1e
-DIST mixxx-manual-2.3-id.pdf 34061075 BLAKE2B 382d72e6429a83586f1b32779d2abef3a4610688b4bbd194568d4561f8df9d388dcb18cdfe3fd005a79cfca1ea32c948531d7964524d3195c65686d9eff11483 SHA512 231b5e8e617b714095952350dcf84ad5038d37a3e15071f32a827917c8a74bdf16aa529e7832eb46b12169156c30665365c6d4e354ec85a523641fb83d06ac07
-DIST mixxx-manual-2.3-it.pdf 34065113 BLAKE2B 44c7cb83d17c3529096c3f94eab77a9cd6d09e2b33032042efcb8ba776fcf02cb298c5cd6e029bf33c1cd1f3a5239540a2e071cd091960bb3ce8e356fb9f7448 SHA512 d899171401fa5bc3b20b78997aa80cd806c7c2a901ff3e05204c819a7c039d460d09bc29276e862718e84db2e0c2875155b4bb20320b323668a971fc99a5fcdd
-DIST mixxx-manual-2.3-ja-JP.pdf 32835197 BLAKE2B d4fffe0297abaef128fabb14bbead429cf6ee0249b7a7679af88e5cbde606a2ec5f2f2f6fa587efa4fb8f37ebc5559af2e39dca67c20098f12a0442079248ed3 SHA512 ddb288925ceb759ecb33820326d400f5c5fa02a7e8905c5d84b374c6d3eb646fe0da738aa617c787bb9787d0b9be538ef123cb016c5ab0dfd12d77685717ae04
-DIST mixxx-manual-2.3-kn.pdf 34058121 BLAKE2B 9d33e5c2c4f2a4d558968b9af495263dbe817ccc9aeadac947e5eec738d658b303ace613bf9824fae4a5c7de4040ecfea66092bc4dea9306fed610abfc1dd5a9 SHA512 e09a231d17f0c69a95df89112c75ed0a683783d4b1561c575f6ea7b9cc16e0129ba4aa7bd1968ad33cd068826bd9b2ac7bd986b5e9ba99251b87fd618f906cc3
-DIST mixxx-manual-2.3-nl.pdf 34060208 BLAKE2B ccecf45483bfe42691893d68abe8955d57af03116a44e5d4aed506686ec9e77113e424b0eca0e1e9cecefac281749cfba2bc273c0c3caf9da5acf0f2070fdf03 SHA512 5329383a9be0ab39110efc11cd6c3465fc7e57d830b46bf7065a44b1dff330406367f249a9da36a898b26979464ecb68baa1f3e08dad18aba087a0e659048d74
-DIST mixxx-manual-2.3-pl.pdf 34067404 BLAKE2B d50af6a710b1e08a67742bbb97d5c62127ca63508344c6986b5ceede39a58203f950516c6ce9b6a8df00dedc9231e216f63dfe268ec23a204cf67d51809a90a9 SHA512 9fba40e45913e56fb64f3071a0255b459c58a882306ed62e06ed358b8c8a2f209184d55b6f833bd5fdadeb85e0be73b3fa1b8a9ba5093368a0fec384a35a4be1
-DIST mixxx-manual-2.3-pt.pdf 34062564 BLAKE2B 13bdfd9ecf376a6fd516bbacd382956628338c1da77354a8d946c53f4c66828726d50c0fdc26294034853db42daad7bc448aaa3bbac676f82117d1fe68d7cbf4 SHA512 ce73a8bb92832e446bbd6e4ed177455011b0be3210ff11a31dcb2ba6d3c9c7e97495cb34ae1bec30d31be939ea396af70106b61c7b3262c1afdce489e79c8739
-DIST mixxx-manual-2.3-ro.pdf 34067722 BLAKE2B 70cc517f0926fe1bc867d723a0bffcf6dedc75ef0e5cda0ab1a1294f28aad45fdd8f0a9373573ae2d1466a7832710c621cd1c84f692733ad2262e1c98f669872 SHA512 57b60df38aca9000d73bdd1a58c4bb5633340f37d284e6f92921216ac09d38a53415dafc374e43fbffbe2cf528299a61e744db96ab6aa808e11bc30dbc4f8c1d
-DIST mixxx-manual-2.3-ru.pdf 34024493 BLAKE2B d3faca1606cf155ecbf8215d9e0ab94167ff5e536a96625679993000186b02c41d9867490808458d1bd00fd837817a6ddc5e9c5286ef2c71d2ea0aec48e562bc SHA512 9c4abaccb3f6ff452d6d356853a4ba4cf4bd7bbfe9314edcf3c8adf8ff2902445c8ec377cdd3ef97acca1e2a2dccc453f670c2abbfc69cf43a2ab05ac2040bf9
-DIST mixxx-manual-2.3-sl.pdf 34102881 BLAKE2B d7bb7470b7d0164ce7c5ad6341889e465afc2d3e1f79fd57dd708ff2170cb6f7e65773f1977b512caebee41d0313891be7e684f386d176673bfe577f20a3ed4d SHA512 c2f79073b2e3c5afc45f48076314cbdde5a2b60e359e688ff7d1b2c7550c3b2ab4be7a1ab601e4a3b58506e0f86aad9e4ae21b1beb7e3eee067572e6114d60bd
-DIST mixxx-manual-2.3-sq.pdf 34074464 BLAKE2B 2ea7e6b58f821a1969a2bfe167c6045ec4410ef3f87edbabbd28fd304ec2bed1d76591452f08fe3ce627bff9e8bd1ffd70fb80fd66cdf6fc992a7e70800cea7f SHA512 c7d702dde88f4c5607c8fbacb7a89f68f3b42b1a16ae15e478a6ee2165eeee1739d7195ef201cc84b81ab668103a553f12ad9e49b055a34c01ead4f0fbab07e7
-DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b530017631621c3c77dcf9944e9ebf6a4bbbcd0202e5aafae9bded76d6c6fd464d8faf7803e16fbb298c597ba59224c8cefab4d56 SHA512 6fd07e473348fe93fc0bf68cd05ae8c78e9a624e48422480b7723952a067489cd72d90f0752f91e3c343e3caae57660b0721a6c947db3c3fb83591373f0829f2
-DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
-DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
-DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f

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

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

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

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 8b62b2d0884f..816354871636 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="benchmark">Build and install benchmark binary: mixxx-test --benchmark</flag>
-		<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="midi">Enable MIDI support via <pkg>media-libs/portmidi</pkg></flag>

diff --git a/media-sound/mixxx/mixxx-2.3.6-r2.ebuild b/media-sound/mixxx/mixxx-2.3.6-r2.ebuild
deleted file mode 100644
index 897dc9b61bca..000000000000
--- a/media-sound/mixxx/mixxx-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg udev
-
-MY_PV=$(ver_cut 1-2)
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://mixxx.org/"
-if [[ ${PV} == *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 ~arm64 x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
-
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac:=
-	media-libs/libebur128
-	media-libs/libid3tag:=
-	media-libs/libogg
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/libvorbis
-	media-libs/portaudio[alsa]
-	media-libs/portmidi
-	media-libs/rubberband
-	<media-libs/taglib-2
-	media-libs/vamp-plugin-sdk
-	media-sound/lame
-	sci-libs/fftw:3.0=
-	sys-power/upower
-	virtual/glu
-	virtual/libusb:1
-	virtual/opengl
-	virtual/udev
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	hid? ( dev-libs/hidapi )
-	keyfinder? ( media-libs/libkeyfinder )
-	lv2? ( media-libs/lilv )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
-	wavpack? ( media-sound/wavpack )
-"
-	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
-	# available in ::gentoo
-	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
-	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
-
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-"
-BDEPEND="
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-docs.patch
-	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
-	"${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/${MY_PV}"
-	for lang in ${PLOCALES} ; do
-		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )"
-		IUSE+=" l10n_${lang/ en/ +en}"
-	done
-	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf"
-}
-mixxx_set_globals
-
-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_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-${MY_PV}-${locale/ja/ja-JP}.pdf
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	udev_reload
-}


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

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

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 17:05 [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 --
2025-02-10 20:42 Andreas Sturmlechner
2025-02-10 20:42 Andreas Sturmlechner
2025-01-30 22:39 Andreas Sturmlechner
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
2020-01-24 22:48 Andreas Sturmlechner
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