diff options
Diffstat (limited to 'media-sound')
27 files changed, 471 insertions, 825 deletions
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest index 60852ee3042..860d635faf9 100644 --- a/media-sound/csound/Manifest +++ b/media-sound/csound/Manifest @@ -1,5 +1,3 @@ -DIST Csound5.19.01.tar.gz 9302526 SHA256 c918fbdfa7a65cefd080966ba4b44aadb2e36f80c83a5714efb5a9c76532111d SHA512 8dd0c8984a75fe74e5aea53abf15276fdb526ce34ff48402ad2cfd2953b65a67a52f3a279cd030964cddd2322711df04638e039e2998022d92c56593450d3c8c WHIRLPOOL 86ff2a5aea5ec2a65153a5582352a292815e95059d9c48360ea16b8a1bca6d22ec4693cd744b4335df1fcf720a8b006598cd9c1ed8ff54d93af6fe37c8165be6 DIST Csound6.02.tar.gz 23459796 SHA256 b964199642b1141d4e3253a86996c613c2420c4e2cc39cad347ad7115768c0a5 SHA512 885911561768fe4f9761b442899ba3481d09d02f095aaeb14d076a4902482269274e394517423bf8fea68c2f9e76bd3faaebe328d878ccc0a4c4a8d2d95d1dc0 WHIRLPOOL 9ee8e51c3ce224717b3b3f0cca249d2b10052defc9749abb359b862325766117ec887e07c00a1287b7d0915849c018ee7c3985bd147d4517f466b69f7e4cbdd8 -DIST Csound6.03.2.tar.gz 24571513 SHA256 f5f8364e0bc10aba473800e66176c08ac32b43ca69ad02dc9554bad54e91d170 SHA512 01cea31349632ecf3692a23535793c1cd622669e07a9035e1ee80d6ad117e8d0296d2ece78635fee8a73eb5ba53d2b03a8b895f0b2a9a74ae015288243445c1b WHIRLPOOL 029c9c68f20ce691b1bb50be38f12723e4cdcbdc757f12d12351b6f6b7b2ec7fda517d2677bfa8a746f41daaa8e7c61e652645c3677af9198caf0d555d9d0821 DIST Csound6.04.tar.gz 23959744 SHA256 0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 SHA512 b19e2c4173c6d964b073ef19221f285e9ebd5a5d5d93148687b06860091bcc6e97e6b5e2223687e8f498608d9e27a33a75a50bb9d81ba83f4cd34e2eb4ceaeac WHIRLPOOL 5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768faaaaf7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd DIST csound-6.05.0.tar.gz 32094544 SHA256 2384cbc82fe37b70192c87977b52c55b336731ecbfd3be1d8d30c7223815d7b9 SHA512 a30a818e6e03b8ede0384c0bfddbde62ec9d9f1cfc33b92d6b23780c0d87a0c4e25229f9707eb2a5081971d0e53ff00c1e3465fd2af706a1c3bf2b53bc312be1 WHIRLPOOL f2e10297dbb337957dcd595b32df1a3279a504076fb113c0907374ff5ac88510e9df856c69fbef402681012adc1e36b7a03b1bf757014387b883b225d1da962f diff --git a/media-sound/csound/csound-5.19.01.ebuild b/media-sound/csound/csound-5.19.01.ebuild deleted file mode 100644 index 4b19c0256fe..00000000000 --- a/media-sound/csound/csound-5.19.01.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1 - -MY_PN="${PN/c/C}" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance" -HOMEPAGE="http://csounds.com/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth -+image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio -python samples static-libs stk tcl test +threads +utils vim-syntax" - -LANGS=" de en_GB en_US es_CO fr it ro ru" -IUSE+="${LANGS// / linguas_}" - -RDEPEND=">=media-libs/libsndfile-1.0.16 - alsa? ( media-libs/alsa-lib ) - csoundac? ( - x11-libs/fltk:1[threads?] - dev-cpp/eigen:3 - dev-libs/boost - ${PYTHON_DEPS} - ) - dssi? ( - media-libs/dssi - media-libs/ladspa-sdk - ) - fluidsynth? ( media-sound/fluidsynth ) - fltk? ( x11-libs/fltk:1[threads?] ) - image? ( media-libs/libpng:0= ) - jack? ( media-sound/jack-audio-connection-kit ) - java? ( >=virtual/jdk-1.5 ) - keyboard? ( x11-libs/fltk:1[threads?] ) - linear? ( sci-mathematics/gmm ) - lua? ( - luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua:0 ) - ) - osc? ( media-libs/liblo ) - portaudio? ( media-libs/portaudio ) - portmidi? ( media-libs/portmidi ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( ${PYTHON_DEPS} ) - stk? ( media-libs/stk ) - tcl? ( - >=dev-lang/tcl-8.5:0= - >=dev-lang/tk-8.5:0= - ) - utils? ( !media-sound/snd )" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc - chua? ( dev-libs/boost ) - csoundac? ( dev-lang/swig ) - nls? ( sys-devel/gettext ) - test? ( ${PYTHON_DEPS} )" - -REQUIRED_USE="java? ( cxx ) - linear? ( double-precision ) - lua? ( cxx ) - python? ( cxx )" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -pkg_setup() { - if use python || use test ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch - epatch "${FILESDIR}"/${PN}-5.17.6-fltk.patch - epatch "${FILESDIR}"/${PN}-5.17.6-porttime-in-portmidi.patch - epatch "${FILESDIR}"/${PN}-5.17.11-cmake.patch - epatch "${FILESDIR}"/${PN}-5.17.11-no-fltk-gl.patch - - sed -i "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \ - tests/test.py || die - - sed -i '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' CMakeLists.txt || die - - if [[ $(get_libdir) == "lib64" ]] ; then - sed -i '/set(LIBRARY_INSTALL_DIR/s/lib/lib64/' CMakeLists.txt || die - fi - - if use python ; then - sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die - fi -} - -src_configure() { - local myconf - - if use csoundac ; then - myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)" - myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)" - fi - - local mycmakeargs=( - -DBUILD_NEW_PARSER=ON - $(cmake-utils_use_use alsa ALSA) \ - $(cmake-utils_use_build beats CSBEATS) \ - $(cmake-utils_use_build chua CHUA_OPCODES) \ - $(cmake-utils_use_build csoundac CSOUND_AC) \ - $(cmake-utils_use_build cxx CXX_INTERFACE) \ - $(cmake-utils_use debug NEW_PARSER_DEBUG) \ - $(cmake-utils_use_use double-precision DOUBLE) \ - $(cmake-utils_use_build dssi DSSI_OPCODES) \ - $(cmake-utils_use_build fluidsynth FLUID_OPCODES) \ - $(cmake-utils_use_use fltk FLTK) \ - $(cmake-utils_use_build image IMAGE_OPCODES) \ - $(cmake-utils_use_use jack JACK) \ - $(cmake-utils_use_build jack JACK_OPCODES) \ - $(cmake-utils_use_build java JAVA_INTERFACE) \ - $(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD) \ - $(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES) \ - $(cmake-utils_use_build lua LUA_OPCODES) \ - $(cmake-utils_use_build lua LUA_INTERFACE) \ - $(cmake-utils_use_use nls GETTEXT) \ - $(cmake-utils_use_build osc OSC_OPCODES) \ - $(cmake-utils_use_use openmp OPEN_MP) \ - $(cmake-utils_use_use portaudio PORTAUDIO) \ - $(cmake-utils_use_use portmidi PORTMIDI) \ - $(cmake-utils_use_use pulseaudio PULSEAUDIO) \ - $(cmake-utils_use_build python PYTHON_OPCODES) \ - $(cmake-utils_use_build python PYTHON_INTERFACE) \ - $(cmake-utils_use_build static-libs STATIC_LIBRARY) \ - $(cmake-utils_use_build stk STK_OPCODES) \ - $(cmake-utils_use_build tcl TCLCSOUND) \ - $(cmake-utils_use_build threads MULTI_CORE) \ - $(cmake-utils_use_build utils UTILITIES) \ - ${myconf} - ) - - cmake-utils_src_configure -} - -src_test() { - export LD_LIBRARY_PATH="${S}" OPCODEDIR="${S}" OPCODEDIR64="${S}" - cd tests - ./test.py || die "tests failed" -} - -src_install() { - cmake-utils_src_install - - dodoc AUTHORS ChangeLog readme-csound5-complete.txt - - # Generate env.d file - if use double-precision ; then - echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN} - else - echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN} - fi - echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN} - use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN} - doenvd "${T}"/62${PN} - - if use examples ; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - use samples && dodoc -r samples - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins installer/misc/vim/csound_{csd,orc,sco}.vim - insinto /usr/share/vim/vimfiles/plugin - doins installer/misc/vim/csound.vim - fi - - # rename extract to csound_extract (bug #247394) - mv "${ED}"/usr/bin/{extract,csound_extract} || die - - use python && python_optimize -} - -pkg_postinst() { - elog - elog "The extract tool is now installed as csound_extract" - elog "due to collisions with many other packages (bug #247394)." - elog -} diff --git a/media-sound/csound/csound-6.03.2.ebuild b/media-sound/csound/csound-6.03.2.ebuild deleted file mode 100644 index f873d90f24a..00000000000 --- a/media-sound/csound/csound-6.03.2.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1 - -MY_PN="${PN/c/C}" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance" -HOMEPAGE="http://csounds.com/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples fltk +fluidsynth -+image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio -python samples score static-libs stk tcl test +threads +utils vim-syntax" - -LANGS=" de en_US es_CO fr it ro ru" -IUSE+="${LANGS// / linguas_}" - -RDEPEND=" - >=media-libs/libsndfile-1.0.16 - alsa? ( media-libs/alsa-lib ) - csoundac? ( - x11-libs/fltk:1[threads?] - dev-cpp/eigen:3 - dev-libs/boost - ${PYTHON_DEPS} - ) - curl? ( net-misc/curl ) - dssi? ( - media-libs/dssi - media-libs/ladspa-sdk - ) - fluidsynth? ( media-sound/fluidsynth ) - fltk? ( x11-libs/fltk:1[threads?] ) - image? ( media-libs/libpng:0= ) - jack? ( media-sound/jack-audio-connection-kit ) - java? ( >=virtual/jdk-1.5 ) - keyboard? ( x11-libs/fltk:1[threads?] ) - linear? ( sci-mathematics/gmm ) - lua? ( - luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua:0 ) - ) - osc? ( media-libs/liblo ) - portaudio? ( media-libs/portaudio ) - portmidi? ( media-libs/portmidi ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( ${PYTHON_DEPS} ) - stk? ( media-libs/stk ) - tcl? ( - >=dev-lang/tcl-8.5:0= - >=dev-lang/tk-8.5:0= - ) - utils? ( !media-sound/snd ) -" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc - chua? ( dev-libs/boost ) - csoundac? ( dev-lang/swig ) - nls? ( sys-devel/gettext ) - test? ( - dev-util/cunit - ${PYTHON_DEPS} - ) -" -REQUIRED_USE=" - java? ( cxx ) - linear? ( double-precision ) - lua? ( cxx ) - python? ( cxx ) -" - -# requires specific alsa settings -RESTRICT="test" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -pkg_setup() { - if use python || use test ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-6.02-porttime-in-portmidi.patch - - sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \ - -e '/-O3/d' \ - -i CMakeLists.txt || die - - if use python ; then - sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die - fi - - for lang in ${LANGS} ; do - if ! use linguas_${lang} ; then - sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die - fi - done -} - -src_configure() { - local myconf - - if use csoundac ; then - myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)" - myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)" - fi - - [[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON" - - local mycmakeargs=( - $(cmake-utils_use_use alsa ALSA) - $(cmake-utils_use_build beats CSBEATS) - $(cmake-utils_use_build chua CHUA_OPCODES) - $(cmake-utils_use_build csoundac CSOUND_AC) - $(cmake-utils_use_build cxx CXX_INTERFACE) - $(cmake-utils_use_use curl CURL) - $(cmake-utils_use debug NEW_PARSER_DEBUG) - $(cmake-utils_use_use double-precision DOUBLE) - $(cmake-utils_use_build dssi DSSI_OPCODES) - $(cmake-utils_use_build fluidsynth FLUID_OPCODES) - $(cmake-utils_use_use fltk FLTK) - $(cmake-utils_use_build image IMAGE_OPCODES) - $(cmake-utils_use_use jack JACK) - $(cmake-utils_use_build jack JACK_OPCODES) - $(cmake-utils_use_build java JAVA_INTERFACE) - $(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD) - $(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES) - $(cmake-utils_use_build lua LUA_OPCODES) - $(cmake-utils_use_build lua LUA_INTERFACE) - $(cmake-utils_use_use nls GETTEXT) - $(cmake-utils_use_build osc OSC_OPCODES) - $(cmake-utils_use_use openmp OPEN_MP) - $(cmake-utils_use_use portaudio PORTAUDIO) - $(cmake-utils_use_use portmidi PORTMIDI) - $(cmake-utils_use_use pulseaudio PULSEAUDIO) - $(cmake-utils_use_build python PYTHON_OPCODES) - $(cmake-utils_use_build python PYTHON_INTERFACE) - $(cmake-utils_use score SCORE_PARSER) - $(cmake-utils_use_build static-libs STATIC_LIBRARY) - $(cmake-utils_use_build stk STK_OPCODES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build test STATIC_LIBRARY) - $(cmake-utils_use_build tcl TCLCSOUND) - $(cmake-utils_use_build threads MULTI_CORE) - $(cmake-utils_use_build utils UTILITIES) - -DBUILD_RELEASE=ON - ${myconf} - ) - - cmake-utils_src_configure -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - dodoc AUTHORS ChangeLog README.md Release_Notes/* - - # Generate env.d file - if use double-precision ; then - echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN} - else - echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN} - fi - echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN} - use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN} - doenvd "${T}"/62${PN} - - if use examples ; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - use samples && dodoc -r samples - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins installer/misc/vim/csound_{csd,orc,sco}.vim - insinto /usr/share/vim/vimfiles/plugin - doins installer/misc/vim/csound.vim - fi - - # rename extract to csound_extract (bug #247394) - mv "${ED}"/usr/bin/{extract,csound_extract} || die - - use python && python_optimize -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog - elog "The extract tool is now installed as csound_extract" - elog "due to collisions with many other packages (bug #247394)." - elog - fi -} diff --git a/media-sound/csound/csound-6.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild index 02e99b959cc..186991fccdf 100644 --- a/media-sound/csound/csound-6.05.0.ebuild +++ b/media-sound/csound/csound-6.05.0.ebuild @@ -38,7 +38,7 @@ RDEPEND=" fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) - java? ( >=virtual/jdk-1.5 ) + java? ( virtual/jdk ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( @@ -94,6 +94,9 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/csound-6.05-python.patch + # bug #566064 + epatch "${FILESDIR}"/csound-6.05-underlinking.patch + sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \ -e '/-O3/d' \ -i CMakeLists.txt || die diff --git a/media-sound/csound/files/csound-5.16.6-tests.patch b/media-sound/csound/files/csound-5.16.6-tests.patch deleted file mode 100644 index dd8b8ed289b..00000000000 --- a/media-sound/csound/files/csound-5.16.6-tests.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- Csound5.16.6/tests/test.py.orig -+++ Csound5.16.6/tests/test.py -@@ -6,9 +6,6 @@ - import os - import sys - --from testUI import TestApplication --from Tkinter import * -- - parserType = "--new-parser" - showUIatClose = False - csoundExecutable = "" -@@ -104,8 +101,6 @@ - ] - - -- output = "" -- tempfile = "/tmp/csound_test_output.txt" - counter = 1 - - retVals = [] -@@ -124,7 +119,7 @@ - retVal = os.system(command) - else: - executable = (csoundExecutable == "") and "../csound" or csoundExecutable -- command = "%s %s %s %s &> %s"%(executable, parserType, runArgs, filename, tempfile) -+ command = "%s %s %s %s"%(executable, parserType, runArgs, filename) - retVal = os.system(command) - - print "Test %i: %s (%s)\nReturn Code: %i"%(counter, desc, filename, retVal) -@@ -136,24 +131,6 @@ - testFail += 1 - print "Result: FAIL\n" - -- output += "%s\n"%("=" * 80) -- output += "Test %i: %s (%s)\nReturn Code: %i\n"%(counter, desc, filename, retVal) -- output += "%s\n\n"%("=" * 80) -- -- f = open(tempfile, "r") -- -- csOutput = "" -- -- for line in f: -- csOutput += line -- -- output += csOutput -- -- f.close() -- -- retVals.append(t + [retVal, csOutput]) -- -- output += "\n\n" - counter += 1 - - # print output -@@ -162,12 +139,7 @@ - print "Tests Passed: %i\nTests Failed: %i\n"%(testPass, testFail) - - -- f = open("results.txt", "w") -- f.write(output) -- f.flush() -- f.close() -- -- return retVals -+ return testFail - - if __name__ == "__main__": - if(len(sys.argv) > 1): -@@ -176,6 +148,8 @@ - showHelp() - sys.exit(0) - elif arg == "--show-ui": -+ from testUI import TestApplication -+ from Tkinter import * - showUIatClose = True - elif arg == "--old-parser": - parserType = "--old-parser" -@@ -185,6 +159,8 @@ - elif arg.startswith("--opcodedir64="): - os.environ['OPCODEDIR64'] = arg[14:] - print os.environ['OPCODEDIR64'] -- results = runTest() -- if (showUIatClose): -- showUI(results) -+ failures = runTest() -+ if failures > 0: -+ sys.exit(1) -+ else: -+ sys.exit(0) diff --git a/media-sound/csound/files/csound-5.17.11-cmake.patch b/media-sound/csound/files/csound-5.17.11-cmake.patch deleted file mode 100644 index 388a043d57c..00000000000 --- a/media-sound/csound/files/csound-5.17.11-cmake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt -+++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt -@@ -29,7 +29,6 @@ - allegrowr.cpp
- Cell.cpp
- ChordLindenmayer.cpp
-- cmake_install.cmake
- Composition.cpp
- Conversions.cpp
- Counterpoint.cpp
diff --git a/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch deleted file mode 100644 index ae07d41a63e..00000000000 --- a/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt -+++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt -@@ -7,6 +7,7 @@ -
- find_package(Boost)
- find_library(MUSICXML_LIBRARY musicxml2)
-+set(FLTK_SKIP_OPENGL true)
- find_package(FLTK)
- find_package(SWIG)
- find_package(PythonLibs)
---- Csound5.17.11/InOut/CMakeLists.txt -+++ Csound5.17.11/InOut/CMakeLists.txt -@@ -56,6 +56,7 @@ - find_library(COREAUDIO_LIBRARY CoreAudio)
- endif()
- if(USE_FLTK OR BUILD_VIRTUAL_KEYBOARD)
-+ set(FLTK_SKIP_OPENGL true)
- find_package(FLTK)
- endif()
-
diff --git a/media-sound/csound/files/csound-5.17.6-fltk.patch b/media-sound/csound/files/csound-5.17.6-fltk.patch deleted file mode 100644 index 74b72689e88..00000000000 --- a/media-sound/csound/files/csound-5.17.6-fltk.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Csound5.17.6/InOut/CMakeLists.txt -+++ Csound5.17.6/InOut/CMakeLists.txt -@@ -148,6 +148,7 @@ - if(USE_FLTK)
- set(widgets_SRCS FL_graph.cpp winFLTK.c widgets.cpp)
- make_plugin(widgets "${widgets_SRCS}" "${FLTK_LIBRARIES}")
-+ include_directories(${FLTK_INCLUDE_DIR})
- endif()
-
- check_deps(BUILD_VIRTUAL_KEYBOARD FLTK_FOUND)
diff --git a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch deleted file mode 100644 index 3f69a3795f0..00000000000 --- a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Csound5.17.6/InOut/CMakeLists.txt -+++ Csound5.17.6/InOut/CMakeLists.txt -@@ -26,7 +26,6 @@ - endif()
- if(USE_PORTMIDI)
- find_library(PORTMIDI_LIBRARY portmidi)
-- find_library(PORTTIME_LIBRARY porttime)
- check_include_file(portmidi.h PORTMIDI_HEADER)
- endif()
- if(USE_JACK)
-@@ -116,9 +115,6 @@ - check_deps(USE_PORTMIDI PORTMIDI_HEADER PORTMIDI_LIBRARY)
- if(USE_PORTMIDI)
- set(pmidi_LIBS ${PORTMIDI_LIBRARY})
-- if(NOT APPLE)
-- list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})
-- endif()
- if(WIN32)
- list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})
- endif()
diff --git a/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch b/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch deleted file mode 100644 index 1ef67a15c13..00000000000 --- a/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Csound6.02/InOut/CMakeLists.txt -+++ Csound6.02/InOut/CMakeLists.txt -@@ -33,10 +33,6 @@ - find_library(PORTMIDI_LIBRARY portmidi)
- # include_directories(${PORTMIDI_INCLUDE_PATH})
- # include_directories(${PORTTIME_INCLUDE_PATH})
-- if(WIN32)
-- else()
-- find_library(PORTTIME_LIBRARY porttime)
-- endif()
- endif()
- if(USE_JACK)
- find_library(JACK_LIBRARY jack)
-@@ -126,15 +122,12 @@ - elseif(WIN32)
- check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTTIME_INCLUDE_PATH PORTMIDI_LIBRARY)
- else()
-- check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY PORTTIME_LIBRARY)
-+ check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY)
- endif()
-
- if(USE_PORTMIDI)
- set(pmidi_LIBS ${PORTMIDI_LIBRARY})
- include_directories(${PORTMIDI_INCLUDE_PATH})
-- if(LINUX)
-- list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})
-- endif()
- if(WIN32)
- include_directories(${PORTTIME_INCLUDE_PATH})
- list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})
diff --git a/media-sound/csound/files/csound-6.05-underlinking.patch b/media-sound/csound/files/csound-6.05-underlinking.patch new file mode 100644 index 00000000000..eac83f21419 --- /dev/null +++ b/media-sound/csound/files/csound-6.05-underlinking.patch @@ -0,0 +1,53 @@ +commit a4b1930b506274e328ee26cd6287965cb496062b +Author: Steven Yi <stevenyi@gmail.com> +Date: Mon Sep 28 18:21:22 2015 -0400 + + modified make_utility and targets for csound-bin and mixer-bin to use add libm for linking when on Linux [fixes #526] + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2b16079..18a6ad1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,6 +97,10 @@ endfunction(make_executable) + function(make_utility name srcs) + make_executable(${name} "${srcs}" "${CSOUNDLIB}") + add_dependencies(${name} ${CSOUNDLIB}) ++ ++ if(LINUX) ++ target_link_libraries(${name} m) ++ endif() + endfunction() + + +diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt +index d0e3a21..b31f37a 100644 +--- a/frontends/CMakeLists.txt ++++ b/frontends/CMakeLists.txt +@@ -43,6 +43,9 @@ endfunction(make_plugin_frontend) + + # We need a different name to avoid clashes with float libcsound + make_executable(csound-bin "${CS_MAIN_SRCS}" "${CSOUNDLIB}" csound) ++if(LINUX) ++ target_link_libraries(csound-bin m) ++endif() + + message(STATUS "Building csLadspa") + +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 25089cc..ebf0aa5 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -23,9 +23,11 @@ if(BUILD_UTILITIES) + make_utility(hetro het_main.c)
+ make_utility(lpanal lpc_main.c)
+ make_utility(lpc_export lpcx_main.c)
+- target_link_libraries(lpc_export m)
+ make_utility(lpc_import lpci_main.c)
+- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer)
++ if(LINUX)
++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer)
++ endif()
++ target_link_libraries(mixer-bin m)
+ make_utility(pvanal pvc_main.c)
+ make_utility(pvlook pvl_main.c)
+ make_utility(pv_export pvx_main.c)
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest index e347c209b51..15bc2757c3c 100644 --- a/media-sound/flacon/Manifest +++ b/media-sound/flacon/Manifest @@ -1,4 +1,2 @@ -DIST flacon-0.7.2.tgz 238604 SHA256 b10cfe6d7f99c3b64082edc5bf926c1759714719ef5ec99065f92df4c7da87ac SHA512 2393765d39a6cdb711a7ad27b644866d58f633b692db268b9a7b7a46be10e80c3aa4fbea2ddbeba45a6dbeddd0fd6893f753d7725534e8906bd752426530322b WHIRLPOOL ef5f28563a9871525e72815e1c3e9b28212cedc874a9329edd72180446a790517e412043f189f439106b38c79923714e118cd185475a9540ef49dc5b5d373716 -DIST flacon-0.8.0.tgz 272910 SHA256 d2889b364ea49b19c400ce8081d829e5a37149dfdcb82d55f6ab453b679d1f85 SHA512 58b2cd57266533ae3bdd524d18c279171c3092665e20332a16c421d6931492deb6d201e2b3f818ecda7e2d50fdbe7170597b12922aa9cbe07cc24dc7b6d4d0d1 WHIRLPOOL e515de827886d95c6e67c8549ef4ec3ec6700d6d7cc9f06d9e568d79274942d37e0153b88391bedfda7d5b28fc3231ceb59a7faecd0830a01468d61c1cd5197f -DIST flacon-0.9.4.tar.gz 242933 SHA256 ef97a89897f95112d623c37f64a2c42a58f3527d66a4c322637d721ff2675e64 SHA512 3ea923fe68bcecd505f75ef25f6117209489ed57321c06bd5370bcd6c2919d709ce18d2ecbd1f6e1834f003f80f38665e522960bd7114d7c0c011296aec9e996 WHIRLPOOL efc4863b1c0f3ee1e46a60cbae3f922ca155d6d578e27f8eb4a5db6137f9b19b1ffbad0fdbda796ac1eb5c1970e7343b5c75dee7130681bad8b5946bdca20703 DIST flacon-1.0.0.tar.gz 249473 SHA256 60487a85e828a08afbaf2fe5f7228a94e1f4094606456f73d59ae351f75e1284 SHA512 2336ec0b0bc7cdaa3792f64adb88a7fd62e7b6f4c84b6cc465e6f6546ca5cae21929de87aa3ab4c7b12754d3480cc66f412f25969707765798ecbb8aea78b7db WHIRLPOOL 50c6b2737de9d82616377048a8fee0b0feec97ae337562d53ecaa2476b417d98327c481ea162d8970615becc6b75754e8cf195fd56285b34414df1d85ba37013 +DIST flacon-1.2.0.tar.gz 283187 SHA256 2ebc83d733ea6d50f2bd4ad8c20c65368be5eaf351e0195c9b4d47a54957b8f8 SHA512 4cc64467350c941eed16299a562ddc3c6c83d785dddffe6825e3df50a988ce9494517b3ea862d90398110564ec3f828ef6760a6c02d24163f9247930330a3b6d WHIRLPOOL 918926069daaf5e9a16711d641c873a70d1dc97f04b05387f649f1d1d6e1d652f3e676f1100d5fe0d70d03fa9edb1d4e64fc67b489f5c5e74d21108a437f87ea diff --git a/media-sound/flacon/files/flacon-1.2.0-fix-corrupt-file-crash.patch b/media-sound/flacon/files/flacon-1.2.0-fix-corrupt-file-crash.patch new file mode 100644 index 00000000000..11a4f1307a1 --- /dev/null +++ b/media-sound/flacon/files/flacon-1.2.0-fix-corrupt-file-crash.patch @@ -0,0 +1,22 @@ +From 01bf112e4bfd0718829b7dc6f83de6fbceb3ac0c Mon Sep 17 00:00:00 2001 +From: "sokoloff (Alexander)" <sokoloff.a@gmail.com> +Date: Fri, 18 Sep 2015 20:15:16 +0300 +Subject: [PATCH] Fix crash if audio file is corrupt + +--- + disk.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/disk.cpp b/disk.cpp +index 99c7dff..23d7ab2 100644 +--- a/disk.cpp ++++ b/disk.cpp +@@ -577,7 +577,7 @@ bool Disk::replaceAudioFile(const QString &fileName, bool force) + audio = 0; + } + +- if (force || audio->isValid()) ++ if (force || audio) + { + delete mAudioFile; + mAudioFile = audio; diff --git a/media-sound/flacon/files/flacon-1.2.0-fix-disks-or-tracks-number-change-crash.patch b/media-sound/flacon/files/flacon-1.2.0-fix-disks-or-tracks-number-change-crash.patch new file mode 100644 index 00000000000..1e9a3369671 --- /dev/null +++ b/media-sound/flacon/files/flacon-1.2.0-fix-disks-or-tracks-number-change-crash.patch @@ -0,0 +1,85 @@ +From bf2dc4aa42e91bda2d41e129f7fe6597b9f86673 Mon Sep 17 00:00:00 2001 +From: "sokoloff (Alexander)" <sokoloff.a@gmail.com> +Date: Sun, 27 Sep 2015 09:24:35 +0300 +Subject: [PATCH] Fix: the program sometimes crash when you change the number + of disks or tracks + +--- + disk.cpp | 3 +++ + project.cpp | 9 +++++---- + tests/testflacon.cpp | 6 +++--- + 3 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/disk.cpp b/disk.cpp +index 969cb71..3b624de 100644 +--- a/disk.cpp ++++ b/disk.cpp +@@ -433,6 +433,9 @@ void Disk::loadFromCue(const CueTagSet &cueTags, bool activate) + for (int i=mTracks.count(); i<mCount; ++i) + mTracks.append(new Track(this, i)); + ++ while (mTracks.count() > mCount) ++ mTracks.takeLast()->deleteLater(); ++ + for (int t=0; t<cueTags.tracksCount(); ++t) + { + for (int idx=0; idx<100; ++idx) +diff --git a/project.cpp b/project.cpp +index 00486e4..38710ae 100644 +--- a/project.cpp ++++ b/project.cpp +@@ -169,7 +169,8 @@ void Project::removeDisk(const QList<Disk*> *disks) + Disk *disk = disks->at(i); + emit beforeRemoveDisk(disk); + if (mDisks.removeAll(disk)) +- delete disk; ++ disk->deleteLater(); ++ + emit afterRemoveDisk(); + } + +@@ -274,10 +275,10 @@ DiskList Project::addCueFile(const QString &fileName, bool showErrors) + } + else + { +- foreach(Disk *d, res) ++ foreach(Disk *disk, res) + { +- mDisks.removeAll(d); +- delete d; ++ mDisks.removeAll(disk); ++ disk->deleteLater(); + } + + emit layoutChanged(); +diff --git a/tests/testflacon.cpp b/tests/testflacon.cpp +index bcd7c46..571b425 100644 +--- a/tests/testflacon.cpp ++++ b/tests/testflacon.cpp +@@ -830,7 +830,7 @@ void TestFlacon::testTrackResultFileName() + expected); + QFAIL(msg.toLocal8Bit()); + } +- delete disk; ++ disk->deleteLater(); + } + + +@@ -983,7 +983,7 @@ void TestFlacon::testTrackResultFilePath() + QFAIL(msg.toLocal8Bit()); + } + //QCOMPARE(result, expected); +- delete disk; ++ disk->deleteLater(); + } + + +@@ -1117,7 +1117,7 @@ void TestFlacon::testTrackSetCodepages() + QFAIL((msg + "\n " + cmd).toLocal8Bit()); + } + +- delete disk; ++ disk->deleteLater(); + } + + diff --git a/media-sound/flacon/files/flacon-1.2.0-fix-qpainter-error.patch b/media-sound/flacon/files/flacon-1.2.0-fix-qpainter-error.patch new file mode 100644 index 00000000000..cc7398730ed --- /dev/null +++ b/media-sound/flacon/files/flacon-1.2.0-fix-qpainter-error.patch @@ -0,0 +1,87 @@ +From 8ffd4d83e19e8f1e28841f37248e99fae0796b10 Mon Sep 17 00:00:00 2001 +From: "sokoloff (Alexander)" <sokoloff.a@gmail.com> +Date: Fri, 18 Sep 2015 20:14:31 +0300 +Subject: [PATCH] Fix QPainter::font: Painter not active error + +--- + gui/trackviewdelegate.cpp | 20 +++++++++----------- + gui/trackviewdelegate.h | 4 ++-- + 2 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/gui/trackviewdelegate.cpp b/gui/trackviewdelegate.cpp +index ab05833..02b6137 100644 +--- a/gui/trackviewdelegate.cpp ++++ b/gui/trackviewdelegate.cpp +@@ -261,8 +261,8 @@ void TrackViewDelegate::paintDisk(QPainter *painter, const QStyleOptionViewItem + //cache = self.cache(index) + painter->save(); + painter->setClipRect(option.rect); +- QFont titleFont = this->titleFont(painter); +- QFont filesFont = this->filesFont(painter); ++ QFont titleFont = this->titleFont(painter->font()); ++ QFont filesFont = this->filesFont(painter->font()); + + + int topPadding = index.row() ? TOP_PADDING : 0; +@@ -408,19 +408,17 @@ QSize TrackViewDelegate::sizeHint(const QStyleOptionViewItem &option, const QMod + + if (!index.parent().isValid()) + { +- + if (!mDiskHeightHint) + { + int h = 8; +- QPainter painter(mTrackView); +- QFont titleFont = this->titleFont(&painter); +- QFont filesFont = this->filesFont(&painter); ++ ++ QFont titleFont = this->titleFont(option.font); ++ QFont filesFont = this->filesFont(option.font); + h += QFontMetrics(titleFont).height(); + h += QFontMetrics(filesFont).height() * 2; + mDiskHeightHint = qMax(IMG_HEIGHT, h) + 2 * MARGIN + BOTTOM_PADDING; //For Line + } + +- + res.rheight() = mDiskHeightHint; + if (index.row()) + res.rheight() += TOP_PADDING; +@@ -533,9 +531,9 @@ void TrackViewDelegate::downloadingFinished(DataProvider *provider) + /************************************************ + + ************************************************/ +-QFont TrackViewDelegate::titleFont(const QPainter *painter) const ++QFont TrackViewDelegate::titleFont(const QFont &font) const + { +- QFont res = painter->font(); ++ QFont res = font; + res.setPointSize(res.pointSize() + 1); + res.setBold(true); + return res; +@@ -545,9 +543,9 @@ QFont TrackViewDelegate::titleFont(const QPainter *painter) const + /************************************************ + + ************************************************/ +-QFont TrackViewDelegate::filesFont(const QPainter *painter) const ++QFont TrackViewDelegate::filesFont(const QFont &font) const + { +- QFont res = painter->font(); ++ QFont res = font; + return res; + } + +diff --git a/gui/trackviewdelegate.h b/gui/trackviewdelegate.h +index 3a6aa09..492e514 100644 +--- a/gui/trackviewdelegate.h ++++ b/gui/trackviewdelegate.h +@@ -76,8 +76,8 @@ private slots: + QMovie mDownloadMovie; + mutable int mDiskHeightHint; + +- QFont titleFont(const QPainter *painter) const; +- QFont filesFont(const QPainter *painter) const; ++ QFont titleFont(const QFont &font) const; ++ QFont filesFont(const QFont &font) const; + void paintTrack(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const Track *track) const; + void paintDisk(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const Disk *disk) const; + QRect drawLabel(const QString &text, QRect rect, QPainter *painter) const; diff --git a/media-sound/flacon/flacon-0.7.2.ebuild b/media-sound/flacon/flacon-0.7.2.ebuild deleted file mode 100644 index cac14cd2da6..00000000000 --- a/media-sound/flacon/flacon-0.7.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -PYTHON_DEPEND="2" - -inherit python - -DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks" -HOMEPAGE="https://code.google.com/p/flacon/" -SRC_URI="https://flacon.googlecode.com/files/${P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack" - -RDEPEND=" - dev-python/PyQt4[X] - dev-python/chardet - media-sound/shntool[mac?] - flac? ( media-libs/flac ) - mac? ( media-sound/mac ) - mp3? ( media-sound/lame ) - mp4? ( media-libs/faac ) - ogg? ( media-sound/vorbis-tools ) - tta? ( media-sound/ttaenc ) - wavpack? ( media-sound/wavpack ) - replaygain? ( - mp3? ( media-sound/mp3gain ) - ogg? ( media-sound/vorbisgain ) - ) -" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - python_convert_shebangs -r 2 . - - sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die -} - -src_compile() { :; } - -pkg_postinst() { - python_mod_optimize /usr/share/${PN} -} - -pkg_postrm() { - python_mod_cleanup /usr/share/${PN} -} diff --git a/media-sound/flacon/flacon-0.8.0.ebuild b/media-sound/flacon/flacon-0.8.0.ebuild deleted file mode 100644 index 5eed23d4bf1..00000000000 --- a/media-sound/flacon/flacon-0.8.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -PLOCALES="cs_CZ es_MX fr gl it pl_PL pt_BR ro_RO ru si_LK uk zh_CN zh_TW" - -inherit python-single-r1 l10n - -DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks" -HOMEPAGE="https://code.google.com/p/flacon/" -SRC_URI="https://flacon.googlecode.com/files/${P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/PyQt4[X,${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - media-sound/shntool[mac?] - flac? ( media-libs/flac ) - mac? ( media-sound/mac ) - mp3? ( media-sound/lame ) - mp4? ( media-libs/faac ) - ogg? ( media-sound/vorbis-tools ) - tta? ( media-sound/ttaenc ) - wavpack? ( media-sound/wavpack ) - replaygain? ( - mp3? ( media-sound/mp3gain ) - ogg? ( media-sound/vorbisgain ) - ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - my_rm_loc() { - rm -v "translations/${PN}_${1}."{ts,qm} || die - } - - l10n_find_plocales_changes "translations" "${PN}_" '.qm' - l10n_for_each_disabled_locale_do my_rm_loc - - if [ -z "$(l10n_get_locales)" ]; then - sed -e '/install .*translations/d' -i Makefile || die - fi - - python_fix_shebang . - - sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die - - # do not use /tmp/ for tests - sed -e "s,/tmp/,${T}/," -i Makefile tests/flacon_tests.py || die -} - -src_compile() { :; } - -src_test() { - "${PYTHON}" tests/flacon_tests.py --verbose || die "Testing failed with ${PYTHON}" -} - -src_install() { - default - - python_optimize "${ED}"/usr/share/${PN} -} diff --git a/media-sound/flacon/flacon-0.9.4.ebuild b/media-sound/flacon/flacon-0.9.4.ebuild deleted file mode 100644 index e491e873d83..00000000000 --- a/media-sound/flacon/flacon-0.9.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PLOCALES="cs_CZ cs de es_MX es fr gl hu it pl_PL pl pt_BR pt_PT ro_RO ru si_LK uk zh_CN zh_TW" - -EGIT_REPO_URI="https://github.com/flacon/flacon.git" - -inherit cmake-utils l10n fdo-mime gnome2-utils -[[ ${PV} == *9999* ]] && inherit git-r3 - -DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks" -HOMEPAGE="https://flacon.github.io/" -[[ ${PV} == *9999* ]] || \ -SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/uchardet - media-sound/shntool[mac?] - flac? ( media-libs/flac ) - mac? ( media-sound/mac ) - mp3? ( media-sound/lame ) - mp4? ( media-libs/faac ) - ogg? ( media-sound/vorbis-tools ) - tta? ( media-sound/ttaenc ) - wavpack? ( media-sound/wavpack ) - replaygain? ( - mp3? ( media-sound/mp3gain ) - ogg? ( media-sound/vorbisgain ) - ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - my_rm_loc() { - rm "translations/${PN}_${1}."{ts,desktop} || die - } - - l10n_find_plocales_changes "translations" "${PN}_" '.ts' - l10n_for_each_disabled_locale_do my_rm_loc -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/flacon/flacon-1.2.0.ebuild b/media-sound/flacon/flacon-1.2.0.ebuild new file mode 100644 index 00000000000..64599b76bea --- /dev/null +++ b/media-sound/flacon/flacon-1.2.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# Ignore rudimentary uz@Latn, zh_TW translation(s) +PLOCALES="cs_CZ cs de es_MX es fr gl hu it ja_JP lt pl_PL pl pt_BR pt_PT ro_RO ru sr tr uk zh_CN" + +inherit cmake-utils fdo-mime gnome2-utils l10n + +DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks" +HOMEPAGE="https://flacon.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aac flac mac mp3 opus qt4 qt5 replaygain tta vorbis wavpack" + +DEPEND=" + dev-libs/uchardet + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/linguist-tools:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND} + media-sound/shntool[mac?] + aac? ( media-libs/faac ) + flac? ( media-libs/flac ) + mac? ( media-sound/mac ) + mp3? ( media-sound/lame ) + opus? ( media-sound/opus-tools ) + replaygain? ( + mp3? ( media-sound/mp3gain ) + vorbis? ( media-sound/vorbisgain ) + ) + tta? ( media-sound/ttaenc ) + vorbis? ( media-sound/vorbis-tools ) + wavpack? ( media-sound/wavpack ) +" + +REQUIRED_USE="^^ ( qt4 qt5 )" + +PATCHES=( + "${FILESDIR}/${P}-fix-qpainter-error.patch" + "${FILESDIR}/${P}-fix-corrupt-file-crash.patch" + "${FILESDIR}/${P}-fix-disks-or-tracks-number-change-crash.patch" +) + +src_prepare() { + # Ignore rudimentary uz@Latn, zh_TW translation(s) + rm "translations/${PN}_uz@Latn.desktop" || die + rm "translations/${PN}_zh_TW.ts" || die + + remove_locale() { + rm "translations/${PN}_${1}."{ts,desktop} || die + } + + l10n_find_plocales_changes 'translations' "${PN}_" '.ts' + l10n_for_each_disabled_locale_do remove_locale +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use qt4 QT4) + $(cmake-utils_use_use qt5 QT5) + ) + cmake-utils_src_configure +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} diff --git a/media-sound/flacon/flacon-9999.ebuild b/media-sound/flacon/flacon-9999.ebuild index e491e873d83..82dbb725e27 100644 --- a/media-sound/flacon/flacon-9999.ebuild +++ b/media-sound/flacon/flacon-9999.ebuild @@ -1,53 +1,72 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 -PLOCALES="cs_CZ cs de es_MX es fr gl hu it pl_PL pl pt_BR pt_PT ro_RO ru si_LK uk zh_CN zh_TW" +# Ignore rudimentary et, uz@Latn, zh_TW translation(s) +PLOCALES="cs_CZ cs de es_MX es fr gl hu it ja_JP lt nb pl_PL pl pt_BR pt_PT ro_RO ru sr tr uk zh_CN" -EGIT_REPO_URI="https://github.com/flacon/flacon.git" +inherit cmake-utils fdo-mime gnome2-utils l10n git-r3 -inherit cmake-utils l10n fdo-mime gnome2-utils -[[ ${PV} == *9999* ]] && inherit git-r3 - -DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks" +DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks" HOMEPAGE="https://flacon.github.io/" -[[ ${PV} == *9999* ]] || \ -SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="git://github.com/${PN}/${PN}.git" LICENSE="LGPL-2.1" SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack" +KEYWORDS="" +IUSE="aac flac mac mp3 opus qt4 qt5 replaygain tta vorbis wavpack" -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 +DEPEND=" dev-libs/uchardet + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/linguist-tools:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND} media-sound/shntool[mac?] + aac? ( media-libs/faac ) flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) - mp4? ( media-libs/faac ) - ogg? ( media-sound/vorbis-tools ) - tta? ( media-sound/ttaenc ) - wavpack? ( media-sound/wavpack ) + opus? ( media-sound/opus-tools ) replaygain? ( mp3? ( media-sound/mp3gain ) - ogg? ( media-sound/vorbisgain ) + vorbis? ( media-sound/vorbisgain ) ) + tta? ( media-sound/ttaenc ) + vorbis? ( media-sound/vorbis-tools ) + wavpack? ( media-sound/wavpack ) " -DEPEND="${RDEPEND}" + +REQUIRED_USE="^^ ( qt4 qt5 )" src_prepare() { - my_rm_loc() { + # Ignore rudimentary et, uz@Latn, zh_TW translation(s) + rm "translations/${PN}_uz@Latn.desktop" || die + rm "translations/${PN}"_{et,zh_TW}.ts || die + + remove_locale() { rm "translations/${PN}_${1}."{ts,desktop} || die } - l10n_find_plocales_changes "translations" "${PN}_" '.ts' - l10n_for_each_disabled_locale_do my_rm_loc + l10n_find_plocales_changes 'translations' "${PN}_" '.ts' + l10n_for_each_disabled_locale_do remove_locale +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use qt4 QT4) + $(cmake-utils_use_use qt5 QT5) + ) + cmake-utils_src_configure } pkg_preinst() { diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml index 249648044e8..d35aac6619e 100644 --- a/media-sound/flacon/metadata.xml +++ b/media-sound/flacon/metadata.xml @@ -10,10 +10,16 @@ <email>maksbotan@gentoo.org</email> <name>Maxim Koltsov</name> </maintainer> + <maintainer> + <email>itumaykin+gentoo@gmail.com</email> + <name>Coacher</name> + <description>Proxied maintainer; set to assignee in all bugs</description> + </maintainer> <use> - <flag name="mac">Add support for Monkey's Audio files</flag> + <flag name="mac">Add support for Monkey's Audio input files</flag> + <flag name="opus">Add support for Opus output files</flag> <flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag> - <flag name="tta">Add support for True Audio encoding</flag> + <flag name="tta">Add support for True Audio input files</flag> </use> <upstream> <remote-id type="github">flacon/flacon</remote-id> diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest index d293cf19fe9..3810f3338bd 100644 --- a/media-sound/pianobar/Manifest +++ b/media-sound/pianobar/Manifest @@ -1 +1,2 @@ DIST pianobar-2014.09.28.tar.bz2 51810 SHA256 6bd10218ad5d68c4c761e02c729627d2581b4a6db559190e7e52dc5df177e68f SHA512 3a9a508eaa4f1060ab456c4e28cd5447ed0a2e6a15b7694bf711ffa363d86c27483b1956da7f90919c9111c48752a99b9f704e721924903c017355dd577bc905 WHIRLPOOL 35db2f53b194d61c8601f27a787319036e5a59d86734ffd6ee00762fb66b2265c0f5b99aeea7ebffc9ebf5f8aa1430acc136e3486e6fa8cd2b355c439e96b68b +DIST pianobar-2015.11.22.tar.bz2 45973 SHA256 23fbc9e6f55b3277dba7a0f68ff721bad7f1eeea504c616ba008841686de322b SHA512 cd8f7307f0d7bd0359954202d2fc3b6d9fdcdc7238a2057c1541f85d62d69fafb22c4a6466d873c35727c1ad1576755ac2f9224dd5ce4ccba2d9c1c8b9a0205a WHIRLPOOL 30c6a43b2cad991d28ca7de981a950debed1f7b6097f71346ea181857e9599a3bf362153ffd040dbed1bc2a1b3459e96e48e5b963ffcb5a87d19157cf6d96ba8 diff --git a/media-sound/pianobar/pianobar-2015.11.22.ebuild b/media-sound/pianobar/pianobar-2015.11.22.ebuild new file mode 100644 index 00000000000..0b27aa69c6e --- /dev/null +++ b/media-sound/pianobar/pianobar-2015.11.22.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +inherit toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git" +else + SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A console-based replacement for Pandora's flash player" +HOMEPAGE="http://6xq.net/projects/pianobar/" + +LICENSE="MIT" +SLOT="0" +IUSE="static-libs" + +RDEPEND="media-libs/libao + net-misc/curl + dev-libs/libgcrypt:0= + dev-libs/json-c + >=virtual/ffmpeg-9" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + sed -e '/@echo /d' \ + -e 's/@${CC}/${CC}/' \ + -i Makefile || die +} + +src_compile() { + append-cflags -std=c99 + tc-export CC + emake DYNLINK=1 +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install + dodoc ChangeLog README.md + + use static-libs || { rm "${D}"/usr/lib*/*.a || die; } + + docinto contrib + dodoc -r contrib/{config-example,*.sh,eventcmd-examples} + docompress -x /usr/share/doc/${PF}/contrib +} diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild index 4c492a8cea9..0b27aa69c6e 100644 --- a/media-sound/pianobar/pianobar-9999.ebuild +++ b/media-sound/pianobar/pianobar-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ SLOT="0" IUSE="static-libs" RDEPEND="media-libs/libao - net-libs/gnutls + net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c >=virtual/ffmpeg-9" diff --git a/media-sound/xmms2/files/xmms2-0.8-cpython.patch b/media-sound/xmms2/files/xmms2-0.8-cpython.patch new file mode 100644 index 00000000000..58227ba5db8 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8-cpython.patch @@ -0,0 +1,9 @@ +diff --git a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd +index 66390a7..629bc7f 100644 +--- a/src/clients/lib/python/cython_include/cxmmsclient.pxd ++++ b/src/clients/lib/python/cython_include/cxmmsclient.pxd +@@ -30,3 +30,3 @@ cdef extern from "xmmsc/xmmsc_idnumbers.h": + +- ctypedef enum xmmsc_collection_changed_actions_t: ++ ctypedef enum xmms_collection_changed_actions_t: + XMMS_COLLECTION_CHANGED_ADD diff --git a/media-sound/xmms2/files/xmms2-0.8-modpug.patch b/media-sound/xmms2/files/xmms2-0.8-modpug.patch new file mode 100644 index 00000000000..ce401279c14 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8-modpug.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/modplug/modplug.c 2011-10-20 20:26:08.000000000 +0000 ++++ b/src/plugins/modplug/modplug.c 2015-01-08 19:52:43.889787624 +0000 +@@ -9,7 +9,7 @@ + #include "xmms/xmms_sample.h" + #include "xmms/xmms_medialib.h" + #include "xmms/xmms_log.h" +-#include <modplug.h> ++#include <libmodplug/modplug.h> + + #include <glib.h> + #include <string.h> diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild index 18e8dec4963..f424d494144 100644 --- a/media-sound/xmms2/xmms2-0.8-r2.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild @@ -113,6 +113,8 @@ src_prepare() { epatch "${FILESDIR}/${P}"-cython-0.19.1.patch epatch "${FILESDIR}/${P}"-memset.patch epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232 + epatch "${FILESDIR}/${P}"-cpython.patch + epatch "${FILESDIR}/${P}"-modpug.patch #536046 if has_version dev-libs/libcdio-paranoia; then sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die |