commit: be9677916e64a3d9b80fa5e902db1b8cee4db256 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Jan 27 20:07:30 2026 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Jan 27 20:07:30 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be967791
media-sound/mixxx: dropped obsolete 2.5.3 Bug: https://bugs.gentoo.org/968800 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/mixxx/Manifest | 1 - .../mixxx-2.5.0-fix-strict-aliasing-kaitai.patch | 115 -------------- media-sound/mixxx/mixxx-2.5.3.ebuild | 173 --------------------- 3 files changed, 289 deletions(-) diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index b61c8467bb42..92a291be32af 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,2 +1 @@ -DIST mixxx-2.5.3.tar.gz 40055675 BLAKE2B 613d6eb774345eff58525442d4240227fe10910854f20833358640783bf4f7b429cbedded3b644c96dd7a7bdb9ff022458c4b0398a29c8d6723d7faeb7519607 SHA512 3dbb87fdc02e2dc38a370a7c78ce66140d69b6b84f6b5db986da83dc559de0a7ed9b9c72a52e94363eb86b94fee2176718b3d8fbc921fce1741a144bd693ea9d DIST mixxx-2.5.4.tar.gz 40315669 BLAKE2B 130073f0484dc34e76e3ea306c71281dc153ffb731e8a64c51ede2d42d8b00f39778b50dc3290de008311b7365485e40604e19d8312858e682e479b86940421b SHA512 ded35b6c3e6934de2f6d36c7dedc8c36b5d37cea675faf1adba870b1c1d64d8b86f12783fe5bb42828b6fbd2029fec5b2725752c295d71da70c3aa125cc13b9c 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 deleted file mode 100644 index 2f06bbbb9c78..000000000000 --- a/media-sound/mixxx/files/mixxx-2.5.0-fix-strict-aliasing-kaitai.patch +++ /dev/null @@ -1,115 +0,0 @@ -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/mixxx-2.5.3.ebuild b/media-sound/mixxx/mixxx-2.5.3.ebuild deleted file mode 100644 index d829ca4f74da..000000000000 --- a/media-sound/mixxx/mixxx-2.5.3.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake dot-a 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" -# gles2-only: at least not before 2.6 for keyworded ebuild -IUSE="aac benchmark ffmpeg keyfinder lv2 midi modplug mp3 mp4 opus" -IUSE+=" qtkeychain rubberband shout test upower wavpack +X" -REQUIRED_USE=" - benchmark? ( test ) - qtkeychain? ( shout ) - test? ( aac ffmpeg midi mp3 opus rubberband ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-db/sqlite:3 - dev-cpp/abseil-cpp:= - dev-libs/hidapi - dev-libs/protobuf:= - dev-qt/qt5compat:6 - dev-qt/qtbase:6[concurrent,dbus,-gles2-only,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:= - media-sound/lame - virtual/libusb:1 - virtual/udev - 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 ) - X? ( x11-libs/libX11 ) -" -DEPEND="${RDEPEND} - dev-cpp/gtest - dev-cpp/ms-gsl -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - # 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 - # Try OpenGL::OpenGL first for X11-less system - # Make libX11 optional. Merged in main branch. - "${FILESDIR}"/${PN}-2.5.2-x11_opt.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. - lto-guarantee-fat - - 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 - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) - -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)" - # new QML-UI, experimental and not functionnal for now - -DQML=OFF - -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 -}
