* [gentoo-commits] repo/user/gerislay:master commit in: media-sound/mixxx/, media-sound/mixxx/files/
@ 2021-08-21 0:49 gerion
0 siblings, 0 replies; 3+ messages in thread
From: gerion @ 2021-08-21 0:49 UTC (permalink / raw
To: gentoo-commits
commit: 23538d19b8bff5e3bfd19228888c020d1c6dc9d2
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Sat Aug 21 00:46:29 2021 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Sat Aug 21 00:46:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=23538d19
media-sound/mixxx-9999: add
Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
media-sound/mixxx/Manifest | 4 +
media-sound/mixxx/files/mixxx-9999-docs.patch | 41 +++++++
.../mixxx/files/mixxx-9999-gentoo-build.patch | 13 +++
media-sound/mixxx/metadata.xml | 19 ++++
media-sound/mixxx/mixxx-9999.ebuild | 125 +++++++++++++++++++++
5 files changed, 202 insertions(+)
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
new file mode 100644
index 0000000..6e2bac3
--- /dev/null
+++ b/media-sound/mixxx/Manifest
@@ -0,0 +1,4 @@
+AUX mixxx-9999-docs.patch 1043 BLAKE2B bfdb51de701e279f841de83cce6bccd613feaaeb7ffe2e209f357837d52d6cbf2ab452916752f8e6f8cec635a39e0efa5d1f7a921d76d8d093876584151fc35b SHA512 8be44f7d286c5fe6cabbd64d9294f72aada7fb3bfdeb8d0787772e131e48642698bdf0fd1975f8a385a5e76508889464e4c4f0f377b0c60f61fc967ee647e661
+AUX mixxx-9999-gentoo-build.patch 651 BLAKE2B 7f20c41fa4bf89be5e1e8dff28daf9d72e5ef20f2e71fcde97504cad4de50dd40af83fa5542bba6a1e156d9fe31e3c39486f9b2494c4855e890f3aa43d606768 SHA512 490309a7d49f385d75b54acbc155ec0e011e7f7753a7b876c123d521dc32659172c5e3354ceff47251746807b8182792ba3ee1e26bbe907dc7c99f7ab6d7c99f
+EBUILD mixxx-9999.ebuild 2764 BLAKE2B 376e42b36aa436d8dbf54cf31894b69c23c0154c6608d080a088028dfe3adc8285d1723fc5d5707bfeee44238b4b84f6a39bcd229004e983e27a7e19911c569b SHA512 b51bbe7d43b2e44d83f10179995341cf41569f57157e085cf0c8baec999bd9998a8d359918e8ddee14cc96bf403e79bb04cda32dcd3c7710403157cf4fbf7c27
+MISC metadata.xml 849 BLAKE2B 68fcb8b3e3353ad0c99ff9532c5b098738addbe5f3965bc931d5555f0110ee3b4a39514ae471881d8a4b0270d4257e502bd82d9010b235394ae3d0daf2ba4089 SHA512 eb222405a3de8c013d44b2fb114d42f32d54651309ec66176433ad055937a45d4dc7cc2cf3075a413ba508348100f74bd4c06ac77fc7960fbcf915d86bb02336
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 0000000..b47b349
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e52fe65faf..870cdfaec3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1359,21 +1359,21 @@ install(
+ )
+
+ # 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()
++# 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)
diff --git a/media-sound/mixxx/files/mixxx-9999-gentoo-build.patch b/media-sound/mixxx/files/mixxx-9999-gentoo-build.patch
new file mode 100644
index 0000000..564fe80
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-gentoo-build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c8dc23e5f5..1a84946f9d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,8 +53,6 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ 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/metadata.xml b/media-sound/mixxx/metadata.xml
new file mode 100644
index 0000000..c20e54f
--- /dev/null
+++ b/media-sound/mixxx/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </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>
+ <remote-id type="sourceforge">mixxx</remote-id>
+ <remote-id type="github">mixxxdj/mixxx</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
new file mode 100644
index 0000000..322c7b6
--- /dev/null
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 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 || ?.?.9999 ]] ; then
+ inherit git-r3
+ 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"
+fi
+
+if [[ "${PV}" == ?.?.9999 ]] ; then
+ EGIT_BRANCH=${PV%.9999}
+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-0.10.1 )
+ 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}"/mixxx-9999-docs.patch
+ "${FILESDIR}"/mixxx-9999-gentoo-build.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)"
+ -DENGINEPRIME="OFF"
+ )
+ 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 res/Mixxx-Manual.pdf res/Mixxx-Keyboard-Shortcuts.pdf
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/user/gerislay:master commit in: media-sound/mixxx/, media-sound/mixxx/files/
@ 2021-11-06 5:50 gerion
0 siblings, 0 replies; 3+ messages in thread
From: gerion @ 2021-11-06 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 9003d67b4072e7879fedcf823a4e4855aa6b199c
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Sat Nov 6 04:25:34 2021 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Sat Nov 6 04:26:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=9003d67b
media-sound/mixxx: fix compilation
Drop mixxx-test build. This disables the test but don't require
google/benchmark anymore.
Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
media-sound/mixxx/Manifest | 3 +-
media-sound/mixxx/files/drop-mixxx-test.patch | 194 ++++++++++++++++++++++++++
media-sound/mixxx/mixxx-9999.ebuild | 1 +
3 files changed, 197 insertions(+), 1 deletion(-)
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 6e2bac3..3940456 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
+AUX drop-mixxx-test.patch 6540 BLAKE2B 63de950b2555c58ed5c70c8cf6c0c50c97a98c3f7aac0873f9d12b131bef29836d70650c2cc5154b1d890e3c20d89d5d70d0dc7ddfc7977d084e24b3c5d163d9 SHA512 c5790b626c43573d23c524d9280031f157e0a0e3fa9ff6e4bd0c480a25c0a0b95e0598a4a137ee7361ca09df0144ae0d7c41b80aab8ccaaa1bd149e8d745e71f
AUX mixxx-9999-docs.patch 1043 BLAKE2B bfdb51de701e279f841de83cce6bccd613feaaeb7ffe2e209f357837d52d6cbf2ab452916752f8e6f8cec635a39e0efa5d1f7a921d76d8d093876584151fc35b SHA512 8be44f7d286c5fe6cabbd64d9294f72aada7fb3bfdeb8d0787772e131e48642698bdf0fd1975f8a385a5e76508889464e4c4f0f377b0c60f61fc967ee647e661
AUX mixxx-9999-gentoo-build.patch 651 BLAKE2B 7f20c41fa4bf89be5e1e8dff28daf9d72e5ef20f2e71fcde97504cad4de50dd40af83fa5542bba6a1e156d9fe31e3c39486f9b2494c4855e890f3aa43d606768 SHA512 490309a7d49f385d75b54acbc155ec0e011e7f7753a7b876c123d521dc32659172c5e3354ceff47251746807b8182792ba3ee1e26bbe907dc7c99f7ab6d7c99f
-EBUILD mixxx-9999.ebuild 2764 BLAKE2B 376e42b36aa436d8dbf54cf31894b69c23c0154c6608d080a088028dfe3adc8285d1723fc5d5707bfeee44238b4b84f6a39bcd229004e983e27a7e19911c569b SHA512 b51bbe7d43b2e44d83f10179995341cf41569f57157e085cf0c8baec999bd9998a8d359918e8ddee14cc96bf403e79bb04cda32dcd3c7710403157cf4fbf7c27
+EBUILD mixxx-9999.ebuild 2801 BLAKE2B 8e171b776bc7e9beae0fd3d817519c3a53c7c153d8156b3382aee5e5993b4319c8529aaf6718c28310c7c4dc6555cf3b0b610f958bbb2d6bc815130822529728 SHA512 6185bc920410d00f67e5eb0d6790209b482b8e0d46f27532d41a1341b0ee18ee4d3728e7320eb7f440ca2574f7bcfaf89ef51f98e319be16a6896b690626c1f4
MISC metadata.xml 849 BLAKE2B 68fcb8b3e3353ad0c99ff9532c5b098738addbe5f3965bc931d5555f0110ee3b4a39514ae471881d8a4b0270d4257e502bd82d9010b235394ae3d0daf2ba4089 SHA512 eb222405a3de8c013d44b2fb114d42f32d54651309ec66176433ad055937a45d4dc7cc2cf3075a413ba508348100f74bd4c06ac77fc7960fbcf915d86bb02336
diff --git a/media-sound/mixxx/files/drop-mixxx-test.patch b/media-sound/mixxx/files/drop-mixxx-test.patch
new file mode 100644
index 0000000..4cce055
--- /dev/null
+++ b/media-sound/mixxx/files/drop-mixxx-test.patch
@@ -0,0 +1,194 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 278fca7b27..dbc451862c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1567,172 +1567,6 @@ add_subdirectory(
+ "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest"
+ )
+
+-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/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/controllerscriptenginelegacy_test.cpp
+- src/test/controlobjecttest.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/enginemastertest.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/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/movinginterquartilemean_test.cpp
+- src/test/nativeeffects_test.cpp
+- src/test/performancetimer_test.cpp
+- src/test/playcountertest.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/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/tableview_test.cpp
+- src/test/taglibtest.cpp
+- src/test/trackdao_test.cpp
+- src/test/trackexport_test.cpp
+- src/test/trackmetadata_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
+-)
+-set_target_properties(mixxx-test PROPERTIES AUTOMOC ON)
+-target_link_libraries(mixxx-test PRIVATE mixxx-lib mixxx-gitinfostore gtest gmock)
+-
+-#
+-# Benchmark tests
+-#
+-
+-# Disable testing of google/benchmark
+-set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
+-
+-# Prevent installation of google/benchmark artifacts
+-set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable installation of google/benchmark" FORCE)
+-
+-add_subdirectory(
+- "${CMAKE_CURRENT_SOURCE_DIR}/lib/benchmark"
+- "${CMAKE_CURRENT_BINARY_DIR}/lib/benchmark"
+-)
+-target_link_libraries(mixxx-test PRIVATE 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()
+-
+-# 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)
+-
+-if(UNIX AND USE_SYMLINKS)
+- add_custom_target(mixxx-testdata
+- COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/src/test" "${CMAKE_CURRENT_BINARY_DIR}/src/test"
+- COMMENT "Symlinking test data to build directory..."
+- )
+-elseif(WIN32)
+- file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/test" CMAKE_CURRENT_SOURCE_TESTDATA_DIR_NATIVE)
+- file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/test/" CMAKE_CURRENT_BINARY_TESTDATA_DIR_NATIVE)
+- add_custom_target(mixxx-testdata
+- COMMAND xcopy ${CMAKE_CURRENT_SOURCE_TESTDATA_DIR_NATIVE} ${CMAKE_CURRENT_BINARY_TESTDATA_DIR_NATIVE} /s /d /q /y
+- COMMENT "Copying missing or modified test data files to build directory..."
+- )
+-else()
+- add_custom_target(mixxx-testdata
+- COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/src/test" "${CMAKE_CURRENT_BINARY_DIR}/src/test"
+- COMMENT "Copying all test data files to build directory..."
+- )
+-endif()
+-add_dependencies(mixxx-test mixxx-testdata)
+-
+ #
+ # Resources
+ #
+@@ -1762,8 +1596,6 @@ 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 (MIXXX_VERSION_PRERELEASE STREQUAL "")
+ set(MIXXX_VERSION "${CMAKE_PROJECT_VERSION}")
+@@ -2604,7 +2436,6 @@ 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)
+ endif()
+
+ # Live Broadcasting (Shoutcast)
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 322c7b6..5ae2f1d 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -84,6 +84,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}"/mixxx-9999-docs.patch
"${FILESDIR}"/mixxx-9999-gentoo-build.patch
+ "${FILESDIR}"/drop-mixxx-test.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/user/gerislay:master commit in: media-sound/mixxx/, media-sound/mixxx/files/
@ 2019-03-25 8:54 gerion
0 siblings, 0 replies; 3+ messages in thread
From: gerion @ 2019-03-25 8:54 UTC (permalink / raw
To: gentoo-commits
commit: cbbf243565a678b065f361b20ee6345156f3ea83
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Mon Mar 25 08:54:26 2019 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Mon Mar 25 08:54:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=cbbf2435
media-sound/mixxx: drop, fixed in tree
Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
media-sound/mixxx/Manifest | 4 -
media-sound/mixxx/files/mixxx-2.0.0-docs.patch | 10 --
.../mixxx/files/mixxx-2.2.0-lilv_include_fix.patch | 33 ------
media-sound/mixxx/metadata.xml | 17 ---
media-sound/mixxx/mixxx-9999.ebuild | 131 ---------------------
5 files changed, 195 deletions(-)
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
deleted file mode 100644
index a628a75..0000000
--- a/media-sound/mixxx/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mixxx-2.0.0-docs.patch 427 BLAKE2B a5a14e20678661c24511d01a55712b1afa1d16a92f3ca17061297a9ea7affb10312a4a5b6ee6083685b617e7ee41c85d0a83ba5e8c113fccc7c70fbe77266c6f SHA512 07d6ee8d857ed63dae3ce63c7f411226f443f366f1dd01bd023e3b2a639eb77501be0e47206c8dccad6ad4fb409a10861fbb448b47b7415fe484bc5043d137e0
-AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
-EBUILD mixxx-9999.ebuild 2912 BLAKE2B 7a171c78685487333ad67789da560b5cdc46572dc3e6cd37c73326d71684e457292574f93f49b0ce53840037e73a92d782bfbc2e5fd4df0275b1a9b32b507780 SHA512 090da24a559edd85e90eb46307b32419f770d911324cdbb73a7528198b8a79e9d7c7a84ee5a18e60a102a559107e3172e6edd76bb7de0113eb4b299d20377fd1
-MISC metadata.xml 625 BLAKE2B ab6c43fa511101affba1c6777872541d81661da8c321c138f9a43bd8329f0cca9e3b21bbc0773dba874936ffd5b38a2ca28878fabe89e348bf018a991c9516f6 SHA512 ff270bf2c9a03de23bc8c1a6812590c4b99fa1465f21bbb0e117595f90a89d62fbb8ca8b42a1271a31a662d73bb9427fc52b5b60f49e31395a37a4d9b43373f3
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 942b538..0000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mixxx-9999/SConscript
-+++ mixxx-9999/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.0-lilv_include_fix.patch b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
deleted file mode 100644
index 4addc98..0000000
--- 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/metadata.xml b/media-sound/mixxx/metadata.xml
deleted file mode 100644
index e8ca01a..0000000
--- a/media-sound/mixxx/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gerion.entrup@flump.de</email>
- <name>Gerion Entrup</name>
- </maintainer>
- <use>
- <flag name="hid">Enable HID controller support</flag>
- <flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</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>
- </upstream>
-</pkgmetadata>
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
deleted file mode 100644
index ef087e8..0000000
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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/"
-
-inherit git-r3
-EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-
-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
-)
-
-src_prepare() {
- # use multilib compatible directory for plugins
- sed -i -e '/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" 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] 3+ messages in thread
end of thread, other threads:[~2021-11-06 5:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-21 0:49 [gentoo-commits] repo/user/gerislay:master commit in: media-sound/mixxx/, media-sound/mixxx/files/ gerion
-- strict thread matches above, loose matches on Subject: below --
2021-11-06 5:50 gerion
2019-03-25 8:54 gerion
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox