* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/, media-sound/lmms/files/
@ 2015-12-31 16:00 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2015-12-31 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 677212666f440bbd411e74e667b0d152e954ef72
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 16:00:22 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 16:00:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67721266
media-sound/lmms: Drop -Werror (bug #567428).
Package-Manager: portage-2.2.26
media-sound/lmms/files/lmms-1.1.3-Werror.patch | 12 ++++++++++++
media-sound/lmms/lmms-1.1.3.ebuild | 5 ++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/media-sound/lmms/files/lmms-1.1.3-Werror.patch b/media-sound/lmms/files/lmms-1.1.3-Werror.patch
new file mode 100644
index 0000000..4735c3e
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.1.3-Werror.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -334,9 +334,6 @@
+
+ # set compiler flags
+ SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
+-IF(NOT LMMS_BUILD_APPLE)
+- SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
+-ENDIF()
+
+ # Due to a regression in gcc-4.8.X, we need to disable array-bounds check
+ IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0")))
diff --git a/media-sound/lmms/lmms-1.1.3.ebuild b/media-sound/lmms/lmms-1.1.3.ebuild
index 8167c4c..255427a 100644
--- a/media-sound/lmms/lmms-1.1.3.ebuild
+++ b/media-sound/lmms/lmms-1.1.3.ebuild
@@ -44,7 +44,10 @@ RDEPEND="${RDEPEND}
DOCS="README AUTHORS TODO"
-PATCHES=( "${FILESDIR}/gcc52.patch" )
+PATCHES=(
+ "${FILESDIR}/gcc52.patch"
+ "${FILESDIR}/lmms-1.1.3-Werror.patch"
+)
src_configure() {
mycmakeargs="${mycmakeargs}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/, media-sound/lmms/files/
@ 2020-07-20 8:50 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2020-07-20 8:50 UTC (permalink / raw
To: gentoo-commits
commit: 353bff9626472676bd84ac65cf259e6370a073fe
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 07:24:17 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 08:49:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353bff96
media-sound/lmms: Don't compress manpage during build
Closes: https://bugs.gentoo.org/733284
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../lmms/files/lmms-1.2.2-no_compress_man.patch | 37 ++++++++++++++++++++++
media-sound/lmms/lmms-1.2.2.ebuild | 4 +++
2 files changed, 41 insertions(+)
diff --git a/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch b/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch
new file mode 100644
index 00000000000..c087cf8387a
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch
@@ -0,0 +1,37 @@
+--- lmms/CMakeLists.txt
++++ lmms/CMakeLists.txt
+@@ -575,15 +575,6 @@
+ # post-install tasks
+ ADD_SUBDIRECTORY(cmake/postinstall)
+
+-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"
+- COMMENT "Generating lmms.1.gz"
+- VERBATIM)
+-
+-
+-ADD_CUSTOM_TARGET(manpage ALL
+- DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
+
+ # install headers
+
+--- lmms/src/CMakeLists.txt
++++ lmms/src/CMakeLists.txt
+@@ -113,7 +113,7 @@
+ )
+ ENDIF()
+
+-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1")
+
+ IF(LMMS_BUILD_WIN32)
+ SET(EXTRA_LIBRARIES "-lwinmm")
+@@ -258,6 +258,6 @@
+ ENDIF(NOT LMMS_BUILD_APPLE)
+
+ INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
+- INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
++ INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+
+ ENDIF(LMMS_BUILD_WIN32)
diff --git a/media-sound/lmms/lmms-1.2.2.ebuild b/media-sound/lmms/lmms-1.2.2.ebuild
index 2c476fc93c5..d4bc8ba5d19 100644
--- a/media-sound/lmms/lmms-1.2.2.ebuild
+++ b/media-sound/lmms/lmms-1.2.2.ebuild
@@ -70,6 +70,10 @@ DOCS=( README.md doc/AUTHORS )
S="${WORKDIR}/${PN}"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284
+)
+
src_configure() {
local mycmakeargs+=(
-DUSE_WERROR=FALSE
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/, media-sound/lmms/files/
@ 2020-08-11 15:22 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-08-11 15:22 UTC (permalink / raw
To: gentoo-commits
commit: aaf7c8e4407119ea66ff30f0f37f11252c500dc6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 15:22:18 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 15:22:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf7c8e4
media-sound/lmms: removed obsolete 1.2.1
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lmms/Manifest | 1 -
.../lmms-1.2.1-add-missing-qpainterpath.patch | 61 ------------
media-sound/lmms/lmms-1.2.1.ebuild | 110 ---------------------
3 files changed, 172 deletions(-)
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 2565f68e2df..16f24a2a4c6 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,2 +1 @@
-DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
deleted file mode 100644
index afade79b0fd..00000000000
--- a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001
-From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
-Date: Mon, 18 May 2020 18:58:48 +0200
-Subject: [PATCH] Fix Qt 5.15 build issues (#5498)
-
-Add missing QPainterPath includes
----
- plugins/Eq/EqSpectrumView.h | 1 +
- src/gui/AutomationPatternView.cpp | 1 +
- src/gui/LmmsStyle.cpp | 1 +
- src/gui/editors/AutomationEditor.cpp | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h
-index cd3f177586..84feeff13e 100644
---- a/plugins/Eq/EqSpectrumView.h
-+++ b/plugins/Eq/EqSpectrumView.h
-@@ -24,6 +24,7 @@
- #define EQSPECTRUMVIEW_H
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWidget>
-
- #include "fft_helpers.h"
-diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
-index 448c233cb4..9889a6b460 100644
---- a/src/gui/AutomationPatternView.cpp
-+++ b/src/gui/AutomationPatternView.cpp
-@@ -25,6 +25,7 @@
-
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMenu>
-
- #include "AutomationEditor.h"
-diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp
-index e57e29e479..4fe5cb503c 100644
---- a/src/gui/LmmsStyle.cpp
-+++ b/src/gui/LmmsStyle.cpp
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QFrame>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleFactory>
- #include <QStyleOption>
-
-diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
-index 5e8ea8a0af..74f15d358c 100644
---- a/src/gui/editors/AutomationEditor.cpp
-+++ b/src/gui/editors/AutomationEditor.cpp
-@@ -35,6 +35,7 @@
- #include <QLayout>
- #include <QMdiArea>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QStyleOption>
- #include <QToolTip>
diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild
deleted file mode 100644
index 71c96e7030d..00000000000
--- a/media-sound/lmms/lmms-1.2.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# The order is important here! Both, cmake and xdg define src_prepare.
-# We need the one from cmake
-inherit xdg 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 -> ${P}.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-sound/pulseaudio )
- 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 )
-
-PATCHES=(
- "${FILESDIR}/${P}-add-missing-qpainterpath.patch"
-)
-
-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
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-11 15:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-31 16:00 [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/, media-sound/lmms/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2020-07-20 8:50 Lars Wendler
2020-08-11 15:22 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox