From 293b7d4c34fb5285799bb5149595e29dae34cac9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Jul 2023 02:49:03 +0100 Subject: gentoo auto-resync : 22:07:2023 - 02:49:03 --- media-sound/lmms/Manifest | 7 +- .../lmms/files/lmms-1.2.2-plugin-path.patch | 26 ++++++ .../lmms/files/lmms-9999-no_compress_man.patch | 48 ++++++++++ media-sound/lmms/files/lmms-9999-plugin-path.patch | 26 ++++++ media-sound/lmms/lmms-1.2.2-r1.ebuild | 100 +++++++++++++++++++++ media-sound/lmms/lmms-9999.ebuild | 19 ++-- 6 files changed, 217 insertions(+), 9 deletions(-) create mode 100644 media-sound/lmms/files/lmms-1.2.2-plugin-path.patch create mode 100644 media-sound/lmms/files/lmms-9999-no_compress_man.patch create mode 100644 media-sound/lmms/files/lmms-9999-plugin-path.patch create mode 100644 media-sound/lmms/lmms-1.2.2-r1.ebuild (limited to 'media-sound/lmms') diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest index fefd17ad84eb..44bbec9581fb 100644 --- a/media-sound/lmms/Manifest +++ b/media-sound/lmms/Manifest @@ -1,5 +1,10 @@ AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e00e706d7f328eb140babde11ca239fd516b133e698c366fa34bf72c2047b64aa14108cc82a09d0869fffd5e3bea8c1936a5 SHA512 4a414e513a3257b5eb3f472ca321504e7037c314e3d218b612b9aa9391dd0d1b038b77467f112a069479abec1b1ab3372126e27db34ec22c2a89b902a66878bd +AUX lmms-1.2.2-plugin-path.patch 850 BLAKE2B acc62a4400438df292fcf78633ba1bcf672baedccb239720e42843577b9d539942c32996587e89cd614ee136d93ff04725910cf28f5be7afaabcb0f9572672fd SHA512 d5373901db6a091f105a03d07f8f3850d69569a2e4890fa5fdd07d2e6fea3b8e9a424a45c8a8dd1aee73aade8ee98659c934e6b6c4eea5a02d982d43a022f5d8 +AUX lmms-9999-no_compress_man.patch 1839 BLAKE2B a2d854d6fa71a540d12262bd28ea78165ddc4708139bee6d9b989f6907cb5830cf54df05940442fffa9542ae3be59ba08436022f960aad803d76cc08140998bf SHA512 7c51d8bb2634d783e3ca02d04264fd9aec8979b0ac7fec6e36afe5d668232ec3eece03bac1c2ea6fac9e5b91d89a1ae984ef73d10a8022ad776dff4976129a13 +AUX lmms-9999-plugin-path.patch 866 BLAKE2B b083ed330c42738b5040488939418075c0d6ddf960a1cf79afb38dfdda86a223362c1325fc02cdbc27a61a2799c05173dc1250aa56ccbaac46b857a4ccdc07e1 SHA512 93865b80f76c4ae2feab91f99261e05626654ce7db82a15fdc9386e93a395ea701bc2558ae04bb8411d9bc1877c38794f5302a3312d6f020b6a5109353f648b7 DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028 +DIST lmms_1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028 +EBUILD lmms-1.2.2-r1.ebuild 2214 BLAKE2B 64adef08c34b84f232562f890731898b858b12e05c6fd6c7a4b37b1eb7cd6f25be559a8f027173a873ef2cb00aae702e9302448f7313370a017c4b2be1b05bcf SHA512 19ef29123e7d4b11509306fa27d692cd681d5c96ea8d73ecda82c3e1787a5b929941ce1758566bf387dbcaa3199d60125d10d17cd0280f3fb3eec703ec8ecfcc EBUILD lmms-1.2.2.ebuild 2389 BLAKE2B ff3dddfb8a47dc565f7c82514f954a124c72b3a6dccd3e8d0f276bdc33bc0b5164e79631de8c55096653d5b9b56004d3516f1543f4e35179964f0e429b94f2b2 SHA512 532fef9e5ee73d37ec81bbabb81782885c03f45c6c01c94c66e5c6e01f901c3f7cf138219898de50c7a9a3ad35514247c1c9b5a9f9aa9269f49635114c3e6cec -EBUILD lmms-9999.ebuild 2243 BLAKE2B 7ad655e9f2541e7c5cc3d1ddd0c85c0108d9c35404731d2c4fe04829a129dee2c6f3ad34cf65270790700650d9e1a15e9ca97ccb4ff9e76c69f2d34ddeb349ca SHA512 b64c9ef64dc194aa47e297fb9934e167a8a255b8921ef96f86a6cd77ac25226266b9ef61342a393e044dd647e75cf8d8a98891d326f1cb71c658122931b0cdc6 +EBUILD lmms-9999.ebuild 2187 BLAKE2B 1e033af31557ba7eb389016d9f61b99d650615d05ed141a268d0e4a984a041cda37f3a8e82c7a9c5941575a3453152f3f83f532cb28712723994088c3f47f279 SHA512 45dd256802a287dc651c77e406d12c1b95692e03bb9b9cd432b13e6f2a0a494c6160a7d796e223ce8bb5a95a3cac9efa9436e42ecf8bf484bf3c988ba9d558a1 MISC metadata.xml 845 BLAKE2B 4b6d93d9fe8a7d26b145e949955cde9e7c09abc08737f69417e94fdd5bf36b35ab4ed5f4339203106af18b7b2b7f874fc8a6cc8873c50bdc89ce4e764211b5ba SHA512 6a84127fb0cd31d11bd8c82a4e92c94eccec4bab30726a16e4740663a520a0ac0e5778adfd29dc5012fbc0ac58fba532d9c6e7abaf71568682650c553ba8e4ae diff --git a/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch b/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch new file mode 100644 index 000000000000..0fabfbb89a30 --- /dev/null +++ b/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/907285 +https://github.com/LMMS/lmms/issues/5884 +https://src.fedoraproject.org/rpms/lmms/blob/rawhide/f/lmms-1.2.2_lib_suffix.patch +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -564,6 +564,9 @@ IF(USE_CCACHE) + ENDIF() + ENDIF() + ++# pass LIB_SUFFIX ++add_definitions(-DLIB_SUFFIX="${LIB_SUFFIX}") ++ + # make sub-directories + ADD_SUBDIRECTORY(cmake) + ADD_SUBDIRECTORY(src) +--- a/src/core/PluginFactory.cpp ++++ b/src/core/PluginFactory.cpp +@@ -64,7 +64,7 @@ PluginFactory::PluginFactory() + // plugins at "C:/Program Files/LMMS/plugins/" + + #ifndef LMMS_BUILD_WIN32 +- addRelativeIfExists("../lib/lmms"); // Installed ++ addRelativeIfExists("../lib" LIB_SUFFIX "/lmms"); // Installed + #endif + addRelativeIfExists("plugins"); // Portable + #ifdef PLUGIN_DIR // We may also have received a relative directory via a define diff --git a/media-sound/lmms/files/lmms-9999-no_compress_man.patch b/media-sound/lmms/files/lmms-9999-no_compress_man.patch new file mode 100644 index 000000000000..e6db189f50ed --- /dev/null +++ b/media-sound/lmms/files/lmms-9999-no_compress_man.patch @@ -0,0 +1,48 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -669,7 +669,7 @@ ADD_SUBDIRECTORY(doc) + ADD_SUBDIRECTORY(cmake/install) + + FIND_PACKAGE(UnixCommands) +-IF(GZIP) ++IF(FALSE) + ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" + COMMAND ${GZIP} -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz + DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1" +@@ -680,7 +680,6 @@ IF(GZIP) + ADD_CUSTOM_TARGET(manpage ALL + DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz") + ELSEIF(UNIX) +- MESSAGE(FATAL_ERROR "Can't find gzip required for generating lmms.1.gz") + ENDIF() + + # install headers +@@ -698,7 +697,7 @@ ENDIF(LMMS_BUILD_LINUX) + # + ADD_CUSTOM_TARGET(distclean + COMMAND make clean +- COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1.gz) ++ COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1) + + # + # add tarball-target +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -140,7 +140,7 @@ IF(NOT CMAKE_VERSION VERSION_LESS 3.6) + SET_PROPERTY(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lmms) + ENDIF() + +-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz") ++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1") + + IF(LMMS_BUILD_WIN32) + SET(EXTRA_LIBRARIES "winmm") +@@ -233,7 +233,7 @@ ELSE() + ELSE(CMAKE_INSTALL_MANDIR) + SET(INSTALL_MANDIR ${CMAKE_INSTALL_PREFIX}/share/man) + ENDIF(CMAKE_INSTALL_MANDIR) +- INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" ++ INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" + DESTINATION "${INSTALL_MANDIR}/man1/" + PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + ENDIF() diff --git a/media-sound/lmms/files/lmms-9999-plugin-path.patch b/media-sound/lmms/files/lmms-9999-plugin-path.patch new file mode 100644 index 000000000000..0d04bf8d3027 --- /dev/null +++ b/media-sound/lmms/files/lmms-9999-plugin-path.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/907285 +https://github.com/LMMS/lmms/issues/5884 +https://src.fedoraproject.org/rpms/lmms/blob/rawhide/f/lmms-1.2.2_lib_suffix.patch +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -657,6 +657,9 @@ ENDIF() + # use ccache + include(CompileCache) + ++# pass LIB_SUFFIX ++add_definitions(-DLIB_SUFFIX="${LIB_SUFFIX}") ++ + # make sub-directories + ADD_SUBDIRECTORY(cmake) + ADD_SUBDIRECTORY(src) +--- a/src/core/PluginFactory.cpp ++++ b/src/core/PluginFactory.cpp +@@ -78,7 +78,7 @@ void PluginFactory::setupSearchPaths() + // plugins at "C:/Program Files/LMMS/plugins/" + + #ifndef LMMS_BUILD_WIN32 +- addRelativeIfExists("../lib/lmms"); // Installed ++ addRelativeIfExists("../lib" LIB_SUFFIX "/lmms"); // Installed + #endif + addRelativeIfExists("plugins"); // Portable + #ifdef PLUGIN_DIR // We may also have received a relative directory via a define diff --git a/media-sound/lmms/lmms-1.2.2-r1.ebuild b/media-sound/lmms/lmms-1.2.2-r1.ebuild new file mode 100644 index 000000000000..535760eee0c3 --- /dev/null +++ b/media-sound/lmms/lmms-1.2.2-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Cross-platform music production software" +HOMEPAGE="https://lmms.io" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/LMMS/lmms.git" + inherit git-r3 +else + SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${P/_/-}" +fi + +LICENSE="GPL-2 LGPL-2" +SLOT="0" + +IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst" + +COMMON_DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + >=media-libs/libsamplerate-0.1.8 + >=media-libs/libsndfile-1.0.11 + sci-libs/fftw:3.0 + sys-libs/zlib + >=x11-libs/fltk-1.3.0_rc3:1 + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth ) + jack? ( virtual/jack ) + libgig? ( media-libs/libgig ) + mp3? ( media-sound/lame ) + ogg? ( + media-libs/libogg + media-libs/libvorbis + ) + portaudio? ( >=media-libs/portaudio-19_pre ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl + >=media-libs/sdl-sound-1.0.1 + ) + soundio? ( media-libs/libsoundio ) + stk? ( media-libs/stk ) + vst? ( virtual/wine ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtx11extras:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 +" +RDEPEND="${COMMON_DEPEND} + media-plugins/calf + media-plugins/caps-plugins + media-plugins/cmt-plugins + media-plugins/swh-plugins + media-plugins/tap-plugins +" + +DOCS=( README.md doc/AUTHORS ) + +S="${WORKDIR}/${PN}" + +PATCHES=( + "${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284 + "${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285 +) + +src_configure() { + local mycmakeargs=( + -DUSE_WERROR=FALSE + -DWANT_CAPS=FALSE + -DWANT_TAP=FALSE + -DWANT_SWH=FALSE + -DWANT_CMT=FALSE + -DWANT_CALF=FALSE + -DWANT_QT5=TRUE + -DWANT_ALSA=$(usex alsa) + -DWANT_JACK=$(usex jack) + -DWANT_GIG=$(usex libgig) + -DWANT_MP3LAME=$(usex mp3) + -DWANT_OGGVORBIS=$(usex ogg) + -DWANT_PORTAUDIO=$(usex portaudio) + -DWANT_PULSEAUDIO=$(usex pulseaudio) + -DWANT_SDL=$(usex sdl) + -DWANT_SOUNDIO=$(usex soundio) + -DWANT_STK=$(usex stk) + -DWANT_VST=$(usex vst) + -DWANT_SF2=$(usex fluidsynth) + ) + + cmake_src_configure +} diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild index 329eb0410291..f525286d2873 100644 --- a/media-sound/lmms/lmms-9999.ebuild +++ b/media-sound/lmms/lmms-9999.ebuild @@ -1,11 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# The order is important here! Both, cmake and xdg define src_prepare. -# We need the one from cmake -inherit bash-completion-r1 xdg cmake +inherit cmake DESCRIPTION="Cross-platform music production software" HOMEPAGE="https://lmms.io" @@ -13,9 +11,9 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/LMMS/lmms.git" inherit git-r3 else - SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz" + SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz" + S="${WORKDIR}/${PN}" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${P/_/-}" fi LICENSE="GPL-2 LGPL-2" @@ -68,9 +66,13 @@ RDEPEND="${COMMON_DEPEND} DOCS=( README.md doc/AUTHORS ) +PATCHES=( + "${FILESDIR}/${PN}-9999-no_compress_man.patch" #733284 + "${FILESDIR}/${PN}-9999-plugin-path.patch" #907285 +) + src_configure() { - local mycmakeargs+=( - -DBASHCOMP_PKG_PATH="$(get_bashcompdir)" + local mycmakeargs=( -DUSE_WERROR=FALSE -DWANT_CAPS=FALSE -DWANT_TAP=FALSE @@ -91,5 +93,6 @@ src_configure() { -DWANT_VST=$(usex vst) -DWANT_SF2=$(usex fluidsynth) ) + cmake_src_configure } -- cgit v1.2.3