Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/
Date: Tue, 18 Jan 2022 08:50:58
Message-Id: 1642495845.cdc315bb36142dafc122e6338bb64c4da84f62dd.polynomial-c@gentoo
1 commit: cdc315bb36142dafc122e6338bb64c4da84f62dd
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 18 08:50:34 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 08:50:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc315bb
7
8 media-sound/mixxx: Bump to version 2.3.1
9
10 Closes: https://bugs.gentoo.org/809305
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-sound/mixxx/Manifest | 1 +
14 media-sound/mixxx/files/mixxx-2.3.0-cmake.patch | 11 ++
15 media-sound/mixxx/files/mixxx-2.3.0-docs.patch | 26 +++++
16 .../files/mixxx-2.3.1-benchmark_compile_fix.patch | 10 ++
17 media-sound/mixxx/mixxx-2.3.1.ebuild | 130 +++++++++++++++++++++
18 5 files changed, 178 insertions(+)
19
20 diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
21 index 34cfc9a0f4f6..21aab8965e21 100644
22 --- a/media-sound/mixxx/Manifest
23 +++ b/media-sound/mixxx/Manifest
24 @@ -1 +1,2 @@
25 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
26 +DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be SHA512 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
27
28 diff --git a/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
29 new file mode 100644
30 index 000000000000..b573a624d31e
31 --- /dev/null
32 +++ b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
33 @@ -0,0 +1,11 @@
34 +--- mixxx-2.3.0/CMakeLists.txt
35 ++++ mixxx-2.3.0/CMakeLists.txt
36 +@@ -53,8 +53,6 @@
37 + set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
38 + # Set the possible values of build type for cmake-gui
39 + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo")
40 +- elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo)$")
41 +- message(FATAL_ERROR "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} is not supported, use one of Debug, Release or RelWithDebInfo.")
42 + endif()
43 + endif()
44 +
45
46 diff --git a/media-sound/mixxx/files/mixxx-2.3.0-docs.patch b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
47 new file mode 100644
48 index 000000000000..e956e1ce2401
49 --- /dev/null
50 +++ b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
51 @@ -0,0 +1,26 @@
52 +--- mixxx-2.3.0/CMakeLists.txt
53 ++++ mixxx-2.3.0/CMakeLists.txt
54 +@@ -1320,23 +1320,6 @@
55 + "${MIXXX_INSTALL_LICENSEDIR}"
56 + )
57 +
58 +-# Documentation
59 +-install(
60 +- FILES
61 +- "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
62 +- "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
63 +- DESTINATION
64 +- "${MIXXX_INSTALL_DOCDIR}"
65 +-)
66 +-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
67 +- install(
68 +- FILES
69 +- "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
70 +- DESTINATION
71 +- "${MIXXX_INSTALL_DOCDIR}"
72 +- )
73 +-endif()
74 +-
75 + # Additional Linux-only files
76 + if(UNIX AND NOT APPLE)
77 + # .desktop file for KDE/GNOME menu
78
79 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
80 new file mode 100644
81 index 000000000000..2ab50c85309e
82 --- /dev/null
83 +++ b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
84 @@ -0,0 +1,10 @@
85 +--- mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
86 ++++ mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
87 +@@ -2,6 +2,7 @@
88 + #define BENCHMARK_REGISTER_H
89 +
90 + #include <vector>
91 ++#include <limits>
92 +
93 + #include "check.h"
94 +
95
96 diff --git a/media-sound/mixxx/mixxx-2.3.1.ebuild b/media-sound/mixxx/mixxx-2.3.1.ebuild
97 new file mode 100644
98 index 000000000000..c949498e285a
99 --- /dev/null
100 +++ b/media-sound/mixxx/mixxx-2.3.1.ebuild
101 @@ -0,0 +1,130 @@
102 +# Copyright 1999-2022 Gentoo Authors
103 +# Distributed under the terms of the GNU General Public License v2
104 +
105 +EAPI=7
106 +
107 +inherit cmake xdg udev
108 +
109 +DESCRIPTION="Advanced Digital DJ tool based on Qt"
110 +HOMEPAGE="https://www.mixxx.org/"
111 +if [[ "${PV}" == *9999 ]] ; then
112 + inherit git-r3
113 + if [[ "${PV}" == ?.?.9999 ]] ; then
114 + EGIT_BRANCH=${PV%.9999}
115 + fi
116 + EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
117 +else
118 + SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
119 + #S="${WORKDIR}/${PN}-release-${PV}"
120 + KEYWORDS="~amd64 ~x86"
121 +fi
122 +LICENSE="GPL-2"
123 +SLOT="0"
124 +IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
125 +
126 +RDEPEND="
127 + dev-db/sqlite
128 + dev-libs/glib:2
129 + dev-libs/protobuf:0=
130 + dev-qt/qtconcurrent:5
131 + dev-qt/qtcore:5
132 + dev-qt/qtdbus:5
133 + dev-qt/qtgui:5
134 + dev-qt/qtnetwork:5
135 + dev-qt/qtopengl:5
136 + dev-qt/qtscript:5[scripttools]
137 + dev-qt/qtsql:5
138 + dev-qt/qtsvg:5
139 + dev-qt/qtwidgets:5
140 + dev-qt/qtx11extras:5
141 + dev-qt/qtxml:5
142 + media-libs/chromaprint
143 + media-libs/flac
144 + media-libs/libebur128
145 + media-libs/libid3tag:=
146 + media-libs/libogg
147 + media-libs/libsndfile
148 + media-libs/libsoundtouch
149 + media-libs/libvorbis
150 + media-libs/portaudio
151 + media-libs/portmidi
152 + media-libs/rubberband
153 + media-libs/taglib
154 + media-libs/vamp-plugin-sdk
155 + sci-libs/fftw:3.0=
156 + sys-power/upower
157 + virtual/glu
158 + virtual/libusb:1
159 + virtual/opengl
160 + virtual/udev
161 + x11-libs/libX11
162 + aac? (
163 + media-libs/faad2
164 + media-libs/libmp4v2:0
165 + )
166 + ffmpeg? ( media-video/ffmpeg:0= )
167 + hid? ( dev-libs/hidapi )
168 + keyfinder? ( media-libs/libkeyfinder )
169 + lv2? ( media-libs/lilv )
170 + mp3? ( media-libs/libmad )
171 + mp4? ( media-libs/libmp4v2:= )
172 + opus? ( media-libs/opusfile )
173 + qtkeychain? ( dev-libs/qtkeychain )
174 + shout? ( >=media-libs/libshout-2.4.5 )
175 + wavpack? ( media-sound/wavpack )
176 + "
177 +
178 +DEPEND="${RDEPEND}"
179 +BDEPEND="virtual/pkgconfig
180 + dev-qt/qttest:5
181 + dev-qt/qtxmlpatterns:5"
182 +
183 +PATCHES=(
184 + "${FILESDIR}"/${PN}-2.3.0-docs.patch
185 + "${FILESDIR}"/${PN}-2.3.0-cmake.patch
186 + "${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
187 +)
188 +
189 +src_prepare() {
190 + cmake_src_prepare
191 +}
192 +
193 +src_configure() {
194 + local mycmakeargs=(
195 + -DFAAD="$(usex aac on off)"
196 + -DFFMPEG="$(usex ffmpeg on off)"
197 + -DHID="$(usex hid on off)"
198 + -DLILV="$(usex lv2 on off)"
199 + -DMAD="$(usex mp3 on off)"
200 + -DOPTIMIZE="off"
201 + -DCCACHE_SUPPORT="off"
202 + -DOPUS="$(usex opus on off)"
203 + -DBROADCAST="$(usex shout on off)"
204 + -DVINYLCONTROL="on"
205 + -DINSTALL_USER_UDEV_RULES=OFF
206 + -DWAVPACK="$(usex wavpack on off)"
207 + -DQTKEYCHAIN="$(usex qtkeychain on off)"
208 + -DKEYFINDER="$(usex keyfinder on off)"
209 + )
210 +
211 + if [[ "${PV}" == 9999 ]] ; then
212 + mycmakeargs+=(
213 + -DENGINEPRIME="OFF"
214 +
215 + )
216 + fi
217 + cmake_src_configure
218 +}
219 +
220 +src_compile() {
221 + cmake_src_compile
222 +}
223 +
224 +src_install() {
225 + cmake_src_install
226 + udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
227 +
228 + if use doc ; then
229 + dodoc README Mixxx-Manual.pdf
230 + fi
231 +}