commit: cdc315bb36142dafc122e6338bb64c4da84f62dd Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Jan 18 08:50:34 2022 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Jan 18 08:50:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc315bb
media-sound/mixxx: Bump to version 2.3.1 Closes: https://bugs.gentoo.org/809305 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-sound/mixxx/Manifest | 1 + media-sound/mixxx/files/mixxx-2.3.0-cmake.patch | 11 ++ media-sound/mixxx/files/mixxx-2.3.0-docs.patch | 26 +++++ .../files/mixxx-2.3.1-benchmark_compile_fix.patch | 10 ++ media-sound/mixxx/mixxx-2.3.1.ebuild | 130 +++++++++++++++++++++ 5 files changed, 178 insertions(+) diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 34cfc9a0f4f6..21aab8965e21 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1 +1,2 @@ DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa +DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be SHA512 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816 diff --git a/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch new file mode 100644 index 000000000000..b573a624d31e --- /dev/null +++ b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch @@ -0,0 +1,11 @@ +--- mixxx-2.3.0/CMakeLists.txt ++++ mixxx-2.3.0/CMakeLists.txt +@@ -53,8 +53,6 @@ + set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo") +- elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo)$") +- message(FATAL_ERROR "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} is not supported, use one of Debug, Release or RelWithDebInfo.") + endif() + endif() + diff --git a/media-sound/mixxx/files/mixxx-2.3.0-docs.patch b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch new file mode 100644 index 000000000000..e956e1ce2401 --- /dev/null +++ b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch @@ -0,0 +1,26 @@ +--- mixxx-2.3.0/CMakeLists.txt ++++ mixxx-2.3.0/CMakeLists.txt +@@ -1320,23 +1320,6 @@ + "${MIXXX_INSTALL_LICENSEDIR}" + ) + +-# Documentation +-install( +- FILES +- "${CMAKE_CURRENT_SOURCE_DIR}/README.md" +- "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf" +- DESTINATION +- "${MIXXX_INSTALL_DOCDIR}" +-) +-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf") +- install( +- FILES +- "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf" +- DESTINATION +- "${MIXXX_INSTALL_DOCDIR}" +- ) +-endif() +- + # Additional Linux-only files + if(UNIX AND NOT APPLE) + # .desktop file for KDE/GNOME menu diff --git a/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch new file mode 100644 index 000000000000..2ab50c85309e --- /dev/null +++ b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch @@ -0,0 +1,10 @@ +--- mixxx-2.3.1/lib/benchmark/src/benchmark_register.h ++++ mixxx-2.3.1/lib/benchmark/src/benchmark_register.h +@@ -2,6 +2,7 @@ + #define BENCHMARK_REGISTER_H + + #include <vector> ++#include <limits> + + #include "check.h" + diff --git a/media-sound/mixxx/mixxx-2.3.1.ebuild b/media-sound/mixxx/mixxx-2.3.1.ebuild new file mode 100644 index 000000000000..c949498e285a --- /dev/null +++ b/media-sound/mixxx/mixxx-2.3.1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg udev + +DESCRIPTION="Advanced Digital DJ tool based on Qt" +HOMEPAGE="https://www.mixxx.org/"; +if [[ "${PV}" == *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 doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack" + +RDEPEND=" + dev-db/sqlite + dev-libs/glib:2 + dev-libs/protobuf:0= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + 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 + 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 + 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 ) + mp3? ( media-libs/libmad ) + mp4? ( media-libs/libmp4v2:= ) + opus? ( media-libs/opusfile ) + qtkeychain? ( dev-libs/qtkeychain ) + shout? ( >=media-libs/libshout-2.4.5 ) + wavpack? ( media-sound/wavpack ) + " + +DEPEND="${RDEPEND}" +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 +) + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + 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)" + ) + + 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 + + if use doc ; then + dodoc README Mixxx-Manual.pdf + fi +}
