* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2023-04-25 21:30 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-04-25 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 2d4842f93bbf405f1a260fca8fa838c5a992e307
Author: Andie Verbus <andieverbus <AT> gmail <DOT> com>
AuthorDate: Wed Apr 5 13:17:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 21:27:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4842f9
media-sound/supercollider: drop 3.11.2 and unneeded patches
This version no longer compiles with the sndfile USE flag, which is a pretty necessary component
Signed-off-by: Andie Verbus <andieverbus <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/supercollider/Manifest | 1 -
.../files/supercollider-3.10.2-no-ccache.patch | 25 --
.../files/supercollider-3.11.2-boost-1.74.patch | 39 ---
.../files/supercollider-3.11.2-fewer-qt-deps.patch | 129 ---------
...llider-3.11.2-fix-libscsynth-linker-issue.patch | 299 ---------------------
.../supercollider/supercollider-3.11.2.ebuild | 137 ----------
6 files changed, 630 deletions(-)
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index cf73948e1081..4436653080aa 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,2 +1 @@
-DIST SuperCollider-3.11.2-Source.tar.bz2 18130954 BLAKE2B 3713561e5ebee6dd4c08baa8aaaf4a422ab983480c76b2176373ce3cd080128f9392b50482e02dc82dce235e928d058c42722e0863dad9f6d2dd086894cd85da SHA512 636062c6acf8be43260632287b587f167352079c4e86ede34d1c6056180bfdb3ae50d6a3ff4f349327a3ab6af0eb01ac503d6b22667b4799dfcddd9c6489a23c
DIST SuperCollider-3.13.0-Source.tar.bz2 18685091 BLAKE2B a5e57a17f93e40848b2044ee0791179f857d144eabb7f4d74580b2eebd49a31d6ec671a0526236c5b906aadeb455e5a7ad18cacb79ed214076d6bceca39ea2ae SHA512 a60a128f7646f077f91adae666fa4014529aa9df78cf0dfe5d68c9bd6447f008af7da2970b8736f3f29d0adbaf67bce680a8201fcbe7e1aba29c3499a57f89cd
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch
deleted file mode 100644
index 66a765a8b9ea..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-disabled the use of ccache, to prevent FTBFS; as the compilation is done once
-it has no backdraws to make the debian package.
-Index: supercollider/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON
- #############################################
- # Detect CCache
-
--find_program(CCacheExectuable ccache)
--if( CCacheExectuable )
-- # only used with >=cmake-3.4
-- set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" )
-- set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" )
--endif()
-+## find_program(CCacheExecutable ccache)
-+## if( CCacheExecutable )
-+## # only used with >=cmake-3.4
-+## set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" )
-+## set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" )
-+## endif()
-
- #############################################
- # Options
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-boost-1.74.patch b/media-sound/supercollider/files/supercollider-3.11.2-boost-1.74.patch
deleted file mode 100644
index 1e1ca8b7e195..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.2-boost-1.74.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001
-From: brianlheim <self@brianlheim.com>
-Date: Tue, 25 Aug 2020 17:14:29 -0500
-Subject: [PATCH] remove workarounds for old boost versions
-
-we don't need to support boost pre-1.70 anymore, and tcp::socket::executor_type was always the right typealias to use
----
- server/supernova/sc/sc_osc_handler.hpp | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp
-index f17e99a557..676c94dbf1 100644
---- a/server/supernova/sc/sc_osc_handler.hpp
-+++ b/server/supernova/sc/sc_osc_handler.hpp
-@@ -234,11 +234,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
- class tcp_connection : public nova_endpoint {
- public:
- using pointer = std::shared_ptr<tcp_connection>;
--#if BOOST_VERSION >= 107000
-- using executor = boost::asio::executor;
--#else
-- using executor = boost::asio::io_context::executor_type;
--#endif
-+ using executor = tcp::socket::executor_type;
-
- static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); }
-
-@@ -249,11 +245,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
- bool operator==(tcp_connection const& rhs) const { return &rhs == this; }
-
- private:
--#if BOOST_VERSION >= 107000
- tcp_connection(const executor& executor): socket_(executor) {}
--#else
-- tcp_connection(const executor& executor): socket_(executor.context()) {}
--#endif
-
- void send(const char* data, size_t length) override final;
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch
deleted file mode 100644
index a156a105f875..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 063f9a48300b0c1d0132f6e0448ca724ad9e7474 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Mon, 1 Jun 2020 18:43:08 +0900
-Subject: [PATCH] Remove spurious Qt dependencies
-
----
- QtCollider/CMakeLists.txt | 10 +++-------
- QtCollider/widgets/QcCanvas.h | 2 --
- README_LINUX.md | 6 +++---
- README_RASPBERRY_PI.md | 2 +-
- editors/sc-ide/CMakeLists.txt | 13 +++----------
- 5 files changed, 10 insertions(+), 23 deletions(-)
-
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index de38afb90..6b9437b9c 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
- set(
- QT_COMPONENTS
- Core
-- Widgets
-+ Gui
- Network
- PrintSupport
-- OpenGL
-- Quick
-- Qml
-- Sql
- Svg
-+ Widgets
- )
-
- set (QT_COLLIDER_LIBS
-- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
-- Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
-+ Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
- ${MATH_LIBRARY})
-
- if(SC_USE_QTWEBENGINE)
-diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
-index 3acb00fc2..ff230b813 100644
---- a/QtCollider/widgets/QcCanvas.h
-+++ b/QtCollider/widgets/QcCanvas.h
-@@ -28,9 +28,7 @@
- #include <QBasicTimer>
- #include <QTime>
- #include <QPalette>
--#include <QGLWidget>
-
--// using QcCanvasBase = QGLWidget;
- using QcCanvasBase = QWidget;
-
- class QcCanvas : public QcCanvasBase {
-diff --git a/README_LINUX.md b/README_LINUX.md
-index 0e9577637..7b728a9ba 100644
---- a/README_LINUX.md
-+++ b/README_LINUX.md
-@@ -78,7 +78,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
-
- If this displays version 5.7 or later, installing Qt is easy:
-
-- sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
-+ sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
-
- If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
-
-@@ -90,13 +90,13 @@ On Xenial:
-
- sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
- sudo apt-get update
-- sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
-+ sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
-
- On Trusty, only Qt 5.10 and below are available:
-
- sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
- sudo apt-get update
-- sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
-+ sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
-
- [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
-
-diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
-index 0e89e26fc..7835fd25d 100644
---- a/README_RASPBERRY_PI.md
-+++ b/README_RASPBERRY_PI.md
-@@ -42,7 +42,7 @@ Install required libraries:
- # For GUI builds:
- sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
- libreadline-dev libfftw3-dev libxt-dev libudev-dev libncurses5-dev cmake git qttools5-dev qttools5-dev-tools \
-- qtdeclarative5-dev libqt5svg5-dev qjackctl
-+ qtbase5-dev libqt5svg5-dev qjackctl
- # For GUI-less builds:
- sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
- libreadline-dev libfftw3-dev libudev-dev libncurses5-dev cmake git
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index 2ff4de774..5f9c1e64b 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
- Concurrent
- Core
- LinguistTools
-- # OpenGL
-- PrintSupport
-- Qml
-- Quick
-- Sql
-+ Network
- Widgets
- )
-
- set(QT_IDE_LIBRARIES
- Qt5::Concurrent
- Qt5::Core
-- # Qt5::OpenGL
-- Qt5::PrintSupport
-- Qt5::Qml
-- Qt5::Quick
-- Qt5::Sql
-+ Qt5::Network
-+ Qt5::Widgets
- )
-
- if(SC_USE_QTWEBENGINE)
---
-2.26.2
-
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch b/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch
deleted file mode 100644
index d703b6073706..000000000000
--- a/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From 9563fb5e73425a2ee0370162178964cceb559d5d Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Mon, 16 Nov 2020 12:00:22 +0100
-Subject: [PATCH] Backport #5014 for 3.11.2
-
-Backport the linker error patches
-(https://github.com/supercollider/supercollider/pull/5014) for 3.11.2.
----
- common/SC_Apple.hpp | 14 ------
- common/SC_Apple.mm | 60 -------------------------
- common/SC_AppleEventLoop.hpp | 34 ++++++++++++++
- common/SC_AppleEventLoop.mm | 80 +++++++++++++++++++++++++++++++++
- common/SC_EventLoop.hpp | 3 +-
- server/scsynth/CMakeLists.txt | 8 +++-
- server/supernova/CMakeLists.txt | 9 +++-
- 7 files changed, 131 insertions(+), 77 deletions(-)
- create mode 100644 common/SC_AppleEventLoop.hpp
- create mode 100644 common/SC_AppleEventLoop.mm
-
-diff --git a/common/SC_Apple.hpp b/common/SC_Apple.hpp
-index 958d097f36..c7e53e9fcc 100644
---- a/common/SC_Apple.hpp
-+++ b/common/SC_Apple.hpp
-@@ -23,19 +23,5 @@ namespace SC { namespace Apple {
-
- void disableAppNap();
-
--namespace EventLoop {
--
--// Setup the main application. This function must be called in the
--// main thread and before any other calls to Cocoa methods.
--void setup();
--// Run the event loop. This function must be called in the main thread.
--// It blocks until the event loop finishes.
--void run();
--// Ask the event loop to stop and terminate the program.
--// This function can be called from any thread.
--void quit();
--
--} // EventLoop
--
- } // namespace Apple
- } // namespace SC
-diff --git a/common/SC_Apple.mm b/common/SC_Apple.mm
-index a4e10a66cd..dbb7ddbb7d 100644
---- a/common/SC_Apple.mm
-+++ b/common/SC_Apple.mm
-@@ -42,65 +42,5 @@ void disableAppNap() {
- }
- }
-
--namespace EventLoop {
--
--static std::atomic_bool g_running;
--
--void setup() {
-- // The following code would transform the process into a foreground application.
-- // For now it's the plugin's responsibility to do this (early or lazily)
-- // because we don't want to always show an icon in the docker.
-- // ProcessSerialNumber psn = { 0, kCurrentProcess };
-- // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
--
-- // Create NSApplication
-- [NSApplication sharedApplication];
--}
--
--void run() {
--#if 0
-- // this doesn't work...
-- [NSApp run];
--#else
-- // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
-- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
--
-- [NSApp finishLaunching];
-- g_running = true;
--
-- while (g_running) {
-- [pool release];
-- pool = [[NSAutoreleasePool alloc] init];
-- NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-- untilDate:[NSDate distantFuture]
-- inMode:NSDefaultRunLoopMode
-- dequeue:YES];
-- if (event) {
-- [NSApp sendEvent:event];
-- [NSApp updateWindows];
-- }
-- }
-- [pool release];
--#endif
--}
--
--void quit() {
-- // break from event loop instead of [NSApp terminate:nil]
-- g_running = false;
-- // send dummy event to wake up event loop
-- NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
-- location:NSMakePoint(0, 0)
-- modifierFlags:0
-- timestamp:0
-- windowNumber:0
-- context:nil
-- subtype:0
-- data1:0
-- data2:0];
-- [NSApp postEvent:event atStart:NO];
--}
--
--} // EventLoop
--
- } // namespace Apple
- } // namespace SC
-diff --git a/common/SC_AppleEventLoop.hpp b/common/SC_AppleEventLoop.hpp
-new file mode 100644
-index 0000000000..6f19bb2818
---- /dev/null
-+++ b/common/SC_AppleEventLoop.hpp
-@@ -0,0 +1,34 @@
-+/************************************************************************
-+ *
-+ * Copyright 2019 Christof Ressi <info@christofressi.com>
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ ************************************************************************/
-+
-+#pragma once
-+
-+namespace SC { namespace Apple { namespace EventLoop {
-+
-+// Setup the main application. This function must be called in the
-+// main thread and before any other calls to Cocoa methods.
-+void setup();
-+// Run the event loop. This function must be called in the main thread.
-+// It blocks until the event loop finishes.
-+void run();
-+// Ask the event loop to stop and terminate the program.
-+// This function can be called from any thread.
-+void quit();
-+
-+}}} // namespace SC::Apple::EventLoop
-diff --git a/common/SC_AppleEventLoop.mm b/common/SC_AppleEventLoop.mm
-new file mode 100644
-index 0000000000..cfcf42ddfe
---- /dev/null
-+++ b/common/SC_AppleEventLoop.mm
-@@ -0,0 +1,80 @@
-+/************************************************************************
-+ *
-+ * Copyright 2019 Christof Ressi <info@christofressi.com>
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ ************************************************************************/
-+
-+#include "SC_AppleEventLoop.hpp"
-+#include <atomic>
-+
-+#import <Cocoa/Cocoa.h>
-+
-+namespace SC { namespace Apple { namespace EventLoop {
-+
-+static std::atomic_bool g_running;
-+
-+void setup() {
-+ // The following code would transform the process into a foreground application.
-+ // For now it's the plugin's responsibility to do this (early or lazily)
-+ // because we don't want to always show an icon in the docker.
-+ // ProcessSerialNumber psn = { 0, kCurrentProcess };
-+ // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-+
-+ // Create NSApplication
-+ [NSApplication sharedApplication];
-+}
-+
-+void run() {
-+ // this doesn't work...
-+ // [NSApp run];
-+ // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
-+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-+
-+ [NSApp finishLaunching];
-+ g_running = true;
-+
-+ while (g_running) {
-+ [pool release];
-+ pool = [[NSAutoreleasePool alloc] init];
-+ NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-+ untilDate:[NSDate distantFuture]
-+ inMode:NSDefaultRunLoopMode
-+ dequeue:YES];
-+ if (event) {
-+ [NSApp sendEvent:event];
-+ [NSApp updateWindows];
-+ }
-+ }
-+ [pool release];
-+}
-+
-+void quit() {
-+ // break from event loop instead of [NSApp terminate:nil]
-+ g_running = false;
-+ // send dummy event to wake up event loop
-+ NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
-+ location:NSMakePoint(0, 0)
-+ modifierFlags:0
-+ timestamp:0
-+ windowNumber:0
-+ context:nil
-+ subtype:0
-+ data1:0
-+ data2:0];
-+ [NSApp postEvent:event atStart:NO];
-+}
-+
-+}}} // namespace SC::Apple::EventLoop
-diff --git a/common/SC_EventLoop.hpp b/common/SC_EventLoop.hpp
-index 1d62b4de89..6e58208cc0 100644
---- a/common/SC_EventLoop.hpp
-+++ b/common/SC_EventLoop.hpp
-@@ -2,7 +2,7 @@
-
- #include <functional>
- #ifdef __APPLE__
--# include "SC_Apple.hpp"
-+# include "SC_AppleEventLoop.hpp"
- # include <thread>
- #endif
-
-@@ -21,6 +21,7 @@ class EventLoop {
- SC::Apple::EventLoop::setup();
- #endif
- }
-+
- // Run the event loop until 'waitFunction' returns.
- static void run(std::function<void()> waitFunction) {
- #ifdef __APPLE__
-diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
-index fa8daf12aa..c60ae72ffc 100644
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
-@@ -230,7 +230,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- target_link_libraries(libscsynth rt)
- endif()
-
--add_executable(scsynth scsynth_main.cpp)
-+add_executable(scsynth
-+ scsynth_main.cpp
-+
-+ # these files contain code only used in main()
-+ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
-+ $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
-+ )
- target_link_libraries(scsynth libscsynth)
-
- if (PTHREADS_FOUND)
-diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
-index 923a3aa4e4..ce8388e475 100644
---- a/server/supernova/CMakeLists.txt
-+++ b/server/supernova/CMakeLists.txt
-@@ -182,7 +182,14 @@ if(WIN32)
- endif()
-
-
--add_executable(supernova server/main.cpp ${supernova_headers})
-+add_executable(supernova
-+ server/main.cpp
-+ ${supernova_headers}
-+
-+ # these files contain code only used in main()
-+ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
-+ $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
-+ )
- target_link_libraries(supernova libsupernova)
-
- if(WIN32)
diff --git a/media-sound/supercollider/supercollider-3.11.2.ebuild b/media-sound/supercollider/supercollider-3.11.2.ebuild
deleted file mode 100644
index cd65768c24e3..000000000000
--- a/media-sound/supercollider/supercollider-3.11.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Environment and programming language for real time audio synthesis"
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
-
-REQUIRED_USE="
- qt5? ( X )
- webengine? ( qt5 )
-"
-
-BDEPEND="
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-cpp/yaml-cpp:=
- dev-libs/boost:=
- media-libs/alsa-lib
- sys-libs/readline:0=
- virtual/libudev:=
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- !jack? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- )
- server? ( !app-admin/supernova )
- sndfile? ( media-libs/libsndfile )
- webengine? (
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwebsockets:5
- )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
- dev-libs/icu
- emacs? ( >=app-editors/emacs-23.1:* )
- gedit? ( app-editors/gedit )
- qt5? ( dev-qt/qtconcurrent:5 )
- vim? ( app-editors/vim )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
- "${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
- "${FILESDIR}"/${P}-fix-libscsynth-linker-issue.patch # Upstream issue 4992
- "${FILESDIR}"/${P}-boost-1.74.patch # bug 760489
-)
-
-S="${WORKDIR}/SuperCollider-${PV}-Source"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_HELP=ON
- -DSYSTEM_BOOST=ON
- -DSYSTEM_YAMLCPP=ON
- -DSSE=$(usex cpu_flags_x86_sse)
- -DSSE2=$(usex cpu_flags_x86_sse2)
- -DSC_EL=$(usex emacs)
- -DFFT_GREEN=$(usex !fftw)
- -DSC_ED=$(usex gedit)
- -DNO_GPL3=$(usex !gpl3)
- -DAUDIOAPI=$(usex jack jack portaudio)
- -DSC_IDE=$(usex qt5)
- -DSC_QT=$(usex qt5)
- -DSCLANG_SERVER=$(usex server)
- -DSUPERNOVA=$(usex server)
- -DNO_LIBSNDFILE=$(usex !sndfile)
- -DLIBSCSYNTH=$(usex !static-libs)
- -DSC_VIM=$(usex vim)
- -DNO_X11=$(usex !X)
- -DNO_AVAHI=$(usex !zeroconf)
- )
-
- use qt5 && mycmakeargs+=(
- -DSC_USE_QTWEBENGINE=$(usex webengine)
- )
-
- use debug && mycmakeargs+=(
- -DSC_MEMORY_DEBUGGING=ON
- -DSN_MEMORY_DEBUGGING=ON
- -DGC_SANITYCHECK=ON
- )
-
- append-flags $(usex debug '' -DNDEBUG)
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- use emacs && newdoc editors/scel/README.md README.emacs
- use gedit && newdoc editors/sced/README.md README.gedit
- use vim && newdoc editors/scvim/README.md README.vim
-}
-
-src_test() {
- export QT_QPA_PLATFORM=offscreen
- cmake_src_test
-}
-
-pkg_postinst() {
- einfo "Notice: SuperCollider is not very intuitive to get up and running."
- einfo "The best course of action to make sure that the installation was"
- einfo "successful and get you started with using SuperCollider is to take"
- einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
-
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2020-12-17 16:13 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-12-17 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 5d4c54036480b5b41317fe2227bc13cff104ecf5
Author: Simon van der Veldt <simon.vanderveldt <AT> gmail <DOT> com>
AuthorDate: Wed Nov 25 20:38:03 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 16:13:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d4c5403
media-sound/supercollider: Bump to 3.11.2
Closes: https://bugs.gentoo.org/755719
Signed-off-by: Simon van der Veldt <simon.vanderveldt <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18407
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/supercollider/Manifest | 1 +
.../files/supercollider-3.11.2-fewer-qt-deps.patch | 129 +++++++++
...llider-3.11.2-fix-libscsynth-linker-issue.patch | 299 +++++++++++++++++++++
.../supercollider/supercollider-3.11.2.ebuild | 138 ++++++++++
4 files changed, 567 insertions(+)
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index bb9a10b8786..60c9f8a5f07 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1 +1,2 @@
DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
+DIST SuperCollider-3.11.2-Source.tar.bz2 18130954 BLAKE2B 3713561e5ebee6dd4c08baa8aaaf4a422ab983480c76b2176373ce3cd080128f9392b50482e02dc82dce235e928d058c42722e0863dad9f6d2dd086894cd85da SHA512 636062c6acf8be43260632287b587f167352079c4e86ede34d1c6056180bfdb3ae50d6a3ff4f349327a3ab6af0eb01ac503d6b22667b4799dfcddd9c6489a23c
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch
new file mode 100644
index 00000000000..a156a105f87
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.2-fewer-qt-deps.patch
@@ -0,0 +1,129 @@
+From 063f9a48300b0c1d0132f6e0448ca724ad9e7474 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Mon, 1 Jun 2020 18:43:08 +0900
+Subject: [PATCH] Remove spurious Qt dependencies
+
+---
+ QtCollider/CMakeLists.txt | 10 +++-------
+ QtCollider/widgets/QcCanvas.h | 2 --
+ README_LINUX.md | 6 +++---
+ README_RASPBERRY_PI.md | 2 +-
+ editors/sc-ide/CMakeLists.txt | 13 +++----------
+ 5 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
+index de38afb90..6b9437b9c 100644
+--- a/QtCollider/CMakeLists.txt
++++ b/QtCollider/CMakeLists.txt
+@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
+ set(
+ QT_COMPONENTS
+ Core
+- Widgets
++ Gui
+ Network
+ PrintSupport
+- OpenGL
+- Quick
+- Qml
+- Sql
+ Svg
++ Widgets
+ )
+
+ set (QT_COLLIDER_LIBS
+- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
+- Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
++ Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
+ ${MATH_LIBRARY})
+
+ if(SC_USE_QTWEBENGINE)
+diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
+index 3acb00fc2..ff230b813 100644
+--- a/QtCollider/widgets/QcCanvas.h
++++ b/QtCollider/widgets/QcCanvas.h
+@@ -28,9 +28,7 @@
+ #include <QBasicTimer>
+ #include <QTime>
+ #include <QPalette>
+-#include <QGLWidget>
+
+-// using QcCanvasBase = QGLWidget;
+ using QcCanvasBase = QWidget;
+
+ class QcCanvas : public QcCanvasBase {
+diff --git a/README_LINUX.md b/README_LINUX.md
+index 0e9577637..7b728a9ba 100644
+--- a/README_LINUX.md
++++ b/README_LINUX.md
+@@ -78,7 +78,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
+
+ If this displays version 5.7 or later, installing Qt is easy:
+
+- sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
++ sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
+
+ If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
+
+@@ -90,13 +90,13 @@ On Xenial:
+
+ sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
+ sudo apt-get update
+- sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
++ sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
+
+ On Trusty, only Qt 5.10 and below are available:
+
+ sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
+ sudo apt-get update
+- sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
++ sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
+
+ [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
+
+diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
+index 0e89e26fc..7835fd25d 100644
+--- a/README_RASPBERRY_PI.md
++++ b/README_RASPBERRY_PI.md
+@@ -42,7 +42,7 @@ Install required libraries:
+ # For GUI builds:
+ sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+ libreadline-dev libfftw3-dev libxt-dev libudev-dev libncurses5-dev cmake git qttools5-dev qttools5-dev-tools \
+- qtdeclarative5-dev libqt5svg5-dev qjackctl
++ qtbase5-dev libqt5svg5-dev qjackctl
+ # For GUI-less builds:
+ sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+ libreadline-dev libfftw3-dev libudev-dev libncurses5-dev cmake git
+diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
+index 2ff4de774..5f9c1e64b 100644
+--- a/editors/sc-ide/CMakeLists.txt
++++ b/editors/sc-ide/CMakeLists.txt
+@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
+ Concurrent
+ Core
+ LinguistTools
+- # OpenGL
+- PrintSupport
+- Qml
+- Quick
+- Sql
++ Network
+ Widgets
+ )
+
+ set(QT_IDE_LIBRARIES
+ Qt5::Concurrent
+ Qt5::Core
+- # Qt5::OpenGL
+- Qt5::PrintSupport
+- Qt5::Qml
+- Qt5::Quick
+- Qt5::Sql
++ Qt5::Network
++ Qt5::Widgets
+ )
+
+ if(SC_USE_QTWEBENGINE)
+--
+2.26.2
+
diff --git a/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch b/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch
new file mode 100644
index 00000000000..d703b607370
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.2-fix-libscsynth-linker-issue.patch
@@ -0,0 +1,299 @@
+From 9563fb5e73425a2ee0370162178964cceb559d5d Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Mon, 16 Nov 2020 12:00:22 +0100
+Subject: [PATCH] Backport #5014 for 3.11.2
+
+Backport the linker error patches
+(https://github.com/supercollider/supercollider/pull/5014) for 3.11.2.
+---
+ common/SC_Apple.hpp | 14 ------
+ common/SC_Apple.mm | 60 -------------------------
+ common/SC_AppleEventLoop.hpp | 34 ++++++++++++++
+ common/SC_AppleEventLoop.mm | 80 +++++++++++++++++++++++++++++++++
+ common/SC_EventLoop.hpp | 3 +-
+ server/scsynth/CMakeLists.txt | 8 +++-
+ server/supernova/CMakeLists.txt | 9 +++-
+ 7 files changed, 131 insertions(+), 77 deletions(-)
+ create mode 100644 common/SC_AppleEventLoop.hpp
+ create mode 100644 common/SC_AppleEventLoop.mm
+
+diff --git a/common/SC_Apple.hpp b/common/SC_Apple.hpp
+index 958d097f36..c7e53e9fcc 100644
+--- a/common/SC_Apple.hpp
++++ b/common/SC_Apple.hpp
+@@ -23,19 +23,5 @@ namespace SC { namespace Apple {
+
+ void disableAppNap();
+
+-namespace EventLoop {
+-
+-// Setup the main application. This function must be called in the
+-// main thread and before any other calls to Cocoa methods.
+-void setup();
+-// Run the event loop. This function must be called in the main thread.
+-// It blocks until the event loop finishes.
+-void run();
+-// Ask the event loop to stop and terminate the program.
+-// This function can be called from any thread.
+-void quit();
+-
+-} // EventLoop
+-
+ } // namespace Apple
+ } // namespace SC
+diff --git a/common/SC_Apple.mm b/common/SC_Apple.mm
+index a4e10a66cd..dbb7ddbb7d 100644
+--- a/common/SC_Apple.mm
++++ b/common/SC_Apple.mm
+@@ -42,65 +42,5 @@ void disableAppNap() {
+ }
+ }
+
+-namespace EventLoop {
+-
+-static std::atomic_bool g_running;
+-
+-void setup() {
+- // The following code would transform the process into a foreground application.
+- // For now it's the plugin's responsibility to do this (early or lazily)
+- // because we don't want to always show an icon in the docker.
+- // ProcessSerialNumber psn = { 0, kCurrentProcess };
+- // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+-
+- // Create NSApplication
+- [NSApplication sharedApplication];
+-}
+-
+-void run() {
+-#if 0
+- // this doesn't work...
+- [NSApp run];
+-#else
+- // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
+- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+-
+- [NSApp finishLaunching];
+- g_running = true;
+-
+- while (g_running) {
+- [pool release];
+- pool = [[NSAutoreleasePool alloc] init];
+- NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
+- untilDate:[NSDate distantFuture]
+- inMode:NSDefaultRunLoopMode
+- dequeue:YES];
+- if (event) {
+- [NSApp sendEvent:event];
+- [NSApp updateWindows];
+- }
+- }
+- [pool release];
+-#endif
+-}
+-
+-void quit() {
+- // break from event loop instead of [NSApp terminate:nil]
+- g_running = false;
+- // send dummy event to wake up event loop
+- NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
+- location:NSMakePoint(0, 0)
+- modifierFlags:0
+- timestamp:0
+- windowNumber:0
+- context:nil
+- subtype:0
+- data1:0
+- data2:0];
+- [NSApp postEvent:event atStart:NO];
+-}
+-
+-} // EventLoop
+-
+ } // namespace Apple
+ } // namespace SC
+diff --git a/common/SC_AppleEventLoop.hpp b/common/SC_AppleEventLoop.hpp
+new file mode 100644
+index 0000000000..6f19bb2818
+--- /dev/null
++++ b/common/SC_AppleEventLoop.hpp
+@@ -0,0 +1,34 @@
++/************************************************************************
++ *
++ * Copyright 2019 Christof Ressi <info@christofressi.com>
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ *
++ ************************************************************************/
++
++#pragma once
++
++namespace SC { namespace Apple { namespace EventLoop {
++
++// Setup the main application. This function must be called in the
++// main thread and before any other calls to Cocoa methods.
++void setup();
++// Run the event loop. This function must be called in the main thread.
++// It blocks until the event loop finishes.
++void run();
++// Ask the event loop to stop and terminate the program.
++// This function can be called from any thread.
++void quit();
++
++}}} // namespace SC::Apple::EventLoop
+diff --git a/common/SC_AppleEventLoop.mm b/common/SC_AppleEventLoop.mm
+new file mode 100644
+index 0000000000..cfcf42ddfe
+--- /dev/null
++++ b/common/SC_AppleEventLoop.mm
+@@ -0,0 +1,80 @@
++/************************************************************************
++ *
++ * Copyright 2019 Christof Ressi <info@christofressi.com>
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ *
++ ************************************************************************/
++
++#include "SC_AppleEventLoop.hpp"
++#include <atomic>
++
++#import <Cocoa/Cocoa.h>
++
++namespace SC { namespace Apple { namespace EventLoop {
++
++static std::atomic_bool g_running;
++
++void setup() {
++ // The following code would transform the process into a foreground application.
++ // For now it's the plugin's responsibility to do this (early or lazily)
++ // because we don't want to always show an icon in the docker.
++ // ProcessSerialNumber psn = { 0, kCurrentProcess };
++ // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
++
++ // Create NSApplication
++ [NSApplication sharedApplication];
++}
++
++void run() {
++ // this doesn't work...
++ // [NSApp run];
++ // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
++ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
++
++ [NSApp finishLaunching];
++ g_running = true;
++
++ while (g_running) {
++ [pool release];
++ pool = [[NSAutoreleasePool alloc] init];
++ NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
++ untilDate:[NSDate distantFuture]
++ inMode:NSDefaultRunLoopMode
++ dequeue:YES];
++ if (event) {
++ [NSApp sendEvent:event];
++ [NSApp updateWindows];
++ }
++ }
++ [pool release];
++}
++
++void quit() {
++ // break from event loop instead of [NSApp terminate:nil]
++ g_running = false;
++ // send dummy event to wake up event loop
++ NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
++ location:NSMakePoint(0, 0)
++ modifierFlags:0
++ timestamp:0
++ windowNumber:0
++ context:nil
++ subtype:0
++ data1:0
++ data2:0];
++ [NSApp postEvent:event atStart:NO];
++}
++
++}}} // namespace SC::Apple::EventLoop
+diff --git a/common/SC_EventLoop.hpp b/common/SC_EventLoop.hpp
+index 1d62b4de89..6e58208cc0 100644
+--- a/common/SC_EventLoop.hpp
++++ b/common/SC_EventLoop.hpp
+@@ -2,7 +2,7 @@
+
+ #include <functional>
+ #ifdef __APPLE__
+-# include "SC_Apple.hpp"
++# include "SC_AppleEventLoop.hpp"
+ # include <thread>
+ #endif
+
+@@ -21,6 +21,7 @@ class EventLoop {
+ SC::Apple::EventLoop::setup();
+ #endif
+ }
++
+ // Run the event loop until 'waitFunction' returns.
+ static void run(std::function<void()> waitFunction) {
+ #ifdef __APPLE__
+diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
+index fa8daf12aa..c60ae72ffc 100644
+--- a/server/scsynth/CMakeLists.txt
++++ b/server/scsynth/CMakeLists.txt
+@@ -230,7 +230,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ target_link_libraries(libscsynth rt)
+ endif()
+
+-add_executable(scsynth scsynth_main.cpp)
++add_executable(scsynth
++ scsynth_main.cpp
++
++ # these files contain code only used in main()
++ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
++ $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
++ )
+ target_link_libraries(scsynth libscsynth)
+
+ if (PTHREADS_FOUND)
+diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
+index 923a3aa4e4..ce8388e475 100644
+--- a/server/supernova/CMakeLists.txt
++++ b/server/supernova/CMakeLists.txt
+@@ -182,7 +182,14 @@ if(WIN32)
+ endif()
+
+
+-add_executable(supernova server/main.cpp ${supernova_headers})
++add_executable(supernova
++ server/main.cpp
++ ${supernova_headers}
++
++ # these files contain code only used in main()
++ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
++ $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
++ )
+ target_link_libraries(supernova libsupernova)
+
+ if(WIN32)
diff --git a/media-sound/supercollider/supercollider-3.11.2.ebuild b/media-sound/supercollider/supercollider-3.11.2.ebuild
new file mode 100644
index 00000000000..288d5aa5c6b
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.11.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="https://supercollider.github.io/"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
+
+REQUIRED_USE="
+ qt5? ( X )
+ webengine? ( qt5 )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+ dev-cpp/yaml-cpp:=
+ >=dev-libs/boost-1.70.0:=
+ media-libs/alsa-lib
+ sys-libs/readline:0=
+ virtual/libudev:=
+ fftw? ( sci-libs/fftw:3.0= )
+ jack? ( virtual/jack )
+ !jack? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ )
+ server? ( !app-admin/supernova )
+ sndfile? ( media-libs/libsndfile )
+ webengine? (
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwebsockets:5
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ dev-libs/icu
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gedit? ( app-editors/gedit )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ )
+ vim? ( app-editors/vim )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
+ "${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
+ "${FILESDIR}"/${P}-fix-libscsynth-linker-issue.patch # Upstream issue 4992
+)
+
+S="${WORKDIR}/SuperCollider-${PV}-Source"
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_HELP=ON
+ -DSYSTEM_BOOST=ON
+ -DSYSTEM_YAMLCPP=ON
+ -DSSE=$(usex cpu_flags_x86_sse)
+ -DSSE2=$(usex cpu_flags_x86_sse2)
+ -DSC_EL=$(usex emacs)
+ -DFFT_GREEN=$(usex !fftw)
+ -DSC_ED=$(usex gedit)
+ -DNO_GPL3=$(usex !gpl3)
+ -DAUDIOAPI=$(usex jack jack portaudio)
+ -DSC_IDE=$(usex qt5)
+ -DSC_QT=$(usex qt5)
+ -DSCLANG_SERVER=$(usex server)
+ -DSUPERNOVA=$(usex server)
+ -DNO_LIBSNDFILE=$(usex !sndfile)
+ -DLIBSCSYNTH=$(usex !static-libs)
+ -DSC_VIM=$(usex vim)
+ -DNO_X11=$(usex !X)
+ -DNO_AVAHI=$(usex !zeroconf)
+ )
+
+ use qt5 && mycmakeargs+=(
+ -DSC_USE_QTWEBENGINE=$(usex webengine)
+ )
+
+ use debug && mycmakeargs+=(
+ -DSC_MEMORY_DEBUGGING=ON
+ -DSN_MEMORY_DEBUGGING=ON
+ -DGC_SANITYCHECK=ON
+ )
+
+ append-flags $(usex debug '' -DNDEBUG)
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ use emacs && newdoc editors/scel/README.md README.emacs
+ use gedit && newdoc editors/sced/README.md README.gedit
+ use vim && newdoc editors/scvim/README.md README.vim
+}
+
+src_test() {
+ export QT_QPA_PLATFORM=offscreen
+ cmake_src_test
+}
+
+pkg_postinst() {
+ einfo "Notice: SuperCollider is not very intuitive to get up and running."
+ einfo "The best course of action to make sure that the installation was"
+ einfo "successful and get you started with using SuperCollider is to take"
+ einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
+
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2020-06-22 20:25 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-06-22 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 75ab45b2cad2326c705e33ff995887be8e0d8f8b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 20:14:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 20:25:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ab45b2
media-sound/supercollider: Drop 3.10.2
Closes: https://bugs.gentoo.org/703464
Closes: https://bugs.gentoo.org/716378
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/supercollider/Manifest | 1 -
.../files/supercollider-3.10.2-boost-1.67.patch | 27 --
.../files/supercollider-3.10.2-boost-1.70.patch | 53 ---
.../files/supercollider-3.10.2-system-boost.patch | 359 ---------------------
.../supercollider/supercollider-3.10.2.ebuild | 126 --------
5 files changed, 566 deletions(-)
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 587d93ab6d0..bb9a10b8786 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,2 +1 @@
-DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch
deleted file mode 100644
index dd51d0b85d8..00000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From de567f9104af2b7b86d0de2f25eeb091a95e8579 Mon Sep 17 00:00:00 2001
-From: Tristan de Cacqueray <tristanC@wombatt.eu>
-Date: Sun, 9 Jun 2019 02:16:49 +0000
-Subject: [PATCH] Fix compilation with boost-1.67
-
-When using a system boost version >1.67, the compilation fails because of:
-server/supernova/./utilities/time_tag.hpp: In member function 'boost::posix_time::ptime nova::time_tag::to_ptime() const':
-supernova/./utilities/time_tag.hpp:232:102: error: no matching function for call to 'boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>::subsecond_duration(double)'
- 232 | time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
----
- server/supernova/utilities/time_tag.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/server/supernova/utilities/time_tag.hpp b/server/supernova/utilities/time_tag.hpp
-index 0f49955fd3..c1bb0e73cb 100644
---- a/server/supernova/utilities/time_tag.hpp
-+++ b/server/supernova/utilities/time_tag.hpp
-@@ -179,7 +179,8 @@ class time_tag {
- #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
- time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
- #else
-- time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
-+ time_duration offset =
-+ seconds(get_secs() - ntp_offset) + microseconds(static_cast<long>(get_nanoseconds() / 1000));
- #endif
- return ptime(base, offset);
- }
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
deleted file mode 100644
index 74fc05ac45c..00000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ea95d667907e1c9d4ee3ad8b33b452d60059e3c8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:30:38 +0200
-Subject: [PATCH] Fix build with boost-1.70 (get_io_service() removed)
-
-Fixes https://github.com/supercollider/supercollider/issues/4490
-
----
- server/supernova/sc/sc_osc_handler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
-index 5116a1be8..8c2418b09 100644
---- a/server/supernova/sc/sc_osc_handler.cpp
-+++ b/server/supernova/sc/sc_osc_handler.cpp
-@@ -728,7 +728,7 @@ void sc_osc_handler::tcp_connection::handle_message() {
-
- void sc_osc_handler::start_tcp_accept(void)
- {
-- tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
-+ tcp_connection::pointer new_connection = tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context());
-
- tcp_acceptor_.async_accept(
- new_connection->socket(),
---
-2.22.0
-
-From 53909b1ff2983442dd8d2fdeff6b4331767237f1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:47:44 +0200
-Subject: [PATCH] Fix build with boost-1.70 (missing checked_delete.hpp
- include)
-
-See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html
----
- server/supernova/utilities/utils.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
-index 35b8ab5ad..a7c191f2d 100644
---- a/server/supernova/utilities/utils.hpp
-+++ b/server/supernova/utilities/utils.hpp
-@@ -23,6 +23,7 @@
-
- #include <type_traits>
-
-+#include <boost/checked_delete.hpp>
- #include <boost/intrusive_ptr.hpp>
- #include <boost/noncopyable.hpp>
- #include <boost/detail/atomic_count.hpp>
---
-2.22.0
-
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch b/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch
deleted file mode 100644
index 93c8c4fc2ab..00000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --git c/CMakeLists.txt w/CMakeLists.txt
-index 063028774..a6b76f49b 100644
---- c/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -253,20 +253,43 @@ if (NOT WIN32)
- endif()
-
- if(SYSTEM_BOOST)
-- set(Boost_USE_MULTITHREADED ON)
-- find_package( Boost 1.50.0 COMPONENTS thread system filesystem program_options regex test_exec_monitor )
--endif()
--
--if (Boost_FOUND)
-- link_directories(${Boost_LIBRARY_DIRS})
-+ set(Boost_USE_MULTITHREADED ON)
-+ find_package( Boost 1.50.0 COMPONENTS thread system filesystem program_options regex test_exec_monitor )
-+ if (Boost_FOUND)
-+ # we're specifically setting up the boost libraries here, so we can
-+ # name them
-+ add_library(boost_thread_lib SHARED IMPORTED)
-+ set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION
-+ ${Boost_THREAD_LIBRARY})
-+ add_library(boost_system_lib SHARED IMPORTED)
-+ set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION
-+ ${Boost_SYSTEM_LIBRARY})
-+ add_library(boost_filesystem_lib SHARED IMPORTED)
-+ set_property(TARGET boost_filesystem_lib PROPERTY IMPORTED_LOCATION
-+ ${Boost_FILESYSTEM_LIBRARY})
-+ add_library(boost_program_options_lib SHARED IMPORTED)
-+ set_property(TARGET boost_program_options_lib PROPERTY
-+ IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY})
-+ add_library(boost_regex_lib SHARED IMPORTED)
-+ set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION
-+ ${Boost_REGEX_LIBRARY})
-+ add_library(boost_test_exec_monitor_lib SHARED IMPORTED)
-+ set_property(TARGET boost_test_exec_monitor_lib PROPERTY
-+ IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY})
-+ set(boost_include_dirs ${Boost_INCLUDE_DIRS})
-+ else()
-+ set(SYSTEM_BOOST OFF)
-+ set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-+ message(WARNING "Not using system boost because none was found.")
-+ endif()
- else()
-- message(STATUS "building boost libraries manually")
-+ set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
- endif()
-
- if(SYSTEM_YAMLCPP)
- find_package(YamlCpp)
- else()
-- set(YAMLCPP_FOUND OFF)
-+ set(SYSTEM_YAMLCPP OFF)
- endif()
-
- #############################################
-diff --git c/editors/sc-ide/CMakeLists.txt w/editors/sc-ide/CMakeLists.txt
-index 50059bc2f..8e48194fc 100644
---- c/editors/sc-ide/CMakeLists.txt
-+++ w/editors/sc-ide/CMakeLists.txt
-@@ -219,7 +219,6 @@ endif()
- include_directories(${CMAKE_SOURCE_DIR}/include/common)
- include_directories(${CMAKE_SOURCE_DIR}/common)
- include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface)
--include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
- include_directories(${YAMLCPP_INCLUDE_DIR})
- # For QtCollider headers:
- include_directories(${CMAKE_SOURCE_DIR})
-@@ -299,12 +298,8 @@ target_link_libraries( SuperCollider
- oscpack
- )
-
--if(Boost_FOUND)
-- target_link_libraries( SuperCollider ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
--else()
-- # in-house-built boost system
-- target_link_libraries( SuperCollider boost_system boost_filesystem )
--endif()
-+target_link_libraries( SuperCollider boost_system_lib boost_filesystem_lib)
-+include_directories(${boost_include_dirs})
-
- if(APPLE)
- target_link_libraries( ${ide_name} "-framework CoreServices -framework Foundation")
-diff --git c/external_libraries/CMakeLists.txt w/external_libraries/CMakeLists.txt
-index df33dc6f1..896ce6206 100644
---- c/external_libraries/CMakeLists.txt
-+++ w/external_libraries/CMakeLists.txt
-@@ -2,7 +2,8 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/nova-simd/vec.hpp)
- message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
- endif()
-
--if(NOT Boost_FOUND) # we compile boost ourselves
-+if(NOT SYSTEM_BOOST) # we compile boost ourselves
-+ message(STATUS "Using bundled boost")
- # boost thread
- aux_source_directory(boost/libs/thread/src/ boost_thread_src )
-
-@@ -14,66 +15,65 @@ if(NOT Boost_FOUND) # we compile boost ourselves
- message(SEND_ERROR "we need to implement boost_thread")
- endif()
-
-- aux_source_directory(boost/libs/system/src/ boost_system )
-- add_library(boost_system STATIC EXCLUDE_FROM_ALL ${boost_system})
-- target_include_directories(boost_system PUBLIC boost)
-+ aux_source_directory(boost/libs/system/src/ boost_system_src )
-+ add_library(boost_system_lib STATIC EXCLUDE_FROM_ALL ${boost_system_src})
-+ target_include_directories(boost_system_lib PUBLIC boost)
-
-- aux_source_directory(boost/libs/program_options/src/ boost_program_options )
-- add_library(boost_program_options STATIC EXCLUDE_FROM_ALL ${boost_program_options})
-- target_include_directories(boost_program_options PUBLIC boost)
-+ aux_source_directory(boost/libs/program_options/src/ boost_program_options_src )
-+ add_library(boost_program_options_lib STATIC EXCLUDE_FROM_ALL ${boost_program_options_src})
-+ target_include_directories(boost_program_options_lib PUBLIC boost)
-
- aux_source_directory(boost/libs/filesystem/src boost_filesystem_src)
-- add_library(boost_filesystem STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src})
-- target_include_directories(boost_filesystem PUBLIC boost)
-+ add_library(boost_filesystem_lib STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src})
-+ target_include_directories(boost_filesystem_lib PUBLIC boost)
-
- aux_source_directory(boost/libs/regex/src boost_regex_src)
-- add_library(boost_regex STATIC EXCLUDE_FROM_ALL ${boost_regex_src})
-- target_include_directories(boost_regex PUBLIC boost)
-+ add_library(boost_regex_lib STATIC EXCLUDE_FROM_ALL ${boost_regex_src})
-+ target_include_directories(boost_regex_lib PUBLIC boost)
-
- if(LTO)
-- set_property(TARGET boost_program_options boost_system boost_filesystem
-+ set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib
- APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
-
-- set_property(TARGET boost_program_options boost_system boost_filesystem
-+ set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib
- APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- endif()
-
-- add_library(boost_thread STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform})
-- target_link_libraries(boost_thread boost_system)
-+ add_library(boost_thread_lib STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform})
-+ target_link_libraries(boost_thread_lib boost_system_lib)
- # target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS)
-- target_include_directories(boost_thread PUBLIC boost)
-- target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_USE_LIB) # for win32
-+ target_include_directories(boost_thread_lib PUBLIC boost)
-+ target_compile_definitions(boost_thread_lib PUBLIC BOOST_THREAD_USE_LIB) # for win32
-
- if(PTHREADS_FOUND)
-- target_include_directories(boost_thread PUBLIC ${PTHREADS_INCLUDE_DIR})
-+ target_include_directories(boost_thread_lib PUBLIC ${PTHREADS_INCLUDE_DIR})
- endif()
- if(WIN32)
-- target_compile_definitions( boost_thread PRIVATE BOOST_THREAD_BUILD_LIB)
-+ target_compile_definitions( boost_thread_lib PRIVATE BOOST_THREAD_BUILD_LIB)
- endif()
-
-
- if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-- target_compile_options(boost_thread PRIVATE -fPIC)
-- target_link_libraries(boost_thread rt)
-+ target_compile_options(boost_thread_lib PRIVATE -fPIC)
-+ target_link_libraries(boost_thread_lib rt)
- endif()
-
- if(LTO)
-- set_property(TARGET boost_thread
-+ set_property(TARGET boost_thread_lib
- APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
-
-- set_property(TARGET boost_thread
-+ set_property(TARGET boost_thread_lib
- APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- endif()
-
- set_property( TARGET
-- boost_regex
-- boost_thread
-- boost_program_options
-- boost_system
-- boost_filesystem
-+ boost_regex_lib
-+ boost_thread_lib
-+ boost_program_options_lib
-+ boost_system_lib
-+ boost_filesystem_lib
- PROPERTY FOLDER 3rdparty
- )
--
- endif()
-
- # tlsf
-@@ -84,10 +84,9 @@ set_property(TARGET tlsf PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-
- #oscpack
- add_library(oscpack STATIC EXCLUDE_FROM_ALL "oscpack_build.cpp")
--target_include_directories(oscpack PRIVATE boost)
-+target_include_directories(oscpack PRIVATE ${boost_include_dirs})
- target_include_directories(oscpack INTERFACE oscpack_1_1_0 )
-
--
- if(LTO)
- set_property(TARGET oscpack tlsf
- APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
-@@ -96,15 +95,15 @@ if(LTO)
- APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- endif()
-
--if(NOT YAMLCPP_FOUND)
-- message(STATUS "using bundled libyaml-cpp")
-+if(NOT SYSTEM_YAMLCPP)
-+ message(STATUS "Using bundled yaml-cpp")
-
- # yaml-cpp
- aux_source_directory(${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/src yaml_src)
- CREATE_FINAL_FILE(${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp ${yaml_src})
-
- add_library(yaml STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp)
-- target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
-+ target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include ${boost_include_dirs})
- set_property( TARGET yaml PROPERTY FOLDER 3rdparty )
- set(YAMLCPP_LIBRARY yaml)
- set(YAMLCPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include)
-diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
-index c68b32fdc..593d91845 100644
---- c/lang/CMakeLists.txt
-+++ w/lang/CMakeLists.txt
-@@ -202,14 +202,8 @@ if(SC_HIDAPI)
- endif()
- endif()
-
--if (Boost_FOUND)
-- target_include_directories(libsclang PUBLIC ${Boost_INCLUDE_DIRS})
-- target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
--else()
-- target_include_directories(libsclang PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-- target_link_libraries(libsclang boost_regex boost_thread boost_system boost_filesystem)
--endif()
--
-+target_link_libraries(libsclang boost_thread_lib boost_system_lib boost_regex_lib boost_filesystem_lib)
-+target_include_directories(libsclang PUBLIC ${boost_include_dirs})
-
- if (SCLANG_SERVER)
- target_link_libraries(libsclang libscsynth)
-diff --git c/server/CMakeLists.txt w/server/CMakeLists.txt
-index 2622b4e36..bf8dc863d 100644
---- c/server/CMakeLists.txt
-+++ w/server/CMakeLists.txt
-@@ -12,11 +12,7 @@ include_directories(${CMAKE_SOURCE_DIR}/external_libraries
- ${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
- )
-
--if (Boost_FOUND)
-- include_directories(${Boost_INCLUDE_DIRS})
--else()
-- include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
--endif()
-+include_directories(${boost_include_dirs})
-
- # here we choose who provides us with the FFT lib
- if (APPLE)
-diff --git c/server/plugins/CMakeLists.txt w/server/plugins/CMakeLists.txt
-index 8287f7be9..9a4db7be5 100644
---- c/server/plugins/CMakeLists.txt
-+++ w/server/plugins/CMakeLists.txt
-@@ -199,7 +199,7 @@ if (SUPERNOVA)
-
- if(SNDFILE_FOUND)
- target_include_directories(DiskIO_UGens_supernova PUBLIC ${SNDFILE_INCLUDE_DIR})
-- target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} ${Boost_THREAD_LIBRARY})
-+ target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} boost_thread_lib)
- list(APPEND supernova_plugins DiskIO_UGens_supernova)
- else()
- message(SEND_ERROR "Cannot find libsndfile")
-@@ -217,7 +217,7 @@ endforeach()
-
- if(NOT NO_X11)
- foreach(ugen ${uiugens})
-- target_link_libraries(${ugen} ${Boost_THREAD_LIBRARY})
-+ target_link_libraries(${ugen} boost_thread_lib)
- endforeach()
- endif()
-
-diff --git c/server/scsynth/CMakeLists.txt w/server/scsynth/CMakeLists.txt
-index 17c09f262..3a7145841 100644
---- c/server/scsynth/CMakeLists.txt
-+++ w/server/scsynth/CMakeLists.txt
-@@ -176,11 +176,8 @@ elseif(AUDIOAPI STREQUAL coreaudio)
- target_link_libraries(libscsynth "-framework CoreAudio")
- endif()
-
--if (Boost_FOUND)
-- target_link_libraries(libscsynth ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
--else()
-- target_link_libraries(libscsynth boost_system boost_filesystem)
--endif()
-+target_link_libraries(libscsynth boost_system_lib boost_filesystem_lib)
-+target_include_directories(libscsynth PUBLIC ${boost_include_dirs})
-
- if (WIN32)
- target_link_libraries(libscsynth wsock32 ws2_32 winmm)
-diff --git c/server/supernova/CMakeLists.txt w/server/supernova/CMakeLists.txt
-index cfe128880..2b80cb545 100644
---- c/server/supernova/CMakeLists.txt
-+++ w/server/supernova/CMakeLists.txt
-@@ -70,7 +70,7 @@ if(NOT WIN32)
- PROPERTY OUTPUT_NAME supernova)
- endif()
-
--target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread)
-+target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread_lib)
-
- target_compile_definitions(libsupernova PUBLIC SUPERNOVA)
- target_include_directories(libsupernova PUBLIC
-@@ -146,14 +146,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- target_link_libraries(libsupernova rt)
- endif()
-
--
--if(Boost_FOUND)
-- target_link_libraries(libsupernova ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-- target_include_directories(libsupernova PUBLIC ${Boost_INCLUDE_DIRS})
--else()
-- target_include_directories(libsupernova PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-- target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
--endif()
-+target_link_libraries(libsupernova boost_system_lib boost_filesystem_lib boost_program_options_lib)
-+target_include_directories(libsupernova PUBLIC ${boost_include_dirs})
-
- if(CMAKE_COMPILER_IS_GNUCXX)
- if( ${_gcc_version} VERSION_GREATER 5 )
-diff --git c/testsuite/server/CMakeLists.txt w/testsuite/server/CMakeLists.txt
-index 38ce4b486..da19c2e5d 100644
---- c/testsuite/server/CMakeLists.txt
-+++ w/testsuite/server/CMakeLists.txt
-@@ -1,8 +1,8 @@
-+add_library(boost_test STATIC boost_test.cpp)
-+target_include_directories(boost_test PUBLIC ${boost_include_dirs})
-+
- add_subdirectory(scsynth)
--
- if (SUPERNOVA)
- add_subdirectory(supernova)
- endif()
-
--add_library(boost_test STATIC boost_test.cpp)
--target_include_directories(boost_test PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-diff --git c/testsuite/server/supernova/CMakeLists.txt w/testsuite/server/supernova/CMakeLists.txt
-index e8a9ccf5f..4022da847 100644
---- c/testsuite/server/supernova/CMakeLists.txt
-+++ w/testsuite/server/supernova/CMakeLists.txt
-@@ -34,7 +34,7 @@ foreach(test ${simple_tests})
- string(REPLACE .cpp "" test_name ${test} )
- add_executable(${test_name} ${test})
-
-- target_link_libraries(${test_name} libsupernova boost_test boost_thread)
-+ target_link_libraries(${test_name} libsupernova boost_test boost_thread_lib)
-
- add_test(${test_name}_run ${EXECUTABLE_OUTPUT_PATH}/${test_name})
- endforeach(test)
diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.10.2.ebuild
deleted file mode 100644
index 94a5cc54959..00000000000
--- a/media-sound/supercollider/supercollider-3.10.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim X zeroconf"
-
-REQUIRED_USE="qt5? ( X )"
-
-BDEPEND="
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-cpp/yaml-cpp:=
- >=dev-libs/boost-1.70.0:=
- media-libs/alsa-lib
- sys-libs/readline:0=
- virtual/libudev:=
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- !jack? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwebsockets:5
- dev-qt/qtwidgets:5
- )
- server? ( !app-admin/supernova )
- sndfile? ( media-libs/libsndfile )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
- dev-libs/icu
- emacs? ( >=app-editors/emacs-23.1:* )
- gedit? ( app-editors/gedit )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtdeclarative:5
- )
- vim? ( app-editors/vim )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-ccache.patch
- "${FILESDIR}"/${P}-system-boost.patch
- "${FILESDIR}"/${P}-boost-1.67.patch
- "${FILESDIR}"/${P}-boost-1.70.patch
-)
-
-S="${WORKDIR}/SuperCollider-Source"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_HELP=ON
- -DSYSTEM_BOOST=ON
- -DSYSTEM_YAMLCPP=ON
- -DSSE=$(usex cpu_flags_x86_sse)
- -DSSE2=$(usex cpu_flags_x86_sse2)
- -DSC_EL=$(usex emacs)
- -DFFT_GREEN=$(usex !fftw)
- -DSC_ED=$(usex gedit)
- -DNO_GPL3=$(usex !gpl3)
- -DAUDIOAPI=$(usex jack jack portaudio)
- -DSC_IDE=$(usex qt5)
- -DSC_QT=$(usex qt5)
- -DSCLANG_SERVER=$(usex server)
- -DSUPERNOVA=$(usex server)
- -DNO_LIBSNDFILE=$(usex !sndfile)
- -DLIBSCSYNTH=$(usex !static-libs)
- -DSC_VIM=$(usex vim)
- -DNO_X11=$(usex !X)
- -DNO_AVAHI=$(usex !zeroconf)
- )
-
- use debug && mycmakeargs+=(
- -DSC_MEMORY_DEBUGGING=ON
- -DSN_MEMORY_DEBUGGING=ON
- -DGC_SANITYCHECK=ON
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- use emacs && newdoc editors/scel/README.md README.emacs
- use gedit && newdoc editors/sced/README.md README.gedit
- use vim && newdoc editors/scvim/README.md README.vim
-}
-
-pkg_postinst() {
- einfo "Notice: SuperCollider is not very intuitive to get up and running."
- einfo "The best course of action to make sure that the installation was"
- einfo "successful and get you started with using SuperCollider is to take"
- einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
-
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2020-06-22 20:25 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-06-22 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 317ed887556977a46e475546548e918e39a1b6a3
Author: Hector Martin <marcan <AT> marcan <DOT> st>
AuthorDate: Sat May 30 10:54:27 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 20:25:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317ed887
media-sound/supercollider-3.11.0: version bump
Also adds the webengine USE flag, as that dep is now optional.
Closes: https://bugs.gentoo.org/723178
Closes: https://bugs.gentoo.org/724982
Closes: https://bugs.gentoo.org/728444
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Hector Martin <marcan <AT> marcan.st>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/supercollider/Manifest | 1 +
.../files/supercollider-3.11.0-boost-1.72.patch | 45 +++++++
.../files/supercollider-3.11.0-fewer-qt-deps.patch | 126 ++++++++++++++++++++
.../files/supercollider-3.11.0-qt-5.15.patch | 89 ++++++++++++++
media-sound/supercollider/metadata.xml | 1 +
.../supercollider/supercollider-3.11.0.ebuild | 129 +++++++++++++++++++++
6 files changed, 391 insertions(+)
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index d46670a6796..587d93ab6d0 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1 +1,2 @@
DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
+DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
new file mode 100644
index 00000000000..94329b86791
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
@@ -0,0 +1,45 @@
+From 43b2b27c14186a9a3eff917d7598751ed298ae20 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Sun, 31 May 2020 21:25:12 +0900
+Subject: [PATCH 2/2] Fix build with Boost 1.72.0
+
+---
+ .../include/boost/sync/detail/throw_exception.hpp | 4 ----
+ external_libraries/oscpack_build.cpp | 6 +++---
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
+index b5fdfabf8..a7d7fa7b3 100755
+--- a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
++++ b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
+@@ -164,11 +164,7 @@ BOOST_NOINLINE BOOST_NORETURN void throw_exception(const char* func, const char*
+
+ #endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+-#if !defined(BOOST_EXCEPTION_DISABLE)
+-#define BOOST_SYNC_DETAIL_HERE BOOST_THROW_EXCEPTION_CURRENT_FUNCTION, __FILE__, __LINE__
+-#else
+ #define BOOST_SYNC_DETAIL_HERE BOOST_CURRENT_FUNCTION, __FILE__, __LINE__
+-#endif
+
+ #define BOOST_SYNC_DETAIL_THROW_DEFAULT(ex)\
+ boost::sync::detail::throw_exception< ex >(BOOST_SYNC_DETAIL_HERE)
+diff --git a/external_libraries/oscpack_build.cpp b/external_libraries/oscpack_build.cpp
+index 3a658f3d3..1f6283d1c 100644
+--- a/external_libraries/oscpack_build.cpp
++++ b/external_libraries/oscpack_build.cpp
+@@ -1,8 +1,8 @@
+-#include <boost/detail/endian.hpp>
++#include <boost/predef.h>
+
+-#ifdef BOOST_LITTLE_ENDIAN
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define OSC_HOST_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define OSC_HOST_BIG_ENDIAN
+ #else
+ #error please define endianness
+--
+2.26.2
+
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
new file mode 100644
index 00000000000..8b1014d9991
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
@@ -0,0 +1,126 @@
+From 5b655fbbf44ff5e67709667242a5feff707e1a51 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Mon, 1 Jun 2020 18:43:08 +0900
+Subject: [PATCH] Remove spurious Qt dependencies
+
+---
+ QtCollider/CMakeLists.txt | 10 +++-------
+ QtCollider/widgets/QcCanvas.h | 2 --
+ README_LINUX.md | 6 +++---
+ README_RASPBERRY_PI.md | 2 +-
+ editors/sc-ide/CMakeLists.txt | 13 +++----------
+ 5 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
+index de38afb908..6b9437b9c0 100644
+--- a/QtCollider/CMakeLists.txt
++++ b/QtCollider/CMakeLists.txt
+@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
+ set(
+ QT_COMPONENTS
+ Core
+- Widgets
++ Gui
+ Network
+ PrintSupport
+- OpenGL
+- Quick
+- Qml
+- Sql
+ Svg
++ Widgets
+ )
+
+ set (QT_COLLIDER_LIBS
+- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
+- Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
++ Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
+ ${MATH_LIBRARY})
+
+ if(SC_USE_QTWEBENGINE)
+diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
+index 3acb00fc23..ff230b8139 100644
+--- a/QtCollider/widgets/QcCanvas.h
++++ b/QtCollider/widgets/QcCanvas.h
+@@ -28,9 +28,7 @@
+ #include <QBasicTimer>
+ #include <QTime>
+ #include <QPalette>
+-#include <QGLWidget>
+
+-// using QcCanvasBase = QGLWidget;
+ using QcCanvasBase = QWidget;
+
+ class QcCanvas : public QcCanvasBase {
+diff --git a/README_LINUX.md b/README_LINUX.md
+index d5818e9106..532ad9cc5a 100644
+--- a/README_LINUX.md
++++ b/README_LINUX.md
+@@ -75,7 +75,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
+
+ If this displays version 5.7 or later, installing Qt is easy:
+
+- sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
++ sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
+
+ If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
+
+@@ -87,13 +87,13 @@ On Xenial:
+
+ sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
+ sudo apt-get update
+- sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
++ sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
+
+ On Trusty, only Qt 5.10 and below are available:
+
+ sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
+ sudo apt-get update
+- sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
++ sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
+
+ [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
+
+diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
+index 974ea1822c..aae8250388 100644
+--- a/README_RASPBERRY_PI.md
++++ b/README_RASPBERRY_PI.md
+@@ -42,7 +42,7 @@ Install required libraries:
+ # For GUI builds:
+ sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+ libreadline-dev libfftw3-dev libxt-dev libudev-dev cmake qttools5-dev qttools5-dev-tools \
+- qtdeclarative5-dev libqt5svg5-dev qjackctl
++ qtbase5-dev libqt5svg5-dev qjackctl
+ # For GUI-less builds:
+ sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+ libreadline-dev libfftw3-dev libudev-dev cmake git
+diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
+index 1ee9ae4f43..6248668594 100644
+--- a/editors/sc-ide/CMakeLists.txt
++++ b/editors/sc-ide/CMakeLists.txt
+@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
+ Concurrent
+ Core
+ LinguistTools
+- # OpenGL
+- PrintSupport
+- Qml
+- Quick
+- Sql
++ Network
+ Widgets
+ )
+
+ set(QT_IDE_LIBRARIES
+ Qt5::Concurrent
+ Qt5::Core
+- # Qt5::OpenGL
+- Qt5::PrintSupport
+- Qt5::Qml
+- Qt5::Quick
+- Qt5::Sql
++ Qt5::Network
++ Qt5::Widgets
+ )
+
+ if(SC_USE_QTWEBENGINE)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
new file mode 100644
index 00000000000..37f803312c2
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
@@ -0,0 +1,89 @@
+From 244e55632cef86ecd363eb8df3f2352569f804f4 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Sun, 31 May 2020 21:24:52 +0900
+Subject: [PATCH 1/2] Fix build with Qt 5.15
+
+---
+ QtCollider/primitives/prim_QPen.cpp | 1 +
+ QtCollider/widgets/QcGraph.cpp | 1 +
+ QtCollider/widgets/QcLevelIndicator.cpp | 1 +
+ QtCollider/widgets/QcMultiSlider.cpp | 1 +
+ QtCollider/widgets/QcScopeShm.cpp | 1 +
+ QtCollider/widgets/soundfileview/view.cpp | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/QtCollider/primitives/prim_QPen.cpp b/QtCollider/primitives/prim_QPen.cpp
+index 8d531214d..4ba24519d 100644
+--- a/QtCollider/primitives/prim_QPen.cpp
++++ b/QtCollider/primitives/prim_QPen.cpp
+@@ -27,6 +27,7 @@
+ #include "PyrKernel.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QVector2D>
+ #include <QVector3D>
+ #include <cmath>
+diff --git a/QtCollider/widgets/QcGraph.cpp b/QtCollider/widgets/QcGraph.cpp
+index 70215ae94..79e71d1ad 100644
+--- a/QtCollider/widgets/QcGraph.cpp
++++ b/QtCollider/widgets/QcGraph.cpp
+@@ -24,6 +24,7 @@
+ #include "../style/routines.hpp"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QApplication>
+ #include <QtCore/qmath.h>
+diff --git a/QtCollider/widgets/QcLevelIndicator.cpp b/QtCollider/widgets/QcLevelIndicator.cpp
+index 19c7d4874..8a60f354a 100644
+--- a/QtCollider/widgets/QcLevelIndicator.cpp
++++ b/QtCollider/widgets/QcLevelIndicator.cpp
+@@ -23,6 +23,7 @@
+ #include "../QcWidgetFactory.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+
+ QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
+
+diff --git a/QtCollider/widgets/QcMultiSlider.cpp b/QtCollider/widgets/QcMultiSlider.cpp
+index 046b18739..381ddd404 100644
+--- a/QtCollider/widgets/QcMultiSlider.cpp
++++ b/QtCollider/widgets/QcMultiSlider.cpp
+@@ -26,6 +26,7 @@
+ #include <QApplication>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+
+ #include <cmath>
+
+diff --git a/QtCollider/widgets/QcScopeShm.cpp b/QtCollider/widgets/QcScopeShm.cpp
+index bb44623f4..edd38ef57 100644
+--- a/QtCollider/widgets/QcScopeShm.cpp
++++ b/QtCollider/widgets/QcScopeShm.cpp
+@@ -25,6 +25,7 @@
+ #include "../debug.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #include <QResizeEvent>
+ #include <QWindow>
+diff --git a/QtCollider/widgets/soundfileview/view.cpp b/QtCollider/widgets/soundfileview/view.cpp
+index a3eca811f..baba0b245 100644
+--- a/QtCollider/widgets/soundfileview/view.cpp
++++ b/QtCollider/widgets/soundfileview/view.cpp
+@@ -24,6 +24,7 @@
+
+ #include <QGridLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QCursor>
+--
+2.26.2
+
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index 3b6d97f50b9..4fbc1537670 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -24,5 +24,6 @@
<flag name="gedit">Enable the SCED user interface</flag>
<flag name="gpl3">Build GPL-3 licensed code (recommended)</flag>
<flag name="server">Build with internal server</flag>
+ <flag name="webengine">Enable the internal help system using QtWebengine</flag>
</use>
</pkgmetadata>
diff --git a/media-sound/supercollider/supercollider-3.11.0.ebuild b/media-sound/supercollider/supercollider-3.11.0.ebuild
new file mode 100644
index 00000000000..02d351288d8
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.11.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="https://supercollider.github.io/"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
+
+REQUIRED_USE="
+ qt5? ( X )
+ webengine? ( qt5 )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+ dev-cpp/yaml-cpp:=
+ >=dev-libs/boost-1.70.0:=
+ media-libs/alsa-lib
+ sys-libs/readline:0=
+ virtual/libudev:=
+ fftw? ( sci-libs/fftw:3.0= )
+ jack? ( virtual/jack )
+ !jack? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ )
+ server? ( !app-admin/supernova )
+ sndfile? ( media-libs/libsndfile )
+ webengine? (
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwebsockets:5
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ dev-libs/icu
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gedit? ( app-editors/gedit )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ )
+ vim? ( app-editors/vim )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
+ "${FILESDIR}"/${P}-boost-1.72.patch # Upstream PR 4990
+ "${FILESDIR}"/${P}-qt-5.15.patch # Upstream PR 4986
+ "${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
+)
+
+S="${WORKDIR}/SuperCollider-${PV}-Source"
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_HELP=ON
+ -DSYSTEM_BOOST=ON
+ -DSYSTEM_YAMLCPP=ON
+ -DSSE=$(usex cpu_flags_x86_sse)
+ -DSSE2=$(usex cpu_flags_x86_sse2)
+ -DSC_EL=$(usex emacs)
+ -DFFT_GREEN=$(usex !fftw)
+ -DSC_ED=$(usex gedit)
+ -DNO_GPL3=$(usex !gpl3)
+ -DAUDIOAPI=$(usex jack jack portaudio)
+ -DSC_IDE=$(usex qt5)
+ -DSC_QT=$(usex qt5)
+ -DSCLANG_SERVER=$(usex server)
+ -DSUPERNOVA=$(usex server)
+ -DNO_LIBSNDFILE=$(usex !sndfile)
+ -DLIBSCSYNTH=$(usex !static-libs)
+ -DSC_VIM=$(usex vim)
+ -DSC_USE_QTWEBENGINE=$(usex webengine)
+ -DNO_X11=$(usex !X)
+ -DNO_AVAHI=$(usex !zeroconf)
+ )
+
+ use debug && mycmakeargs+=(
+ -DSC_MEMORY_DEBUGGING=ON
+ -DSN_MEMORY_DEBUGGING=ON
+ -DGC_SANITYCHECK=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ use emacs && newdoc editors/scel/README.md README.emacs
+ use gedit && newdoc editors/sced/README.md README.gedit
+ use vim && newdoc editors/scvim/README.md README.vim
+}
+
+pkg_postinst() {
+ einfo "Notice: SuperCollider is not very intuitive to get up and running."
+ einfo "The best course of action to make sure that the installation was"
+ einfo "successful and get you started with using SuperCollider is to take"
+ einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
+
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2018-07-11 19:10 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-07-11 19:10 UTC (permalink / raw
To: gentoo-commits
commit: c38a655885527975026a6eefe96f0ec48de5897d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 19:10:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 19:10:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38a6558
media-sound/supercollider: Drop old
Package-Manager: Portage-2.3.42, Repoman-2.3.9
media-sound/supercollider/Manifest | 1 -
.../files/supercollider-3.8.0-desktop.patch | 10 --
.../files/supercollider-3.8.0-gcc-7.patch | 75 -------------
.../files/supercollider-3.8.0-multilib.patch | 89 ----------------
.../supercollider/supercollider-3.8.1.ebuild | 116 ---------------------
.../supercollider/supercollider-3.9.3.ebuild | 113 --------------------
6 files changed, 404 deletions(-)
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index be309c01a62..07d2fabe1f8 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,2 +1 @@
-DIST SuperCollider-3.8.1-Source-linux.tar.bz2 8913640 BLAKE2B 998b64b7e3530f6dc2e5d329bf387bb62aa694ec65d9a8464ae2b3bc1816f6a6fb26f351465df58170034ba35d7afc5df545a9bd614e96e6434155c70715d0ce SHA512 50d9e65e8b610e86decc98ecfa5bef2088af6dc2436e5059e5aa66e8ce9b4f2dab23dd1c5231c08430d1c50b211c876e7860c0e2078d0500bf8de4fbb9554eb7
DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
deleted file mode 100644
index 2cf759881d0..00000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/editors/sc-ide/SuperColliderIDE.desktop 2016-08-22 11:12:21.000000000 +0300
-+++ b/editors/sc-ide/SuperColliderIDE.desktop 2017-10-31 18:26:58.520164204 +0300
-@@ -5,6 +5,5 @@
- Icon=sc_ide
- Type=Application
- Terminal=false
--Patterns=*.scd;*.sc;*.schelp
--Categories=Application;Multimedia;Audio;AudioVideo
-+Categories=X-Multimedia;Audio;AudioVideo
- MimeType=text/x-sc;
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch b/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
deleted file mode 100644
index 5f0269845b3..00000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1eaa3fb3afbbf4708695a25361527a70e2d7a02d Mon Sep 17 00:00:00 2001
-From: Brian Heim <brianlheim@gmail.com>
-Date: Tue, 4 Jul 2017 13:26:00 -0400
-Subject: [PATCH] DiskIO_UGens: include <functional>
-
-std::bind is in <functional> according to the C++ ISO standard, and
-gcc7.1 enforces this.
----
- server/plugins/DiskIO_UGens.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
-index 47c91a139..d4bb1c51c 100644
---- a/server/plugins/DiskIO_UGens.cpp
-+++ b/server/plugins/DiskIO_UGens.cpp
-@@ -28,6 +28,7 @@
-
- #include <atomic>
- #include <new>
-+#include <functional>
- #include <SC_Lock.h>
-
- #include <boost/lockfree/queue.hpp>
---
-2.15.1
-
-From a891e7d5be4c4944970973cc8467485e8a4c0571 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Thu, 7 Sep 2017 19:38:46 -0300
-Subject: [PATCH] PyrSched.cpp: #include <functional> to fix FTBFS
-
-Bug-Debian: https://bugs.debian.org/853671
----
- lang/LangPrimSource/PyrSched.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
-index 02f0c6264..63487a58e 100644
---- a/lang/LangPrimSource/PyrSched.cpp
-+++ b/lang/LangPrimSource/PyrSched.cpp
-@@ -37,6 +37,7 @@
- #include <string.h>
- #include <math.h>
- #include <limits>
-+#include <functional>
-
- #if defined(__APPLE__) || defined(__linux__)
- # include <pthread.h>
---
-2.15.1
-
-From c058e16ff215b0b318abb3aa9ab4d47c0eeac877 Mon Sep 17 00:00:00 2001
-From: hlolli <hlolli@gmail.com>
-Date: Mon, 10 Jul 2017 18:32:22 +0200
-Subject: [PATCH] adding functional header in PyrSerialPrim.cpp
-
----
- lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
-index 3099598fe..5e2b40372 100644
---- a/lang/LangPrimSource/PyrSerialPrim.cpp
-+++ b/lang/LangPrimSource/PyrSerialPrim.cpp
-@@ -36,6 +36,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <boost/atomic.hpp>
-+#include <functional>
-
- #include <stdexcept>
- #include <sstream>
---
-2.15.1
-
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
deleted file mode 100644
index 982e44a15a9..00000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 547a18c14dd45a22361f2ab495d14625862499e5 Mon Sep 17 00:00:00 2001
-From: Ferdinand Thiessen <rpm@fthiessen.de>
-Date: Sun, 5 Mar 2017 16:16:19 +0100
-Subject: [PATCH] cmake / linux: Allow setting LIB_SUFFIX to install libraries
- into lib64 etc.
-
----
- editors/sced/CMakeLists.txt | 6 +++---
- server/plugins/CMakeLists.txt | 2 +-
- server/scsynth/CMakeLists.txt | 4 ++--
- server/supernova/server/main.cpp | 1 +
- 4 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/editors/sced/CMakeLists.txt b/editors/sced/CMakeLists.txt
-index 286d625fb..b304d4c07 100644
---- a/editors/sced/CMakeLists.txt
-+++ b/editors/sced/CMakeLists.txt
-@@ -14,10 +14,10 @@ if(NOT WIN32 AND SC_ED EQUAL 2)
- DESTINATION share/gtksourceview-2.0/language-specs)
-
- install(FILES data/sced.gedit-plugin
-- DESTINATION lib/gedit-2/plugins)
-+ DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
-
- install(DIRECTORY sced
-- DESTINATION lib/gedit-2/plugins)
-+ DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
-
- elseif(NOT WIN32 AND SC_ED EQUAL 3)
-
-@@ -29,7 +29,7 @@ elseif(NOT WIN32 AND SC_ED EQUAL 3)
- DESTINATION share/gtksourceview-3.0/language-specs)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
-- DESTINATION lib/gedit/plugins)
-+ DESTINATION lib${LIB_SUFFIX}/gedit/plugins)
-
- elseif(WIN32)
-
-diff --git a/server/plugins/CMakeLists.txt b/server/plugins/CMakeLists.txt
-index 52accc332..570f2e50b 100644
---- a/server/plugins/CMakeLists.txt
-+++ b/server/plugins/CMakeLists.txt
-@@ -301,7 +301,7 @@ elseif(APPLE)
-
- else()
- install(TARGETS ${plugins} ${supernova_plugins}
-- DESTINATION "lib/SuperCollider/plugins"
-+ DESTINATION "lib${LIB_SUFFIX}/SuperCollider/plugins"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-
-diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
-index 1d99cad80..dbb92749b 100644
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
-@@ -150,7 +150,7 @@ elseif(NOT NO_LIBSNDFILE)
- endif(SNDFILE_FOUND)
-
- if(UNIX AND NOT APPLE)
-- target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins\"")
-+ target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/SuperCollider/plugins\"")
- endif()
-
-
-@@ -284,7 +284,7 @@ elseif(WIN32)
- else()
- install(TARGETS ${INSTALL_TARGETS}
- RUNTIME DESTINATION "bin"
-- LIBRARY DESTINATION "lib"
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-
-diff --git a/server/supernova/server/main.cpp b/server/supernova/server/main.cpp
-index c0f603471..453355523 100644
---- a/server/supernova/server/main.cpp
-+++ b/server/supernova/server/main.cpp
-@@ -245,6 +245,7 @@ void set_plugin_paths(server_arguments const & args, nova::sc_ugen_factory * fac
- const path home = resolve_home();
- std::vector<path> folders = { "/usr/local/lib/SuperCollider/plugins",
- "/usr/lib/SuperCollider/plugins",
-+ "/usr/lib64/SuperCollider/plugins",
- home / "/.local/share/SuperCollider/Extensions",
- home / "share/SuperCollider/plugins" };
-
---
-2.15.1
-
diff --git a/media-sound/supercollider/supercollider-3.8.1.ebuild b/media-sound/supercollider/supercollider-3.8.1.ebuild
deleted file mode 100644
index 07406d0c434..00000000000
--- a/media-sound/supercollider/supercollider-3.8.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
-RESTRICT="mirror"
-
-RDEPEND="
- media-libs/alsa-lib
- sys-libs/readline:0=
- x11-libs/libX11
- x11-libs/libXt
- avahi? ( net-dns/avahi )
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- !jack? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- )
- server? ( !app-admin/supernova )
- sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
- dev-libs/icu
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- gedit? ( app-editors/gedit )
- qt5? (
- dev-qt/linguist-tools:5
- dev-qt/qtdeclarative:5
- dev-qt/qtconcurrent:5
- )
- vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
- "${FILESDIR}"/${PN}-3.8.0-multilib.patch
- "${FILESDIR}"/${PN}-3.8.0-gcc-7.patch
- "${FILESDIR}"/${PN}-3.8.0-desktop.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DAUDIOAPI=$(usex jack jack portaudio)
- -DINSTALL_HELP=ON
- -DSYSTEM_BOOST=OFF
- -DSYSTEM_YAMLCPP=OFF
- -DNO_AVAHI=$(usex !avahi)
- -DFFT_GREEN=$(usex !fftw)
- -DNO_GPL3=$(usex !gpl3)
- -DNO_LIBSNDFILE=$(usex !sndfile)
- -DSC_QT=$(usex qt5)
- -DSCLANG_SERVER=$(usex server)
- -DSUPERNOVA=$(usex server)
- -DLIBSCSYNTH=$(usex !static-libs)
- -DSSE=$(usex cpu_flags_x86_sse)
- -DSSE2=$(usex cpu_flags_x86_sse2)
- -DSC_IDE=$(usex qt5)
- -DSC_ED=$(usex gedit)
- -DSC_VIM=$(usex vim)
- -DSC_EL=$(usex emacs)
- )
-
- use debug && mycmakeargs+=(
- -DSC_MEMORY_DEBUGGING=ON
- -DSN_MEMORY_DEBUGGING=ON
- -DGC_SANITYCHECK=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- use vim && newdoc editors/scvim/README.md README.vim
- use emacs && newdoc editors/scel/README.md README.emacs
- use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
- einfo
- einfo "Notice: SuperCollider is not very intuitive to get up and running."
- einfo "The best course of action to make sure that the installation was"
- einfo "successful and get you started with using SuperCollider is to take"
- einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
- einfo
-
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.9.3.ebuild b/media-sound/supercollider/supercollider-3.9.3.ebuild
deleted file mode 100644
index 5ea861d111b..00000000000
--- a/media-sound/supercollider/supercollider-3.9.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
-RESTRICT="mirror"
-
-RDEPEND="
- media-libs/alsa-lib
- sys-libs/readline:0=
- x11-libs/libX11
- x11-libs/libXt
- avahi? ( net-dns/avahi )
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- !jack? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- )
- server? ( !app-admin/supernova )
- sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
- dev-libs/icu
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- gedit? ( app-editors/gedit )
- qt5? (
- dev-qt/linguist-tools:5
- dev-qt/qtdeclarative:5
- dev-qt/qtconcurrent:5
- )
- vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DAUDIOAPI=$(usex jack jack portaudio)
- -DINSTALL_HELP=ON
- -DSYSTEM_BOOST=OFF
- -DSYSTEM_YAMLCPP=OFF
- -DNO_AVAHI=$(usex !avahi)
- -DFFT_GREEN=$(usex !fftw)
- -DNO_GPL3=$(usex !gpl3)
- -DNO_LIBSNDFILE=$(usex !sndfile)
- -DSC_QT=$(usex qt5)
- -DSCLANG_SERVER=$(usex server)
- -DSUPERNOVA=$(usex server)
- -DLIBSCSYNTH=$(usex !static-libs)
- -DSSE=$(usex cpu_flags_x86_sse)
- -DSSE2=$(usex cpu_flags_x86_sse2)
- -DSC_IDE=$(usex qt5)
- -DSC_ED=$(usex gedit)
- -DSC_VIM=$(usex vim)
- -DSC_EL=$(usex emacs)
- )
-
- use debug && mycmakeargs+=(
- -DSC_MEMORY_DEBUGGING=ON
- -DSN_MEMORY_DEBUGGING=ON
- -DGC_SANITYCHECK=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- use vim && newdoc editors/scvim/README.md README.vim
- use emacs && newdoc editors/scel/README.md README.emacs
- use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
- einfo
- einfo "Notice: SuperCollider is not very intuitive to get up and running."
- einfo "The best course of action to make sure that the installation was"
- einfo "successful and get you started with using SuperCollider is to take"
- einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
- einfo
-
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2018-01-06 2:14 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-01-06 2:14 UTC (permalink / raw
To: gentoo-commits
commit: 40a98d76d8344f7876563da4f38274a74b49ed83
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 01:59:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 02:13:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a98d76
media-sound/supercollider: Fix multilib-strict issue
Closes: https://bugs.gentoo.org/628362
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/supercollider-3.8.0-multilib.patch | 89 ++++++++++++++++++++++
.../supercollider/supercollider-3.8.0.ebuild | 3 +-
2 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
new file mode 100644
index 00000000000..982e44a15a9
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
@@ -0,0 +1,89 @@
+From 547a18c14dd45a22361f2ab495d14625862499e5 Mon Sep 17 00:00:00 2001
+From: Ferdinand Thiessen <rpm@fthiessen.de>
+Date: Sun, 5 Mar 2017 16:16:19 +0100
+Subject: [PATCH] cmake / linux: Allow setting LIB_SUFFIX to install libraries
+ into lib64 etc.
+
+---
+ editors/sced/CMakeLists.txt | 6 +++---
+ server/plugins/CMakeLists.txt | 2 +-
+ server/scsynth/CMakeLists.txt | 4 ++--
+ server/supernova/server/main.cpp | 1 +
+ 4 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/editors/sced/CMakeLists.txt b/editors/sced/CMakeLists.txt
+index 286d625fb..b304d4c07 100644
+--- a/editors/sced/CMakeLists.txt
++++ b/editors/sced/CMakeLists.txt
+@@ -14,10 +14,10 @@ if(NOT WIN32 AND SC_ED EQUAL 2)
+ DESTINATION share/gtksourceview-2.0/language-specs)
+
+ install(FILES data/sced.gedit-plugin
+- DESTINATION lib/gedit-2/plugins)
++ DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
+
+ install(DIRECTORY sced
+- DESTINATION lib/gedit-2/plugins)
++ DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
+
+ elseif(NOT WIN32 AND SC_ED EQUAL 3)
+
+@@ -29,7 +29,7 @@ elseif(NOT WIN32 AND SC_ED EQUAL 3)
+ DESTINATION share/gtksourceview-3.0/language-specs)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
+- DESTINATION lib/gedit/plugins)
++ DESTINATION lib${LIB_SUFFIX}/gedit/plugins)
+
+ elseif(WIN32)
+
+diff --git a/server/plugins/CMakeLists.txt b/server/plugins/CMakeLists.txt
+index 52accc332..570f2e50b 100644
+--- a/server/plugins/CMakeLists.txt
++++ b/server/plugins/CMakeLists.txt
+@@ -301,7 +301,7 @@ elseif(APPLE)
+
+ else()
+ install(TARGETS ${plugins} ${supernova_plugins}
+- DESTINATION "lib/SuperCollider/plugins"
++ DESTINATION "lib${LIB_SUFFIX}/SuperCollider/plugins"
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif()
+
+diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
+index 1d99cad80..dbb92749b 100644
+--- a/server/scsynth/CMakeLists.txt
++++ b/server/scsynth/CMakeLists.txt
+@@ -150,7 +150,7 @@ elseif(NOT NO_LIBSNDFILE)
+ endif(SNDFILE_FOUND)
+
+ if(UNIX AND NOT APPLE)
+- target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins\"")
++ target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/SuperCollider/plugins\"")
+ endif()
+
+
+@@ -284,7 +284,7 @@ elseif(WIN32)
+ else()
+ install(TARGETS ${INSTALL_TARGETS}
+ RUNTIME DESTINATION "bin"
+- LIBRARY DESTINATION "lib"
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif()
+
+diff --git a/server/supernova/server/main.cpp b/server/supernova/server/main.cpp
+index c0f603471..453355523 100644
+--- a/server/supernova/server/main.cpp
++++ b/server/supernova/server/main.cpp
+@@ -245,6 +245,7 @@ void set_plugin_paths(server_arguments const & args, nova::sc_ugen_factory * fac
+ const path home = resolve_home();
+ std::vector<path> folders = { "/usr/local/lib/SuperCollider/plugins",
+ "/usr/lib/SuperCollider/plugins",
++ "/usr/lib64/SuperCollider/plugins",
+ home / "/.local/share/SuperCollider/Extensions",
+ home / "share/SuperCollider/plugins" };
+
+--
+2.15.1
+
diff --git a/media-sound/supercollider/supercollider-3.8.0.ebuild b/media-sound/supercollider/supercollider-3.8.0.ebuild
index db130aaae58..36db17c3ce0 100644
--- a/media-sound/supercollider/supercollider-3.8.0.ebuild
+++ b/media-sound/supercollider/supercollider-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}"/${P}-no-opengl.patch
"${FILESDIR}"/${P}-no-qtsensors.patch
"${FILESDIR}"/${P}-no-qtpositioning.patch
+ "${FILESDIR}"/${P}-multilib.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/
@ 2018-01-06 2:14 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-01-06 2:14 UTC (permalink / raw
To: gentoo-commits
commit: ddc2565279507fd8c2fc92513082410bf155bc6f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 02:08:06 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 02:13:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc25652
media-sound/supercollider: Fix invalid desktop file
Thanks-to: CaptainBlood <luc_pierard_de_maujouy <AT> yahoo.fr>
Closes: https://bugs.gentoo.org/636090
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../supercollider/files/supercollider-3.8.0-desktop.patch | 10 ++++++++++
...upercollider-3.8.0.ebuild => supercollider-3.8.0-r1.ebuild} | 1 +
2 files changed, 11 insertions(+)
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
new file mode 100644
index 00000000000..2cf759881d0
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
@@ -0,0 +1,10 @@
+--- a/editors/sc-ide/SuperColliderIDE.desktop 2016-08-22 11:12:21.000000000 +0300
++++ b/editors/sc-ide/SuperColliderIDE.desktop 2017-10-31 18:26:58.520164204 +0300
+@@ -5,6 +5,5 @@
+ Icon=sc_ide
+ Type=Application
+ Terminal=false
+-Patterns=*.scd;*.sc;*.schelp
+-Categories=Application;Multimedia;Audio;AudioVideo
++Categories=X-Multimedia;Audio;AudioVideo
+ MimeType=text/x-sc;
diff --git a/media-sound/supercollider/supercollider-3.8.0.ebuild b/media-sound/supercollider/supercollider-3.8.0-r1.ebuild
similarity index 98%
rename from media-sound/supercollider/supercollider-3.8.0.ebuild
rename to media-sound/supercollider/supercollider-3.8.0-r1.ebuild
index 0c0e190926b..d5199f592ce 100644
--- a/media-sound/supercollider/supercollider-3.8.0.ebuild
+++ b/media-sound/supercollider/supercollider-3.8.0-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}"/${P}-no-qtpositioning.patch
"${FILESDIR}"/${P}-multilib.patch
"${FILESDIR}"/${P}-gcc-7.patch
+ "${FILESDIR}"/${P}-desktop.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-04-25 21:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-25 21:30 [gentoo-commits] repo/gentoo:master commit in: media-sound/supercollider/, media-sound/supercollider/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-12-17 16:13 Sam James
2020-06-22 20:25 Andreas Sturmlechner
2020-06-22 20:25 Andreas Sturmlechner
2018-07-11 19:10 Andreas Sturmlechner
2018-01-06 2:14 Andreas Sturmlechner
2018-01-06 2:14 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox