From 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:49:31 +0100 Subject: Revert "gentoo resync : 13.09.2019" This reverts commit a1392efe64137262023d92492396ca9156d22396. --- media-sound/supercollider/Manifest | 5 + .../files/supercollider-3.8.0-no-opengl.patch | 45 ++++++++ .../supercollider-3.8.0-no-qtpositioning.patch | 40 ++++++++ .../files/supercollider-3.8.0-no-qtsensors.patch | 55 ++++++++++ .../supercollider/supercollider-3.9.3-r1.ebuild | 114 +++++++++++++++++++++ 5 files changed, 259 insertions(+) create mode 100644 media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch create mode 100644 media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch create mode 100644 media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch create mode 100644 media-sound/supercollider/supercollider-3.9.3-r1.ebuild (limited to 'media-sound/supercollider') diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest index 39cfe9c58e1d..64e8c327c66d 100644 --- a/media-sound/supercollider/Manifest +++ b/media-sound/supercollider/Manifest @@ -2,6 +2,11 @@ AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcd AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f11045d3f224c29a3bdfd39d5377101d2a1bb501f8a648307b0546daadea3d46213d6847098a1128101b1bd990c6ffe203aac6bdd6fc SHA512 0a999fbd53de6c7c2fb81451c6a1f4ce909220a257eefccce1d2246238637d661757795dfc4be7dd69c0553bdf1a02db9311da6033fe7b17230800d06fd291b4 AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae +AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2 +AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635 +AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46 +DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841 EBUILD supercollider-3.10.2.ebuild 3055 BLAKE2B 3569094c88762fde957ff9c979f3d6bb777b859a0f4bbb4c7a893b14acae31b32bd5a319867407488fde390c00261591bded8143ead4835866e7b64dd2599eb8 SHA512 01e2f6979578cba5736c415594e805ce36db7c797b02fe22932ad7320a11fc7242fda2b87c09021797517a20b0f8353e4b6cea877b4f8990c603f45bc8d85277 +EBUILD supercollider-3.9.3-r1.ebuild 2836 BLAKE2B 164dd68cf7178fca42bb1a650ddee93dc9ff90db43f4f4c95a09530ac02305c176a450430fa956d094a6368e6e0e81ab1d379cf10ea6e801a9e762edc61fb9c8 SHA512 25ca2d3f3a14fc11db4cb6626bbdaa43ded4e1ee2bf2a616e3c83cf34e171eff22ce831ca6d4087477140fcb92a3f2283a1dff6374a5d2d4a65226e3da23060f MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895 diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch new file mode 100644 index 000000000000..15e19d8dee60 --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch @@ -0,0 +1,45 @@ +diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt +index 64f275b..f88c4a7 100644 +--- a/QtCollider/CMakeLists.txt ++++ b/QtCollider/CMakeLists.txt +@@ -8,17 +8,16 @@ find_package(Qt5Network) + find_package(Qt5WebKit) + find_package(Qt5WebKitWidgets) + find_package(Qt5PrintSupport) +-find_package(Qt5OpenGL) + find_package(Qt5Sensors) + find_package(Qt5Quick) + find_package(Qt5Qml) + find_package(Qt5Sql) + find_package(Qt5Positioning) +-mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5OpenGL_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) ++mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) + + set (QT_COLLIDER_LIBS + Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport +- Qt5::OpenGL Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning ++ Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning + ${MATH_LIBRARY}) + + if (APPLE) +diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +index f2347de..860d254 100644 +--- a/editors/sc-ide/CMakeLists.txt ++++ b/editors/sc-ide/CMakeLists.txt +@@ -7,7 +7,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + find_package(Qt5Core) + find_package(Qt5Concurrent) + find_package(Qt5LinguistTools) +-find_package(Qt5OpenGL) + find_package(Qt5Positioning) + find_package(Qt5PrintSupport) + find_package(Qt5Qml) +@@ -18,7 +17,7 @@ find_package(Qt5WebKitWidgets) + find_package(Qt5Widgets) + + set(QT_IDE_LIBRARIES +- Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::OpenGL Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) ++ Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) + + if(${CMAKE_COMPILER_IS_GNUCXX}) + add_definitions(-Wreorder) diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch new file mode 100644 index 000000000000..ee4bf52d010b --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch @@ -0,0 +1,40 @@ +diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt +index 903d5a0..007b4f4 100644 +--- a/QtCollider/CMakeLists.txt ++++ b/QtCollider/CMakeLists.txt +@@ -11,12 +11,11 @@ find_package(Qt5PrintSupport) + find_package(Qt5Quick) + find_package(Qt5Qml) + find_package(Qt5Sql) +-find_package(Qt5Positioning) +-mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) ++mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) + + set (QT_COLLIDER_LIBS + Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport +- Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning ++ Qt5::Quick Qt5::Qml Qt5::Sql + ${MATH_LIBRARY}) + + if (APPLE) +diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +index dbe2ad7..cdbb11e 100644 +--- a/editors/sc-ide/CMakeLists.txt ++++ b/editors/sc-ide/CMakeLists.txt +@@ -7,7 +7,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + find_package(Qt5Core) + find_package(Qt5Concurrent) + find_package(Qt5LinguistTools) +-find_package(Qt5Positioning) + find_package(Qt5PrintSupport) + find_package(Qt5Qml) + find_package(Qt5Quick) +@@ -16,7 +15,7 @@ find_package(Qt5WebKitWidgets) + find_package(Qt5Widgets) + + set(QT_IDE_LIBRARIES +- Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) ++ Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql) + + if(${CMAKE_COMPILER_IS_GNUCXX}) + add_definitions(-Wreorder) diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch new file mode 100644 index 000000000000..b9099b971eee --- /dev/null +++ b/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch @@ -0,0 +1,55 @@ +diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt +index f88c4a7..903d5a0 100644 +--- a/QtCollider/CMakeLists.txt ++++ b/QtCollider/CMakeLists.txt +@@ -8,16 +8,15 @@ find_package(Qt5Network) + find_package(Qt5WebKit) + find_package(Qt5WebKitWidgets) + find_package(Qt5PrintSupport) +-find_package(Qt5Sensors) + find_package(Qt5Quick) + find_package(Qt5Qml) + find_package(Qt5Sql) + find_package(Qt5Positioning) +-mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) ++mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR) + + set (QT_COLLIDER_LIBS + Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport +- Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning ++ Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning + ${MATH_LIBRARY}) + + if (APPLE) +diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +index 860d254..dbe2ad7 100644 +--- a/editors/sc-ide/CMakeLists.txt ++++ b/editors/sc-ide/CMakeLists.txt +@@ -11,13 +11,12 @@ find_package(Qt5Positioning) + find_package(Qt5PrintSupport) + find_package(Qt5Qml) + find_package(Qt5Quick) +-find_package(Qt5Sensors) + find_package(Qt5Sql) + find_package(Qt5WebKitWidgets) + find_package(Qt5Widgets) + + set(QT_IDE_LIBRARIES +- Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) ++ Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning) + + if(${CMAKE_COMPILER_IS_GNUCXX}) + add_definitions(-Wreorder) +diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt +index fe52223..427c587 100644 +--- a/lang/CMakeLists.txt ++++ b/lang/CMakeLists.txt +@@ -389,7 +389,7 @@ elseif(WIN32) + SET(QT_PLUGINS_DIR "${QT_BIN_PATH}/../plugins" CACHE PATH "Location of qt plugins for windows") + endif() + +- foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sensors_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS}) ++ foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS}) + get_target_property(_loc ${plugin} LOCATION) + get_filename_component(_parent_dir ${_loc} DIRECTORY) + get_filename_component(_name_we ${_loc} NAME_WE) diff --git a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild new file mode 100644 index 000000000000..637cfe5bced5 --- /dev/null +++ b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2018 Gentoo Authors +# 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="~amd64 ~x86" +IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim zeroconf" +RESTRICT="mirror" + +RDEPEND=" + media-libs/alsa-lib + sys-libs/readline:0= + x11-libs/libX11 + x11-libs/libXt + 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/qtsql:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + ) + server? ( !app-admin/supernova ) + sndfile? ( media-libs/libsndfile ) + zeroconf? ( net-dns/avahi ) +" +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 !zeroconf) + -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 +} -- cgit v1.2.3