gentoo auto-resync : 22:07:2023 - 02:49:03

3 files changed, 100 insertions, 0 deletions

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