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.bra...@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.bra...@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 -}
