diff options
Diffstat (limited to 'media-sound')
68 files changed, 895 insertions, 1141 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex 2f5b6427a222..f2ea83863a00 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest index e4d13137acc4..859a99568929 100644 --- a/media-sound/erec/Manifest +++ b/media-sound/erec/Manifest @@ -1,4 +1,5 @@ +AUX erec-2.2.0.1-fix-makefile.patch 2717 BLAKE2B d10a0f2918b4f32b8b0876464dadcbdee37df0a23ab5e7bad99053620d7046ec3dce6c40913c1ea7a895a6843074ebf1fa9b4c9a9f9b33eba6936841456aab28 SHA512 8e014628bb9840fa8b59a825563dc6131b7d99892a7a30f9d844ffcab2d0f5e76af7d90891749a18026b65ee0325a228060bde081824617a8a52387e76b19c53 AUX erec-2.2.0.1-gcc43.patch 340 BLAKE2B d3fc0c0d4bb509e7ce3839b8e83732a12602036502a010d1752139c66da6fcc8993bfcc98d74fb226ee67a0af9d2f73c5da97586a2fa61932c6469310411f5d0 SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0 DIST erec-2.2.0.1.tar.bz2 25966 BLAKE2B 22e93e2185fc5eafab93a2558b3dd1261bcd7a96613fcc9b321baba13ca4dfaf024399aa298d36a6df7857ff0dd03c0bb15d3b3c26549b1845dba22061a94f6e SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28 -EBUILD erec-2.2.0.1-r1.ebuild 998 BLAKE2B f260ce3b64e7b15cb49741500340bbc79da4e8bd4e1d79529d8c215be209e496d26e37f756c0220662b34526d8eed366e3532a231b7c3f5c3a019aedc3a2603a SHA512 6a8d6f7f3c8d29adb40c261578090bd14a6ecd8d89ba7edd73918d15103e9d3499e28babe57ae3cf7ef098e652c018afaf0f336fc7643a04d66782b4a846acb0 +EBUILD erec-2.2.0.1-r1.ebuild 684 BLAKE2B 7d0707f008c3c6f9f4f2c66f24d6388b5caf36552499945a7af1d6e0d67be3c7cd0d254b2aac11a22dba221b354b6ed8956a382d57a55813ad8bc3c4f957adcd SHA512 8b82ce4b5fddef11cf341fcf12f41ae70844ce7967b119d50cae7422656e1f24f294f149ba5d0476706cf94db201be26da1c8ffa780de54704b77331659d670b MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild index 764393565e5c..69ec64516124 100644 --- a/media-sound/erec/erec-2.2.0.1-r1.ebuild +++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,35 +9,27 @@ DESCRIPTION="Shared audio recording server" HOMEPAGE="https://bisqwit.iki.fi/source/erec.html" SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2" -KEYWORDS="amd64 ~ppc sparc x86" LICENSE="GPL-2+" SLOT="0" +KEYWORDS="amd64 ~ppc sparc x86" -PATCHES=( "${FILESDIR}/${P}-gcc43.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-fix-makefile.patch +) DOCS=( README ) HTML_DOCS=( README.html ) src_prepare() { - sed -i \ - -e "s:BINDIR=/usr/local/bin:BINDIR=${D}/usr/bin:" \ - -e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \ - -e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \ - -e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \ - Makefile || die - - sed -i \ - -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \ - Makefile.sets || die - - echo "" > .depend || die - echo "" > argh/.depend || die default + + # prevent buildsystem from generating header dependencies + touch .depend argh/.depend || die } -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1 +src_configure() { + tc-export AR CC CXX } src_install() { diff --git a/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch b/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch new file mode 100644 index 000000000000..31c90354b7e7 --- /dev/null +++ b/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch @@ -0,0 +1,113 @@ +--- a/argh/Makefile ++++ b/argh/Makefile +@@ -16,12 +16,12 @@ + all: libargh.so libargh.a + + libargh.so: argh.lo +- $(CXX) -g -shared -Wl,-soname=$@ -o $@ $^ ++ $(CXX) -shared -Wl,-soname=$@ -o $@ $^ + argh.lo: argh.cc + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -fpic -o $@ -c $< + + libargh.a: argh.o +- ar -rc $@ $^ ++ $(AR) -rc $@ $^ + + include depfun.mak + +--- a/argh/Makefile.sets ++++ b/argh/Makefile.sets +@@ -1,21 +1,18 @@ +-CC=gcc +-CPP=g++ + #CXX=g++-2.95 +-CXX=g++ + #CXX=remotegcc -soktober -- g++ + + # Options for compiling, generally. +-CPPFLAGS=-DVERSION=\"$(VERSION)\" -pipe -g ++CPPFLAGS+=-DVERSION=\"$(VERSION)\" + # -fmessage-length=0 + + WARNINGS=-Wall -W -pedantic \ +- -Wundef -Wcast-qual -Wpointer-arith -Wstrict-prototypes \ +- -Wconversion -Wmissing-prototypes -Wwrite-strings \ ++ -Wundef -Wcast-qual -Wpointer-arith \ ++ -Wconversion -Wwrite-strings \ + -Wsign-compare -Wredundant-decls + # -Wtraditional -Wcast-align + + # C specific warnings +-CCOPTS=$(WARNINGS) -Waggregate-return -Wshadow -Winline ++CCOPTS=$(WARNINGS) -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wshadow -Winline + + # C++ specific warnings + CXXOPTS=$(WARNINGS) +@@ -25,9 +22,8 @@ + #-march=pentiumpro + + # Flags. +-CFLAGS=$(OPTIM) $(CCOPTS) +-CXXFLAGS=$(OPTIM) $(CXXOPTS) -fno-default-inline ++CFLAGS+=$(CCOPTS) ++CXXFLAGS+=$(CXXOPTS) -fno-default-inline + #-fno-rtti + + #LDFLAGS=-pg -ax +-LDFLAGS=-g +--- a/Makefile ++++ b/Makefile +@@ -19,9 +19,9 @@ + SUBDIRS=argh + + # For DYNAMIC argh-linking, use: +-ARGHLINK=-Largh -largh ++#ARGHLINK=-Largh -largh + # For STATIC argh-linking, use: +-#ARGHLINK=argh/libargh.a ++ARGHLINK=argh/libargh.a + + all: subdirs ${PROG} + +@@ -29,8 +29,8 @@ + $(SUBDIRS): + @$(MAKE) -C $@ + +-${PROG}: $(OBJS) +- $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(ARGHLINK) ++${PROG}: $(OBJS) subdirs ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Iargh -o $@ $< $(LDLIBS) $(ARGHLINK) + + include depfun.mak + +--- a/Makefile.sets ++++ b/Makefile.sets +@@ -1,22 +1,18 @@ + INSTALL=install +-CC=gcc +-CXX=g++ + +-CPP=$(CC) +-LDFLAGS=-g + #LDLIBS=-lstdc++ + +-CWARNINGS=-Wall -W -pipe -g \ ++CWARNINGS=-Wall -W \ + -Wundef \ +- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \ +- -Wmissing-prototypes -Winline ++ -Wcast-qual -Wcast-align -Wwrite-strings \ ++ -Winline + # -Wtraditional -fmessage-length=128 + +-CXXFLAGS=-pedantic -ffast-math $(CWARNINGS) ++CXXFLAGS+=-pedantic $(CWARNINGS) + #CFLAGS=-O3 -fomit-frame-pointer -ffast-math $(CWARNINGS) +-CFLAGS=-O -g $(CWARNINGS) ++CFLAGS+=-Wmissing-prototypes -Wstrict-prototypes $(CWARNINGS) + +-CPPFLAGS=-DVERSION=\"$(VERSION)\" \ ++CPPFLAGS+=-Iargh -DVERSION=\"$(VERSION)\" \ + -DCONFIG=\"$(CFGDIR)/$(CFGFILE)\" \ + -DBINDIR=\"$(BINDIR)\" $(DEFS) + diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest index a0dcca66be66..a239d147766f 100644 --- a/media-sound/ezstream/Manifest +++ b/media-sound/ezstream/Manifest @@ -1,5 +1,5 @@ AUX ezstream.confd 60 BLAKE2B 2b2d8a1bbfd6fbd4a196dc8eecc07939b9c85b6a6ffa0f138a51e6cab1a29080aae7a91bcbf4b628c6786612ea87da20fac01f1c118e965ef672f845b19372b9 SHA512 09f178f665d8677e3c75055028f975b98310fb2017ac0d69ae40b6417134ecec40ac90493fb861e1c46a2473fdd87bc088955032e62ddfbb8e201b306066d9c3 AUX ezstream.initd 633 BLAKE2B 32536c9fd48d9d1a77c8ba829b9aba135ca3339aed91f36f6bc90d2e89610a4d1eba0588d5dd90f7aa7b83f8f4737276178fc8cbae3b7db0cab4141e46106ea6 SHA512 684b56d3f828ce518d5fa1d5d9be64ef4b1d591fd0bed75d9842cc8d2ed79c8aab500d22465e02c60b8be5f1662462ff3a4b19a789ac807d290113cf29f6efd3 DIST ezstream-0.6.0.tar.gz 250448 BLAKE2B 18449d90e51a6880c6acf3d99fd449f666de811dec5dc964102d87b7d1d08dab01e3d9d8d959f4a456ba695464693fec3d990115cc6b6513fcde02c937dab1c1 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d -EBUILD ezstream-0.6.0-r1.ebuild 853 BLAKE2B 00216751b06da021b95d447b1dbb27928a9c600d59b6e3d11d799d0ecd80f268856a2610381a4241a68cef2fd63979063badb18e93455bd9511a86e737532c9c SHA512 e5017e8f55b565254ef131d44d3d1ae29c67036db7e907f7b3b46941a35cdbe37f0cede92543e70e1014a08938529e4449a816fe7bf9b0e9b7b790ec092c9eca +EBUILD ezstream-0.6.0-r1.ebuild 854 BLAKE2B 583e4e5b249feeee0d0611b78faeaef4df717161d9e56d561562ffb8303099dc8bc76b6280cc6c942970d0f41e51e2d4f3c529528575acf9951ec37fef2e61cd SHA512 87aa6d4ef146d50e660066a463e4569c07ab000f5d830b2de16ca0da36ceac63f5e07e2c11bb7a564f1a89011e8aea3d678283aaa37f3ecddfab1b85db5286a1 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild index ddde77ac0d51..665c2a35883f 100644 --- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild +++ b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 DESCRIPTION="A command line source client for Icecast media streaming servers" -HOMEPAGE="http://www.icecast.org/ezstream/" +HOMEPAGE="https://www.icecast.org/ezstream/" SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/media-sound/flake/Manifest b/media-sound/flake/Manifest index bb4f1e0bd9fb..8401fab9a67b 100644 --- a/media-sound/flake/Manifest +++ b/media-sound/flake/Manifest @@ -1,3 +1,3 @@ DIST flake-0.11.tar.bz2 43319 BLAKE2B e24b1f80ce2e1048c46db8957fae51f493a39a245d7c667c0b47713f65d6d78074b2d2c56d0345d0be142bddcd64db8d750c3eceb797bf43661472c8d4ed23b1 SHA512 045cbe7f5af29dfdc5843df3dccfa6faf1ce816566b2f3ac928b98e14f5ee0ec15ee5024a092da4e33beb5d87c31f38c0780970811c5b96ae72683aeac332584 -EBUILD flake-0.11.ebuild 683 BLAKE2B 6a973329f533e8392fbe19d56f616a25b60973616a6ce9e8ba1cdfb06dc43d9b1933dfcb600a5c70de830fb69231bb24c562636950e946d108c237d4e73d0183 SHA512 3665f1c5a2fee5e23dd821e607b4917b3fe4b726998a5a209490976ac7ccf1724a5d53da2f80f4659309d0dfa700f8b21d868c153146b62feb9b8d38e2492ac1 +EBUILD flake-0.11.ebuild 738 BLAKE2B 835a36b88132340f6983bd3581b8be2e4a6e38664e52d8c591d751b588f8f672be9b2da01a3f6e85a00babcffbbc7179587b5dfd57594e684c1542c67eaa1a37 SHA512 ecb01a68cac3bfcdbde3f453ab2fb13f389d3d6ae0881876e065e8cd26e9c217b3e62ff664657c8f393d5429bb7b28392a688aa4a5d73a180b360945b0988a68 MISC metadata.xml 332 BLAKE2B c1182dcd7f5de8f8a5687040c8d6a0411a73af3285d538fa8d1ee8732c801d5cb5769fc6c5dd0faafba299d0a8e18212329f2c0382cd49c80e7b6b26d162c8c3 SHA512 a4ccde79f373a6fc28fa699e0ab8dcea6b2a717405dc0da2f2c02ad552e6b0d61b3c19c070e186a1803c84ac7037f39bdfb6e6d5af6eb5aff3f5f6e3b7692e53 diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild index 24f2e7b6ee1b..caa19b932b0e 100644 --- a/media-sound/flake/flake-0.11.ebuild +++ b/media-sound/flake/flake-0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,8 +16,10 @@ KEYWORDS="amd64 x86" src_configure() { # NIH configure script ./configure \ + --ar="$(tc-getAR)" \ --cc="$(tc-getCC)" \ - --prefix="${D}"/usr \ + --ranlib="$(tc-getRANLIB)" \ + --prefix="${ED}"/usr \ --disable-opts \ --disable-debug \ --disable-strip || die "configure failed" diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest index c11ec8df2012..ea7fcd268b4e 100644 --- a/media-sound/fluidsynth/Manifest +++ b/media-sound/fluidsynth/Manifest @@ -1,5 +1,3 @@ -DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d -EBUILD fluidsynth-2.0.7.ebuild 2518 BLAKE2B 2696f05bbb901fa99393a9ebcf5a9156e8e2203fcd145131b9c43f7e8595547c91ebf895c00484b6e1b8e3ab1a2b31b6017cedbfd389639103f09b2244d58e0d SHA512 86afe364b1aa048f1c9384f08ced83595757b45904eafc5069a538dca832fb8b20831eb43ccfef5cc006a9bae5e372eba4fe8d14b5208b8cfa820ce9efe7d2a3 EBUILD fluidsynth-2.1.0.ebuild 3302 BLAKE2B fa194d9fdcd665e8cece17ed158039ff23be2214efd83e4812f7ad4db985e80c00028e993d62a3128520deac63877e4186953df9417ea2b46053331277cd2280 SHA512 e6a7e8af213573b351c3a2c388d00dcb23879990bf6c3773286f7311e10d2b67c96e9ea7e1343e19da24f62d4a4fe4a38ef209cdd061e064592b7c56520d3bf9 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a diff --git a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild deleted file mode 100644 index 494a305ed54f..000000000000 --- a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib systemd - -DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications" -HOMEPAGE="http://www.fluidsynth.org/" -SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86" -IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2[${MULTILIB_USEDEP}] - alsa? ( - media-libs/alsa-lib[${MULTILIB_USEDEP}] - lash? ( media-sound/lash[${MULTILIB_USEDEP}] ) - ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - ladspa? ( - media-libs/ladspa-cmt[${MULTILIB_USEDEP}] - media-libs/ladspa-sdk[${MULTILIB_USEDEP}] - ) - portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) - sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt ) - -src_configure() { - local mycmakeargs=( - -Denable-alsa=$(usex alsa) - -Denable-dbus=$(usex dbus) - -Denable-debug=$(usex debug) - -Denable-ipv6=$(usex ipv6) - -Denable-jack=$(usex jack) - -Denable-ladspa=$(usex ladspa) - -Denable-oss=$(usex oss) - -Denable-libsndfile=$(usex sndfile) - -Denable-portaudio=$(usex portaudio) - -Denable-pulseaudio=$(usex pulseaudio) - -Denable-readline=$(usex readline) - -Denable-systemd=$(usex systemd) - ) - - if use alsa; then - mycmakeargs+=( -Denable-lash=$(usex lash) ) - else - mycmakeargs+=( -Denable-lash=OFF ) - fi - - if use systemd; then - mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" ) - fi - - cmake-multilib_src_configure -} - -install_systemd_files() { - if multilib_is_native_abi; then - systemd_dounit "${BUILD_DIR}/fluidsynth.service" - insinto /etc - doins "${BUILD_DIR}/fluidsynth.conf" - fi -} - -src_install() { - cmake-multilib_src_install - - docinto pdf - dodoc doc/*.pdf - - if use examples; then - docinto examples - dodoc doc/*.c - fi - - if use systemd; then - multilib_foreach_abi install_systemd_files - - elog "When using fluidsynth as a systemd service, make sure" - elog "to configure your fluidsynth settings globally in " - elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth" - fi -} diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest index 0f00564c66bd..6766a9f544c0 100644 --- a/media-sound/fmdrv/Manifest +++ b/media-sound/fmdrv/Manifest @@ -1,4 +1,5 @@ +AUX fmdrv-1.0.7-fix-makefile.patch 1010 BLAKE2B cf0dc20d3a0a5092c053e66bc1a6ff140f1c66a49787b3889b8eee348d9ac85ce7c8cc23eded5c16e108d32db3170dbbb80b03de2b03befc8250d78b83290003 SHA512 fd08e27717674e97330c465f450dbc3e92ef6bb4c1a8485f64b7047023dd5e4f8869624f8b6538fbaaab015e11dca289cfb059cee0e27bd9f56543fc1c8df04c AUX fmdrv-1.0.7-ioperm.patch 434 BLAKE2B 355fa4db5dc48ff732aecdf6d9b79de934f4ff05647723d74953f0e6ca9e457bcd9973b7b71541c0a196ba136b471f0e4927801998cb0386b0c8abd0ca264177 SHA512 c092de86d3d2ec1dd403304b918b96196d4ceeb1856a1e2c21c1af5a5b71ab3cfa2a9e461de007296a74206cebc25c0f9633425b921f58d645a024bbbc2755b4 DIST fmdrv-1.0.7.tar.bz2 61373 BLAKE2B d361bb974c48ebbcbfdcf3e65c03c67b5449579671eebe862b8df1220da5e738045a6ad61ea4603ff38bb801f8bdc5d7572a5eedec1765773b18f7c61ba9792d SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d -EBUILD fmdrv-1.0.7.ebuild 829 BLAKE2B bfa070a39c7fe709502c6cd36c5141164e3c3452a05268ef9d4c88734cbe69e2d0722eb92575f2c15bb2c191897e0f287fa89c2a9b74220ae6d77908527e4aed SHA512 c380087eeaf15945596d210976a43fd585b411c9751c53b4c0d9522d491c253a4485262d8fbcbbe7c78988ef10d9328fe2eaffce48c99373fd2891b72e836f9d +EBUILD fmdrv-1.0.7.ebuild 732 BLAKE2B cb28b4938cdcfa2f48511c7d871fdba422d20234a154d26f68d73a449d4f17a0d7348fda1c8eee585477b09944adfa09c850ae2e95287feaa1cd6901778e0570 SHA512 17a561470fc3581d848199526366ad9b9a4a9e22ba2ac82e015a2f1ef5abc343c853f1403e54737af86be45b6359e70f82b04a01032ce101992c26bafb01e8ca MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch b/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch new file mode 100644 index 000000000000..a222752716c7 --- /dev/null +++ b/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch @@ -0,0 +1,42 @@ +--- a/Makefile ++++ b/Makefile +@@ -59,7 +59,7 @@ + #ELF (works): + # $(CC) -Wl,-r -nostdlib -o $@ $^ + #a.out (works): +- ar -rc $@ $^ ++ $(AR) -rc $@ $^ + + install: installbin + chown root $(BINDIR)/fmdrv +--- a/Makefile.sets ++++ b/Makefile.sets +@@ -1,22 +1,18 @@ + INSTALL=install +-CC=gcc +-CXX=g++ + +-CPP=$(CC) +-LDFLAGS=-g + #LDLIBS=-lstdc++ + +-CWARNINGS=-Wall -W -pipe -g \ ++CWARNINGS=-Wall -W \ + -Wundef \ +- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \ +- -Wmissing-prototypes -Winline ++ -Wcast-qual -Wcast-align -Wwrite-strings \ ++ -Winline + # -Wtraditional -fmessage-length=128 + +-CXXFLAGS=-pedantic -ffast-math $(CWARNINGS) ++CXXFLAGS+=-pedantic $(CWARNINGS) + #CFLAGS=-O3 -fomit-frame-pointer -ffast-math $(CWARNINGS) +-CFLAGS=-O -g $(CWARNINGS) ++CFLAGS+=$(CWARNINGS) -Wstrict-prototypes -Wmissing-prototypes + +-CPPFLAGS=-DVERSION=\"$(VERSION)\" \ ++CPPFLAGS+=-DVERSION=\"$(VERSION)\" \ + -DCONFIG=\"$(CFGDIR)/$(CFGFILE)\" \ + -DBINDIR=\"$(BINDIR)\" $(DEFS) + diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild index e4701c3430f5..9cb17380f290 100644 --- a/media-sound/fmdrv/fmdrv-1.0.7.ebuild +++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Console mode MIDI player with builtin userland OPL2 driver" HOMEPAGE="https://bisqwit.iki.fi/source/fmdrv.html" @@ -12,23 +13,21 @@ LICENSE="fmdrv GPL-2" # GPL-2 only SLOT="0" KEYWORDS="amd64 x86" -src_prepare() { - epatch "${FILESDIR}"/${P}-ioperm.patch -} +PATCHES=( + "${FILESDIR}"/${P}-ioperm.patch + "${FILESDIR}"/${P}-fix-makefile.patch +) -src_configure() { :; } # it is a fake +DOCS=( README ) +HTML_DOCS=( README.html ) -src_compile() { - emake fmdrv \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" +src_configure() { + tc-export AR CC CXX } src_install() { dobin fmdrv - dodoc README - dohtml README.html + einstalldocs } pkg_postinst() { diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest index 503c769ccee1..fba13c00c17a 100644 --- a/media-sound/gnome-music/Manifest +++ b/media-sound/gnome-music/Manifest @@ -1,5 +1,5 @@ DIST gnome-music-3.34.5.tar.xz 1415240 BLAKE2B 3545541171b023da116ebee5d28a2b69b6b45677cde26c833ea0992ba9bc41d4792375dbf3617105da53f0e98d21576e166980e896527a60d47c92690b343a27 SHA512 c4f3c8cd7e8a6d24d3766672acfe3abc340d0cd305ba0d3d0a87c02b5a5f9e8c47bee9d8284e76ad28c51eeebe56e3163f4e5c34c89e294801d0047b8476f80f DIST gnome-music-3.34.6.tar.xz 1415360 BLAKE2B 0b8f3a2b17242f41f3a77a9eeb60cf1f10cac57d983de6e7f44ba1a243526e0831ee2ad5baec17b726bbbe9df52e26b79dedc2b2abe4dba87c59cc4fcd4a083f SHA512 76561adf8c6ce4342825eb976de11c98c2aa66cb08075dbe46d8c7787daf7fc77763d55c2fe475dd9c75536adc98f8afbdd90bfb2b64791d05cdf11e3ed00b03 EBUILD gnome-music-3.34.5.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791 -EBUILD gnome-music-3.34.6.ebuild 2035 BLAKE2B c6fe49d24527a9fb61a3c3e166164a86ec5598a54247275e9e145c1da15c2679bd7ef2f0af6601fab44b793859e719df78536f326f40b725eea9a79a2bb38c58 SHA512 0c7e7a9a847e7c79aba6a50205b9fbf7df8d9d8bb0b7741303765c61684b66def80fdeaf379ce96592819a765ea3e3ba24c09aad1061706cc00fcd075a4b2de6 +EBUILD gnome-music-3.34.6.ebuild 2034 BLAKE2B bdb90eb19f9c485dd3a2d82454f84ee0f475a86ca345f9585064e11a4e46973e30764c035716f0dcc233e92eb299f00ce644bddd70f58186f973c3a81a2f80a1 SHA512 22ca2020819d13dc855c687907a668e8730a302e41af738291b6f0a161bb3ec9375d66a704744ffe20e8fb39d7df761103e639a76e1592cf6a08ee0f7117b7b0 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/media-sound/gnome-music/gnome-music-3.34.6.ebuild b/media-sound/gnome-music/gnome-music-3.34.6.ebuild index fde8cf288529..25d04e56418e 100644 --- a/media-sound/gnome-music/gnome-music-3.34.6.ebuild +++ b/media-sound/gnome-music/gnome-music-3.34.6.ebuild @@ -14,7 +14,7 @@ SLOT="0" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 x86" DEPEND="${PYTHON_DEPS} >=dev-libs/glib-2.50:2 diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest index 520a28bea469..b3884faac2ba 100644 --- a/media-sound/gsm/Manifest +++ b/media-sound/gsm/Manifest @@ -1,6 +1,6 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e27cc0bb39b7ce0df361840304ee06d3d321ee39209e3dc7bb6424d64490b3174c5d24b3cd1cbe1ccde2787d SHA512 33b559da974d89487f41e24fe9fee4ac4df6383e27835f710f50deaca76c5077fc24b20fe4d306f1b8c2ca6f3e9cf99c5934796e3795354dee63061e305d4c72 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200 -AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957 +AUX gsm-1.0.13-shared.patch 3750 BLAKE2B 62fda4c22ab90ab5c77211b9c6966eb8286e6c938f5c4b883b3b6efb6e787a0a84f2f5f9b5f124cf10d4ab3055c3c0e6f8ffb81998654720dd621353fe7b80c9 SHA512 b18273436158dc410e7c40a9a290d365f8bf89977663f35f38d783d46d858163cf0b6f73e88e57d928eafc5de7489643ac7194f72fc7a604ef7cba95e8bf6285 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa -EBUILD gsm-1.0.13-r1.ebuild 1553 BLAKE2B 6b343d4018055057fe85e0a617b7c01e224c2bda2b6879aad77f79578616ba50a6bf979c4b5bc24ebb25df7f9802a0fc1103bffe0d2db605a6d26b5d5ddd0efa SHA512 6dea985eb488d035971ca83f34c580f6f202740b8c46edec81f621e974fbad595c1b98bc3db170790c2d62f1083300e314d626b5a506958e9dd3db5bc678f2cd +EBUILD gsm-1.0.13-r1.ebuild 1603 BLAKE2B c4c95c893e2273ca95b61446b7d0d71d6bd10b036bc26e807866c21c5e649a4bcc007de257fff245dc4f9175235717d701e545cc28cd76456bf1b86751051322 SHA512 572d3b59a980fd1bfb2994493876d11ec7ada6599d45750dba12f077e936790c8b5aa49d9bd362875b455e409c03c4f8e523018daadbd360ac036a0335fda77d MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch index fc99e2c30437..ba178092c2f0 100644 --- a/media-sound/gsm/files/gsm-1.0.13-shared.patch +++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch @@ -1,16 +1,24 @@ -diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile ---- gsm-1.0-pl13.orig/Makefile 2006-04-26 22:14:26.000000000 +0300 -+++ gsm-1.0-pl13/Makefile 2009-09-08 14:50:02.000000000 +0300 -@@ -96,7 +96,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -96,16 +96,14 @@ # Other tools SHELL = /bin/sh -LN = ln +LN = ln -s BASENAME = basename - AR = ar +-AR = ar ARFLAGS = cr -@@ -140,6 +140,7 @@ + RMFLAGS = + FIND = find + COMPRESS = compress + COMPRESSFLAGS = + # RANLIB = true +-RANLIB = ranlib + + # + # You shouldn't have to configure below this line if you're porting. +@@ -140,6 +138,7 @@ # Targets LIBGSM = $(LIB)/libgsm.a @@ -18,7 +26,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast -@@ -203,24 +204,43 @@ +@@ -203,24 +202,43 @@ # Object files @@ -80,7 +88,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile TOAST_OBJECTS = $(SRC)/toast.o \ $(SRC)/toast_lin.o \ -@@ -228,7 +248,7 @@ +@@ -228,7 +246,7 @@ $(SRC)/toast_alaw.o \ $(SRC)/toast_audio.o @@ -89,7 +97,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile # Manuals -@@ -277,9 +297,12 @@ +@@ -277,9 +295,12 @@ $(CC) $(CFLAGS) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 @@ -103,7 +111,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,24 +322,29 @@ +@@ -299,24 +320,29 @@ # The basic API: libgsm @@ -138,7 +146,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile # The local bin and lib directories -@@ -426,7 +454,9 @@ +@@ -426,7 +452,9 @@ clean: semi-clean -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild index 676c7daf803c..7f0c2275a725 100644 --- a/media-sound/gsm/gsm-1.0.13-r1.ebuild +++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild @@ -38,14 +38,14 @@ src_configure() { multilib_src_compile() { emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \ - LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" + LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" } multilib_src_install() { dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3} emake -j1 INSTALL_ROOT="${ED}"/usr \ - LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \ + LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \ GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \ GSM_INSTALL_INC="${ED}"/usr/include/gsm \ GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \ diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest index 5e323e7cee19..655a5c368ded 100644 --- a/media-sound/gtick/Manifest +++ b/media-sound/gtick/Manifest @@ -1,6 +1,4 @@ -AUX gtick-0.5.4-desktop.patch 832 BLAKE2B 5eec851966ed2287b6d4d13629114b91d09b80ab52743a6537a1bd3b88c36fdd96b837a4f3725d85edac5957ffa546dcb56c3f00140e7dbfefbf01b020521bdc SHA512 4f26a64ea2ea327a9ceeba2b133c92bf8529f8dcdcf66eebf3110f976d147001990ffe29acafaee9e6cf38d36dbdd0e7484a9905a04f6f14b5cd389634100df1 -AUX gtick-0.5.4-fno-common.patch 624 BLAKE2B b3131096edc3262ad15ef27e57d1552ab80b933c64f191eacfe2275d3bff6e77c053a67f2d3678d98d5d1ee20b923b255fcb3913ddcfeb56a7b3fc1e5568647a SHA512 315f18be8f9467711da530afc98e63f4e416fc466a9fedbd2a5e84e3774a3f7ffd4b74d6bbbebaba2370109bb8b584f54823ba46faf70128aec97ec56cf16ee8 -DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e -EBUILD gtick-0.5.4-r1.ebuild 1131 BLAKE2B cb9af368744efe8b59d5bf91751898189062d5999481c07e88dc4515023d895a6d94ef35fdc5e7064952afaceef4466a49a52a1e0c3442bf6464688c2b10856c SHA512 3cdefd4a5705ebda0cc2cffeaa0b8375796207df09a469564e8b22e55e6a55e74ec28922d23a780411a64eb3c26ae9bded3d33a6a27800374585af86590efff6 -EBUILD gtick-0.5.4.ebuild 816 BLAKE2B 57c114edb48af45d23246129c0ad0c78d21c637fa9e3a647eaeebb9676303f45ce894ed96d7a1afb0cedad38ece9c3651995a5131574c90cb84831da6881e086 SHA512 774b3518bfcf3f2e18fae37f2bb85b6785b035ed20bc3315a9ef52cdeb13f4716ee472f85b0ed46f05f29b47551ecdcdf227f292758b5cf411f077161520bbe6 +AUX gtick-0.5.5-desktop.patch 776 BLAKE2B 945b1eaff7d480e092d93b1cce83653aaa474e36172df20233f5e09cfc07ede22260cff87664ae767a39ab05e7c83b7bc401b8cf5a85539fdcd9338a78556ce4 SHA512 d61fc78e86e4bfd47e23987236108ca36bd19df90363c2bd625f4668e9a325ce082c423d90fdf0600900d391e6da21d719c620203c5052b54d9eb5f20c9d948b +DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87 +EBUILD gtick-0.5.5.ebuild 1059 BLAKE2B bb414004dc67ae6fb55f93ff74ee7ddaebaa664fd41b728ae6c581195bd2691447199d8f628ec78e57af7d1ebdda667fdc554720b9ad1d2b19dc09a65f3b4a7c SHA512 0bffaf48f5fb97b45eaeffb06a62edff89a6cc5af8db6b3c444daff34cbc2a040c8d3786915927685c601cc5661b951b743cce89ef81843e22ba8228091e99fc MISC metadata.xml 478 BLAKE2B 5dda5dcbc5d1ca329e38762dc8d6d95a0f2710f97cce2fb4937ac01955c64031a1957900ff2cea5a61a0646436f900b735b3126df7acf9bcf7be48611e7fc0c0 SHA512 7e474d535527343cd3c97b3da68da7f8e98ce5db90e9f868004bfa5d0eb30d99432e56a3d789045e54f66d2932c47a56418896fc9be2771fa9b305be2be4b004 diff --git a/media-sound/gtick/files/gtick-0.5.4-fno-common.patch b/media-sound/gtick/files/gtick-0.5.4-fno-common.patch deleted file mode 100644 index 37747cef1b88..000000000000 --- a/media-sound/gtick/files/gtick-0.5.4-fno-common.patch +++ /dev/null @@ -1,27 +0,0 @@ -Downstream patch. No upstream activity since 2014. - -From 23f5585ba3dcf276cd3f71c25f710e68823f97e9 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Tue, 17 Mar 2020 17:14:50 +0300 -Subject: [PATCH 1/2] Fix building with -fno-common - ---- - src/optionlexer.l | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/optionlexer.l b/src/optionlexer.l -index df79dd5..97ed29d 100644 ---- a/src/optionlexer.l -+++ b/src/optionlexer.l -@@ -40,7 +40,7 @@ - #include "optionlexer.h" - - char* option_filename; --YYLTYPE option_lloc; -+#define YYLTYPE option_lloc; - - void option_locate(); - %} --- -2.24.1 - diff --git a/media-sound/gtick/files/gtick-0.5.4-desktop.patch b/media-sound/gtick/files/gtick-0.5.5-desktop.patch index 7aa0995b0394..d1492316dc58 100644 --- a/media-sound/gtick/files/gtick-0.5.4-desktop.patch +++ b/media-sound/gtick/files/gtick-0.5.5-desktop.patch @@ -1,9 +1,7 @@ -Downstream patch. No upstream activity since 2014. - -From b07f665d712fdbebfd506ef6301fc9ac71660e96 Mon Sep 17 00:00:00 2001 +From 17d3d5060160169706a9a0847aa15c068484fe5e Mon Sep 17 00:00:00 2001 From: Alexander Tsoy <alexander@tsoy.me> Date: Thu, 19 Mar 2020 21:17:22 +0300 -Subject: [PATCH 2/2] Fix desktop file +Subject: [PATCH] Fix desktop file --- gtick.desktop | 7 ++++--- @@ -28,5 +26,5 @@ index 05cf5ed..a31dee3 100644 +GenericName=Graphical Metronome +StartupNotify=true -- -2.24.1 +2.26.2 diff --git a/media-sound/gtick/gtick-0.5.4.ebuild b/media-sound/gtick/gtick-0.5.4.ebuild deleted file mode 100644 index f589cbb19346..000000000000 --- a/media-sound/gtick/gtick-0.5.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop - -DESCRIPTION="Metronome application supporting different meters and speeds ranging" -HOMEPAGE="https://www.antcom.de/gtick" -SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="nls sndfile" - -RDEPEND="x11-libs/gtk+:2 - media-sound/pulseaudio - sndfile? ( media-libs/libsndfile )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -RESTRICT="test" - -src_prepare() { - default - sed -i "/GenericName/d" ${PN}.desktop || die -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with sndfile) -} - -src_install() { - default - newicon src/icon48x48.xpm ${PN}.xpm - make_desktop_entry ${PN} "GTick" -} diff --git a/media-sound/gtick/gtick-0.5.4-r1.ebuild b/media-sound/gtick/gtick-0.5.5.ebuild index ca520476a379..f3a3e28b5666 100644 --- a/media-sound/gtick/gtick-0.5.4-r1.ebuild +++ b/media-sound/gtick/gtick-0.5.5.ebuild @@ -11,22 +11,19 @@ SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" IUSE="nls sndfile" RDEPEND="media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )" DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison - sys-devel/flex - virtual/pkgconfig +BDEPEND="virtual/pkgconfig nls? ( sys-devel/gettext )" RESTRICT="test" PATCHES=( - "${FILESDIR}"/${P}-fno-common.patch "${FILESDIR}"/${P}-desktop.patch ) diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest index c2efd5071071..b0ca8d5a288c 100644 --- a/media-sound/guitarix/Manifest +++ b/media-sound/guitarix/Manifest @@ -1,4 +1,8 @@ +AUX guitarix-0.40.0-noexecstack.patch 972 BLAKE2B 7ecadff2c2882392b9eab28721135dcf8f70eb83397b1fed77c483b38be0d1ff74bcc2dab774e4a5449bb29049748b808683d5a2fe3406feb2c0f40c5a106eed SHA512 805172b4dbe22f9d45e25e8da5fb838bc635773d67b7db038105e6b1f61b3a3c05c5a473038127b6487e9bf339b272f77d73b30d266cd3ab65339a587fe747d5 +AUX guitarix-0.40.0-nostrip.patch 687 BLAKE2B 001f397a93b03578e6f214b517cf7af9e09a210adb0b5a5bf343ab74a9f3bc197b2d54c244bd55b6cd91ac0617299cd0937f2fed265b348253123c9873018212 SHA512 e0ee0431a19fe014b0008ff1ef94604f97aeba3bccef6571cf2fca425882081ec1eb255573a069effd9cca40427024f4ecb54836bb60e53b8c4198ae141ef240 DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df -EBUILD guitarix-0.39.0.ebuild 1724 BLAKE2B 301bebf30887e39b61a443ab11edd7ab25a37234b51c10dabbc9b9e085d2c7befbc5fda8087c9e3a2a74a6784bce58e20f5ab69493a19762f4143b3511ae9e9f SHA512 aa28471e55303d706a80b34db6a785bc98e7a922196311b89053b6827a0333fd96223bcad7cb60d511ac04060ba5251295d0f4d3b5c6c2516dc344a71b35e78b -EBUILD guitarix-9999.ebuild 1760 BLAKE2B 0ee278c75d56864fb52a4b7841b04ca72c92382915b87c55dcb341a7065f34dc8b931b29bd394a87829d269032e1fac2fec04e1c5968a9f35275ae401a99b74c SHA512 09a4a0c05a8210a355113045c6ee06fc2d059a2e9d28428933a935a9b0739d3671c3e2d25d72b41db436854db0d51dcc48be733ca8efb15fb16d9266083f2da6 +DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8 +EBUILD guitarix-0.39.0.ebuild 1726 BLAKE2B 2efb30118ea92aef65ed8e921378324ab38eb2632812803716ced8cde854b8ed710f9c668cc9d946eecbc7d6996577c2f819d8594b6f640a5a81e41a76fd814e SHA512 065c47eb37638e4c0c60cd0eba8e613c8502ce972f534aeee6fe9ffb3235a0ef9b3bb65a69aaffbbfe2f82580d3580dcc5b42d771bb682a94b219da9f4447d59 +EBUILD guitarix-0.40.0.ebuild 1801 BLAKE2B 8b171e16c2211e54bc6b536c94fa73846b244868bcbc1e757a2bf2d02fb5d273111dfa501640b3e334ff65e071ede7ed289757d93fc0e1d0c4089c44f9f610a1 SHA512 0c14080f5f7fa841cf0ad20ef1c64b399654bcbbf12bed9c33ecbe1daf9bf29fedb70fdc981cb5cb7a45e9e291db34d00361633209cf6cf67528e75f56ffc43b +EBUILD guitarix-9999.ebuild 1734 BLAKE2B cf3c2302af3ea6f2870eb32303dabaa567d38c72987d131f0205e139a19cd23b0d6421db99218806217174e12a695604ce4cec158b4cb5848a92c665fa3d0e39 SHA512 7c9f8fd4dae7a0cdf4b75024c0edffcfaac200adc07eeaef3b5bdd7b1441350961728a0d2bbf8721ab13b201eed32b832e61b91ba0eaa6e313b0abff8c162b02 MISC metadata.xml 595 BLAKE2B 22b392d194412eb045a3892e77a79f809215cdfc7e7afa42da59284f88975bd6d789a5a8e215c1137093266ba19e0be463d7b51b7b6506ff38f8591fd7b5cefb SHA512 5ccc8bcc15cf8fd7a5a4e18cb805765d6cc1b735c08b3194f3b4bc20d94e4d00d1db4fb9869bd58c82bcd39951d7421647811f61f7add2733e6719e6b5d78c3d diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch new file mode 100644 index 000000000000..f64a21f26b51 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch @@ -0,0 +1,26 @@ +From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001 +From: brummer10 <brummer-@web.de> +Date: Fri, 5 Jun 2020 06:41:30 +0200 +Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch + by Alexander Tsoy + +--- + trunk/src/LV2/xputty/resources/wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript +index a2f0402c..3c383393 100644 +--- a/src/LV2/xputty/resources/wscript ++++ b/src/LV2/xputty/resources/wscript +@@ -41,7 +41,7 @@ def img2obj(task): + src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]]) + cmd = ("cd src/LV2/xputty/resources/ \ + && for f in %s; do\ +- %s -r -b binary ${f}.png -o ${f}.o; \ ++ %s -r -b binary -z noexecstack ${f}.png -o ${f}.o; \ + done " % (src, env.LD[0]) ) + # Logs.debug("runner: system command -> %s" % cmd) + ret = task.exec_command(cmd, shell=True) +-- +2.26.2 + diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch new file mode 100644 index 000000000000..2bc77f443b16 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch @@ -0,0 +1,24 @@ +From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Fri, 5 Jun 2020 17:21:10 +0300 +Subject: [PATCH] Do not strip lv2 plugins + +--- + trunk/wscript | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/wscript b/wscript +index 2699325f..f2d8f86d 100644 +--- a/wscript ++++ b/wscript +@@ -375,7 +375,6 @@ def configure(conf): + conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications')) + conf.env['BIN_NAME'] = APPNAME + if opt.lv2: +- conf.gxload('strip') + conf.gxload('lv2') + conf.env['LADSPA'] = opt.ladspa + conf.env['NEW_LADSPA'] = opt.new_ladspa +-- +2.26.2 + diff --git a/media-sound/guitarix/guitarix-0.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild index 9d500a3a0a3a..688596340430 100644 --- a/media-sound/guitarix/guitarix-0.39.0.ebuild +++ b/media-sound/guitarix/guitarix-0.39.0.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE='threads(+)' @@ -10,7 +11,7 @@ inherit python-any-r1 waf-utils xdg MY_P="${PN}2-${PV}" DESCRIPTION="Virtual guitar amplifier for Linux" -HOMEPAGE="http://guitarix.org/" +HOMEPAGE="https://guitarix.org/" SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz" LICENSE="GPL-2" diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild new file mode 100644 index 000000000000..7a7c6a6d4525 --- /dev/null +++ b/media-sound/guitarix/guitarix-0.40.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE='threads(+)' + +inherit python-any-r1 waf-utils xdg + +MY_P="${PN}2-${PV}" + +DESCRIPTION="Virtual guitar amplifier for Linux" +HOMEPAGE="https://guitarix.org/" +SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="bluetooth debug lv2 nls +standalone zeroconf" +REQUIRED_USE="|| ( lv2 standalone )" + +COMMON_DEPEND="dev-cpp/eigen:3 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0 + dev-libs/glib:2 + >=media-libs/libsndfile-1.0.17 + >=media-libs/zita-convolver-3:= + media-libs/zita-resampler + >=net-misc/curl-7.26.0 + >=sci-libs/fftw-3.1.2:3.0= + x11-libs/gtk+:3 + lv2? ( media-libs/lv2 ) + standalone? ( + dev-libs/boost:= + media-libs/liblrdf + media-libs/lilv + virtual/jack + bluetooth? ( net-wireless/bluez ) + zeroconf? ( net-dns/avahi ) + ) +" +# roboto fonts are required for correct ui rendering +RDEPEND="${COMMON_DEPEND} + standalone? ( + media-fonts/roboto + ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + dev-lang/sassc + virtual/pkgconfig + nls? ( + dev-util/intltool + sys-devel/gettext + ) +" + +DOCS=( changelog README ) + +PATCHES=( + "${FILESDIR}"/${P}-noexecstack.patch + "${FILESDIR}"/${P}-nostrip.patch +) + +src_configure() { + local myconf=( + --cxxflags-debug="" + --cxxflags-release="-DNDEBUG" + --ldflags="${LDFLAGS}" + --enable-lfs + --lib-dev + --no-desktop-update + --no-faust + --no-ldconfig + --shared-lib + $(use_enable nls) + $(usex bluetooth "" "--no-bluez") + $(usex debug "--debug" "") + $(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui") + $(usex standalone "" "--no-standalone") + $(usex zeroconf "" "--no-avahi") + ) + waf-utils_src_configure "${myconf[@]}" +} diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild index a9962b2bb430..95daa28f6cff 100644 --- a/media-sound/guitarix/guitarix-9999.ebuild +++ b/media-sound/guitarix/guitarix-9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE='threads(+)' @@ -10,8 +11,9 @@ inherit python-any-r1 waf-utils xdg git-r3 MY_P="${PN}2-${PV}" DESCRIPTION="Virtual guitar amplifier for Linux" -HOMEPAGE="http://guitarix.org/" +HOMEPAGE="https://guitarix.org/" EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git" +S="${WORKDIR}/${P}/trunk" LICENSE="GPL-2" SLOT="0" @@ -21,15 +23,14 @@ REQUIRED_USE="|| ( lv2 standalone )" COMMON_DEPEND="dev-cpp/eigen:3 dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-lang/sassc + dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= - x11-libs/gtk+:2 + x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= @@ -40,21 +41,22 @@ COMMON_DEPEND="dev-cpp/eigen:3 zeroconf? ( net-dns/avahi ) ) " -# clearlooks gtk engine and roboto fonts are required for correct ui rendering +# roboto fonts are required for correct ui rendering RDEPEND="${COMMON_DEPEND} - x11-themes/gtk-engines standalone? ( media-fonts/roboto ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} + dev-lang/sassc virtual/pkgconfig - nls? ( dev-util/intltool ) + nls? ( + dev-util/intltool + sys-devel/gettext + ) " -S="${WORKDIR}/${P}/trunk" - DOCS=( changelog README ) src_configure() { diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest index 649adbfd8213..baa49190441a 100644 --- a/media-sound/mp3asm/Manifest +++ b/media-sound/mp3asm/Manifest @@ -1,3 +1,4 @@ +AUX mp3asm-0.1.3-fix-autotools.patch 179 BLAKE2B 423f263f1305f23189861ace8c44f8f4c10df05b7949d9d0b0b93f7f380eb8f546bd5653af1cd9d289dbf477db823a75bee8cb5058de8b842cf70d3f90c8c60e SHA512 052cfe837ef8736e974f1991b175c2a7d52992ffc80e11daa474d533a72f64ea333a9f2d0cb808f87f6d298c42fdd27706e6ecd863af28826fd525cbe386338a DIST mp3asm-0.1.3-1.tar.bz2 46530 BLAKE2B 031ce687662f107285e373ccb1702743cd340017dd8b49414576454f12338824d1e417625fa1f6228d5f1dff33879b91c88e88ce2c7ee8deb498d01d2d165b57 SHA512 c22fa3a041940fa7826d3f5ea18dd42807ca9c7d87a56c9ae10cd96606e53d17d8e6259be75a77d1101d6cda033e8b48e2dd2303e91fdca338af19ef3522fb83 -EBUILD mp3asm-0.1.3-r2.ebuild 587 BLAKE2B 554c318a3c70b8e2b80b1cc97edf7cc577fdc0f673b0a559226f09de0d9c9ee5eb0ccfc6dd06d78f4734929a6fe8b3447f1ba2ad735533670d75daa4090cf87d SHA512 bcd9130caf24e1b5d1159eddd8bc1da6ed750499ed2a931099845c69c28bbc3f3086994d53da24bb54e66c255058dbbb9cb4f6bcb0950929668696205f025d64 +EBUILD mp3asm-0.1.3-r2.ebuild 624 BLAKE2B 0f127a8a5774ca3824c17f0fa7cdac16c66de67626a16ed9f54ca69b52a6f7a8409343e709a7fb755a74962672ea482cc498375801fa06993a7a36a440960adf SHA512 3aa235b52897954da1b2b4ed03ebe0787585b5c5da9e919fd08e4897ad22132a2dc75b4f972a677bb2852d63a23c8891342dd548af90e33f9a0f8a68f4d220c3 MISC metadata.xml 329 BLAKE2B e711686a35811a7bb61cd0fabe8d85630e6f1e86e44a3c497604850813e80f1a6658bd392a8018330e9c19458b80e976063ce94b9aae18ef6361198f4ef1bd9b SHA512 abbfd0fe24ced7e49baded7270f11e905e466e0a0c859001bf09f0b3a1e6501e463a2547577c398d1eeb6b47c1bc91ab73c3c89308963f753d8795a8f58490a7 diff --git a/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch b/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch new file mode 100644 index 000000000000..334050d441a9 --- /dev/null +++ b/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -7,8 +7,6 @@ + dnl Checks for programs. + AC_PROG_LN_S + +-CFLAGS="-g -O -Wall" +- + dnl Checks for libraries. + + dnl Checks for header files. diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild index 467241065e7c..a03af0ddc1db 100644 --- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild +++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit autotools -MY_PV="${PV}-1" # Patchlevel +MY_PV="${PV}-1" # Patchlevel DESCRIPTION="A command line tool to clean and edit mp3 files" HOMEPAGE="https://sourceforge.net/projects/mp3asm/" @@ -18,11 +18,15 @@ KEYWORDS="amd64 ppc sparc x86" # the author uses weird numbering... S="${WORKDIR}/${PN}-0.1" -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch ) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf } src_install() { - dobin src/mp3asm - dodoc Changelog README + default + dodoc Changelog } diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest index e593fde86bf2..c5771fb32803 100644 --- a/media-sound/mumble/Manifest +++ b/media-sound/mumble/Manifest @@ -1,6 +1,4 @@ -DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7 -EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4 -EBUILD mumble-1.3.1.ebuild 3785 BLAKE2B f513550966ec70ed598e87c34bf890e27103149b54bf40a990f0915a01cee3bb324094226b9eed3faf29a6e0ebd0593a9eff07b908eb549793a39ac574d240c6 SHA512 3a137cf5da5f699d5da56e86f0008725e3d0dfe66efd9f64259a73603ba7c5a7f66f431084ad0bf02fb6390b6cefc9a96795b3db84f663f9c06b1f49a3716577 -EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4 +EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba +EBUILD mumble-9999.ebuild 3814 BLAKE2B 059e88f3d7a727ca707083d0dabdc05f80c673cdba9486803c4f0bbd0e54ddde3e9de4f4da5633cf8594768dbbfff6db4ccd402bcfa52c66d7e4273c5eea8e46 SHA512 e6d6282eeaea82c2f097bd89f37f8751ab7bdb9b1db03e12c7d72a79b534180db4c8d3b8b07e6b623bf466b239f997f3534808e632dccf0c2c4b8012709fdb92 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9 diff --git a/media-sound/mumble/mumble-1.3.0.ebuild b/media-sound/mumble/mumble-1.3.0.ebuild deleted file mode 100644 index 7f2856cbf127..000000000000 --- a/media-sound/mumble/mumble-1.3.0.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop multilib-build qmake-utils xdg - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" -HOMEPAGE="https://wiki.mumble.info" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" - EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src ) -else - if [[ "${PV}" == *_pre* ]] ; then - SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" - else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz - https://dl.mumble.info/${MY_P}.tar.gz" - S="${WORKDIR}/${P/_*}" - fi - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -LICENSE="BSD MIT" -SLOT="0" -IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - >=dev-libs/protobuf-2.2.0:= - >=media-libs/libsndfile-1.0.20[-minimal] - >=media-libs/speex-1.2.0 - media-libs/speexdsp - sys-apps/lsb-release - x11-libs/libX11 - x11-libs/libXi - alsa? ( media-libs/alsa-lib ) - dbus? ( dev-qt/qtdbus:5 ) - g15? ( app-misc/g15daemon ) - jack? ( virtual/jack ) - !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) - libressl? ( dev-libs/libressl ) - opus? ( >=media-libs/opus-1.0.1 ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.41.0 - x11-base/xorg-proto -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -# NB: qmake does not support multilib but it's fine to configure -# for the native ABI here -src_configure() { - myuse() { - [[ -n "${1}" ]] || die "myuse: No use option given" - use ${1} || echo no-${1} - } - - local conf_add=( - bundled-celt - no-bundled-opus - no-bundled-speex - no-embed-qt-translations - no-server - no-update - $(myuse alsa) - $(myuse dbus) - $(usex debug 'symbols debug' release) - $(myuse g15) - $(usex jack '' no-jackaudio) - $(myuse opus) - $(myuse oss) - $(myuse portaudio) - $(myuse pulseaudio) - $(myuse rnnoise) - $(usex speech '' no-speechd) - $(usex zeroconf '' no-bonjour) - ) - - use pch || conf_add+=( no-pch ) - - eqmake5 "${S}/main.pro" -recursive \ - CONFIG+="${conf_add[*]}" \ - DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" -} - -multilib_src_compile() { - local emake_args=( - # place libmumble* in a subdirectory - DESTDIR_ADD="/${MULTILIB_ABI_FLAG}" - {C,L}FLAGS_ADD="$(get_abi_CFLAGS)" - ) - # build only overlay library for other ABIs - multilib_is_native_abi || emake_args+=( -C overlay_gl ) - emake "${emake_args[@]}" - emake clean -} - -src_compile() { - multilib_foreach_abi multilib_src_compile -} - -multilib_src_install() { - local dir=$(usex debug debug release) - dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* - if multilib_is_native_abi; then - dobin "${dir}"/mumble - dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* - fi -} - -src_install() { - multilib_foreach_abi multilib_src_install - - newdoc README.Linux README - dodoc CHANGES - dobin scripts/mumble-overlay - - insinto /usr/share/services - doins scripts/mumble.protocol - - domenu scripts/mumble.desktop - - doicon -s scalable icons/mumble.svg - - doman man/mumble-overlay.1 - doman man/mumble.1 -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - echo - elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." - elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." - echo -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-sound/mumble/mumble-1.3.1.ebuild b/media-sound/mumble/mumble-1.3.1-r1.ebuild index 6e81c6c62616..c462111f1123 100644 --- a/media-sound/mumble/mumble-1.3.1.ebuild +++ b/media-sound/mumble/mumble-1.3.1-r1.ebuild @@ -21,7 +21,7 @@ else https://dl.mumble.info/${MY_P}.tar.gz" S="${WORKDIR}/${P/_*}" fi - KEYWORDS="~amd64 ~arm64 x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="BSD MIT" @@ -118,10 +118,11 @@ src_compile() { multilib_src_install() { local dir=$(usex debug debug release) - dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* + insinto /usr/$(get_libdir)/${PN} + doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* if multilib_is_native_abi; then dobin "${dir}"/mumble - dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* + doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* fi } diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index 7f2856cbf127..0d89e8057bf9 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -118,10 +118,11 @@ src_compile() { multilib_src_install() { local dir=$(usex debug debug release) - dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* + insinto /usr/$(get_libdir)/${PN} + doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* if multilib_is_native_abi; then dobin "${dir}"/mumble - dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* + doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* fi } diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index 178a939db0d3..6867f742d394 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -2,9 +2,7 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 -DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7 -EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95 -EBUILD murmur-1.3.1.ebuild 3689 BLAKE2B 26646b012d7c104a0dfec1f9829d1558c4a464b70bd6c906b7f32032a434a8e264a83c37ce6b63b581232acc9598d008e92915292de974ea7e9625e19c7eae19 SHA512 d8743685b61d4baa2bb72538dc3e05feb41c7bf7b01f76fa6a482eac5f5ca9906ba7aff4fd1fbed6d44117651f6f9eb72c5717d88e61065044ff78f93c9f7627 +EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb diff --git a/media-sound/murmur/murmur-1.3.0.ebuild b/media-sound/murmur/murmur-1.3.0.ebuild deleted file mode 100644 index bd399783509e..000000000000 --- a/media-sound/murmur/murmur-1.3.0.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils systemd readme.gentoo-r1 - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" -HOMEPAGE="https://wiki.mumble.info" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" - EGIT_SUBMODULES=( '-*' ) -else - MY_PN="mumble" - if [[ "${PV}" == *_pre* ]] ; then - MY_P="${MY_PN}-${PV}" - SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - else - MY_PV="${PV/_/-}" - MY_P="${MY_PN}-${MY_PV}" - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz - https://dl.mumble.info/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_PN}-${PV/_*}" - fi - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="+dbus debug +ice pch zeroconf" - -RDEPEND=" - acct-group/murmur - acct-user/murmur - >=dev-libs/openssl-1.0.0b:0= - >=dev-libs/protobuf-2.2.0:= - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - || ( - dev-qt/qtsql:5[sqlite] - dev-qt/qtsql:5[mysql] - ) - dev-qt/qtxml:5 - sys-apps/lsb-release - >=sys-libs/libcap-2.15 - dbus? ( dev-qt/qtdbus:5 ) - ice? ( dev-libs/Ice:= ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" - -DEPEND="${RDEPEND} - >=dev-libs/boost-1.41.0 -" -BDEPEND=" - acct-group/murmur - acct-user/murmur - virtual/pkgconfig -" - -DOC_CONTENTS=" - Useful scripts are located in /usr/share/doc/${PF}/scripts.\n - Please execute:\n - murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n - chown murmur:murmur /var/lib/murmur/murmur.sqlite\n - to set the build-in 'SuperUser' password before starting murmur. - Please restart dbus before starting murmur, or else dbus - registration will fail. -" - -src_prepare() { - default - - if [[ "${PV}" == *9999 ]] ; then - pushd scripts &>/dev/null || die - ./mkini.sh || die - popd &>/dev/null || die - fi - - sed \ - -e 's:mumble-server:murmur:g' \ - -e 's:/var/run:/run:g' \ - -i "${S}"/scripts/murmur.{conf,ini.system} || die - - # Adjust systemd service file to our config location #689208 - sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ - -i scripts/${PN}.service || die -} - -src_configure() { - myuse() { - [[ -n "${1}" ]] || die "myconf: No use flag given." - use ${1} || echo "no-${1}" - } - local conf_add=( - no-client - $(myuse dbus) - $(usex debug 'symbols debug' release) - $(myuse ice) - $(myuse pch) - $(usex zeroconf '' no-bonjour) - ) - - eqmake5 main.pro -recursive \ - CONFIG+="${conf_add[*]}" -} - -src_install() { - dodoc README CHANGES - - docinto scripts - dodoc -r scripts/server - docompress -x /usr/share/doc/${PF}/scripts - - local dir="$(usex debug debug release)" - dobin "${dir}"/murmurd - - local etcdir="/etc/murmur" - insinto ${etcdir} - newins scripts/${PN}.ini.system ${PN}.ini - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/murmur.logrotate murmur - - insinto /etc/dbus-1/system.d/ - doins scripts/murmur.conf - - insinto /usr/share/murmur/ - doins src/murmur/Murmur.ice - - newinitd "${FILESDIR}"/murmur.initd-r1 murmur - newconfd "${FILESDIR}"/murmur.confd murmur - - systemd_dounit scripts/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf - - keepdir /var/lib/murmur /var/log/murmur - fowners -R murmur /var/lib/murmur /var/log/murmur - fperms 750 /var/lib/murmur /var/log/murmur - - # Fix permissions on config file as it might contain passwords. - # (bug #559362) - fowners root:murmur ${etcdir}/murmur.ini - fperms 640 ${etcdir}/murmur.ini - - doman man/murmurd.1 - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/media-sound/murmur/murmur-1.3.1.ebuild b/media-sound/murmur/murmur-1.3.1.ebuild index 18faea156060..606e4379065a 100644 --- a/media-sound/murmur/murmur-1.3.1.ebuild +++ b/media-sound/murmur/murmur-1.3.1.ebuild @@ -24,7 +24,7 @@ else https://dl.mumble.info/${MY_P}.tar.gz" S="${WORKDIR}/${MY_PN}-${PV/_*}" fi - KEYWORDS="~amd64 ~arm x86" + KEYWORDS="amd64 ~arm x86" fi LICENSE="BSD" diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest index 3eb14df40463..9a39ec0a6946 100644 --- a/media-sound/muse/Manifest +++ b/media-sound/muse/Manifest @@ -1,4 +1,4 @@ -AUX muse-0.9.2_p20161002-fix-build-system.patch 2589 BLAKE2B 0deac04559921842826ff713ebae8c60fc5f6a3b0e5648e99f3490a569f5a7f7d9f6713026e77a4c43c4ef83bdd8556b0099fe77e0eb5ea2e9df5a13f20c2e20 SHA512 c0711f1e265721e7395605282d69d0c7d620c46a5fef05a9afdd2ca82c115ef67c442d8a92411902881ac4c632beb85dba9ed5f8dc16f87c7004dc3e378330c4 +AUX muse-0.9.2_p20161002-fix-build-system.patch 2757 BLAKE2B 70b040cb30d71f303313411980e02214c0979a9555e39260edc883945e9d36a6f4dec41287a7a1f5f5a308096bc98d2671886a69fd855ee1684b884a8d7c02b5 SHA512 e4df70777579eb42d93038bf9437c36ca3a0944050186316bb9ce94a00e34492c4fc502aed26aeb64f283a7b73e1d9448105a33838819a0f0086b90768ed37ff DIST muse-0.9.2_p20161002.tar.gz 996253 BLAKE2B 7f86698fa60719235e68ad3766d9dbb19e57e55e94cab8b4c97da5be5990d132e8aa7f63034c5945d74fe3bef4c4945435791648c064be6fe65bb0d25d39d04e SHA512 7d5b35c64b1ccae14330bb35ba0e32661f6f7445055e1854c7e5e530a7645405da03836e919b6151872f254c754d99d045b9c80938148454f521d3d117332208 -EBUILD muse-0.9.2_p20161002.ebuild 1082 BLAKE2B f6d7e40dcd20fadb38b0e5224cd7b40c2ced3905263550ad0ffb9c3891974e708e2a3394c75744ec88c0171a8d559ca9264cea44c0e1b382f46b004c20241588 SHA512 74cf464d463a617835b9c809de2194e6543395a245443f8971f9e6539497cd36520184504184371199ff4549d39b183feef56dde97afeef262904e85270c50d7 +EBUILD muse-0.9.2_p20161002.ebuild 1092 BLAKE2B 9c8b12c90034f20b84173d0ec468f026f024f150512e5f4b9d71bde00a1465f39ce75c7ef1af23590b6ade80fc4bffe1615c77ada17bf2030cfd1f503dfaa299 SHA512 73a6f7953ceadb0e6d5b5ad9e7071737a1b73d44fc683bbb94a19b4fd12e17aef407bff9a69e30d0502dae762010e996524b2c114643e4b3c5e8361ed39c1c96 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch index 7ca30e6da689..456dca9b9dee 100644 --- a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch +++ b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch @@ -20,7 +20,15 @@ Fix build system to properly install files and prevent underlinking. dnl ============================================================== -@@ -178,19 +178,12 @@ +@@ -67,6 +67,7 @@ + AC_PROG_CPP + AC_SEARCH_LIBS([strerror],[cposix]) + AC_PROG_RANLIB ++AM_PROG_AR + + + dnl ============================================================== +@@ -178,19 +179,12 @@ # this is really libcdk's configuration, needs to be reviewed if correct # see src/ncursesgui/libcdk if test x$want_ncurses_gui = xyes; then @@ -46,7 +54,7 @@ Fix build system to properly install files and prevent underlinking. if test x$have_ncurses_h = xyes; then AC_DEFINE([GUI_RUBIK], 1, [Have ncurses GUI]) -@@ -326,8 +319,13 @@ +@@ -326,8 +320,13 @@ dnl documentation @@ -62,7 +70,7 @@ Fix build system to properly install files and prevent underlinking. dnl ============================================================== -@@ -402,6 +400,7 @@ +@@ -402,6 +401,7 @@ AC_CONFIG_FILES([ Makefile diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild index 89771e227748..e296b01d6582 100644 --- a/media-sound/muse/muse-0.9.2_p20161002.ebuild +++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -14,24 +14,23 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="doc gtk jack ncurses portaudio" -RDEPEND="media-sound/lame +RDEPEND=" + media-sound/lame media-libs/libvorbis - media-libs/libsndfile + media-libs/libsndfile:= media-libs/libogg media-libs/libshout media-libs/libsamplerate gtk? ( x11-libs/gtk+:2 ) jack? ( media-sound/jack-audio-connection-kit ) ncurses? ( sys-libs/ncurses:0= ) - portaudio? ( media-libs/portaudio ) -" -DEPEND="${RDEPEND} + portaudio? ( media-libs/portaudio )" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen )" -PATCHES=( - "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch -) +PATCHES=( "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch ) src_prepare() { default diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest index 22b061ef7076..93426dbe3af3 100644 --- a/media-sound/music-file-organizer/Manifest +++ b/media-sound/music-file-organizer/Manifest @@ -1,3 +1,3 @@ DIST music-file-organizer-1.0.2.tar.xz 501840 BLAKE2B 7ec80a3d49ec2cd36882f9bb5d78f1f82aba9f9b8690380f1fcda3f9fab4ba5a4879e94f4457fb079ceb27d27b599cf500da595d9f37736df3fda709cf2ee016 SHA512 61546f595b801d4377bbfb7e52517a149cae90dee6dbb29c81a15ae6c055d535b4b095928e6918b4e0784e1d52136705a4822cb294e9b665a996afc68b4951f0 -EBUILD music-file-organizer-1.0.2.ebuild 858 BLAKE2B 2cfdd5b4c0bf2bd84f701c211452813ea25c0b81f63ca0489116f1d48fc89c425a7eb0666109343cf001c997a91b210b48126c23ca046b33ac7d318ed802fad7 SHA512 62be40216b61076d8e00c4900638f53a60a4a013ee5cc716c20f3d9dc86880ccbdfe2e2f2b155123d8e3aee627b00b370e77e766bea94e09ca1a5b531b4ac0c6 +EBUILD music-file-organizer-1.0.2.ebuild 883 BLAKE2B 7875d0bdc46ed83f10c21b33ff846329db268dc7a01748e07e79c0f35df83555290b6cd3c04bfc9d63fa9b38ac4b3569cfcdb5a90862fb9a3d18ff64a4e440ae SHA512 0870d8fc9655ad3ffa9360b2376d897789dfec70bb37c73e0432608909b5aa4b5c4746d27faf937cff636f305055f6b890152cf679f8b2b4b38f96aa128af4f7 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5 diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild index 90beb71cf185..3906dd2747e7 100644 --- a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild +++ b/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 DESCRIPTION="Organizes audio files into directories based on metadata tags, along with other metadata utilities." -HOMEPAGE="http://blog.zx2c4.com/813" -SRC_URI="http://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz" +HOMEPAGE="https://git.zx2c4.com/music-file-organizer/about/" +SRC_URI="https://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest index 2ceb40339244..1d25b67a3246 100644 --- a/media-sound/ogmtools/Manifest +++ b/media-sound/ogmtools/Manifest @@ -1,7 +1,8 @@ AUX ogmtools-1.5-comments.patch 977 BLAKE2B d12a056f8e6773737e612076bbda53b8c50912f99c7d1649d762c6d8c3c81a8f7fc9230b46e74724a03046a7367ad2331d755e1a2db19d665f2055d33d29d2df SHA512 345ca99a0685df2c9904e182c6046a367541d07f0eff8a7667650557d1729059dcd995320c7ffd40e5c52bdd7fa0ab648a53e85fb0f8a7628753dd5a2c4d027a AUX ogmtools-1.5-endian-fix.patch 333 BLAKE2B c1d544bc210eeb464467b7a324f048af234986e4d52573f6d9ed060fd8f6d2aaa96d7a6868a10caf2e1c895db38f6deadb4bd605a5d5920f0e052b4f781d5959 SHA512 a2de28d2063227c6f9d4e8ca2d5d10210f5bd72c1cf02087cd4d437fe211095ff8035320c75f23221cbfb11ade6bdfaa20e27fc09fbaeee26dcd2dc0d1239221 +AUX ogmtools-1.5-fix-autotools.patch 1169 BLAKE2B 4e5f2472fa1f17132452a0960f79aa8bc08d4cffb541d304f32cdeb15895545b0676045a0659cd5c443dfe2de912abefa1d8bfc37196ad983d2ce7f759f8e567 SHA512 bac193ecea6f76c0c4ac8303fabcf36329c5d090dbb4bb862762d62e12fd8398e715084f4cdfced3c48ca49e2cad93defca5974a5c0e948b65d37168bfbb909a AUX ogmtools-1.5-summary_length.patch 330 BLAKE2B b59fa0606b2a1bf60c355c4d2ecb2ee58c6f5419aee1471cd27bbbf365bad32d123f57c6f40deb02139a453efca50daa15f255ec56173e9e49803f434c56f063 SHA512 00212dd740d2de3702b717089949ae6961c0faeffe857bef61f1b3f019b8fc88c510302f5802d28d88d07e051d6859612a46b06f603cfbeb3a72afca565e5cae AUX ogmtools-1.5-vorbis_verbosity.patch 365 BLAKE2B 57b1ca8a076f8ccc5a09e77a869e784fd7dfc79240b9b14315918d95fab45cc91ce92f8a8914d5c7efdad9981389f4c1e4f41f61bb55ec4507b120159fcda549 SHA512 8d5fe06c22404198f3956c18bf91c986d212fda1987f33b8c247f6af8cd7f3ab690c105278d0f1ba188130bcfdf8dca3659a9da1c42fe19fac0692e7a853064e DIST ogmtools-1.5.tar.bz2 214934 BLAKE2B d9d3aa3afe0a64a6dd8201c030120a2ec9cc752037c48c1ff58b3334a5006bbd5974ff2eacb4c7e8a17c722f8fbc5ac033a64840edb179da9d66bda6743eb71d SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee -EBUILD ogmtools-1.5-r2.ebuild 812 BLAKE2B bb3700c249c13b3e3ef8a400f2f0e1d05ccb5c11eaa9507278dcf683d9cf08d3171699556562880257156bfdf7330851cb7490fd736a47f8e4c91aa86f03480b SHA512 83652a42d0ee41524421ab8071762020e20184be2ecb2be4f3915cd45d6bea49c6fac50d2405f62ff228c0c22387e116440f62236627a55f7b7d53c79d15ead5 +EBUILD ogmtools-1.5-r2.ebuild 939 BLAKE2B fd812192c34c58da038eb6ea8694ca4294b52990adb01899d117e4f5023f308ddf370a6bacd1a5694a8898176798fc7637b7be562a130b0565e417dc7819b72d SHA512 fdc04f81ae84216cc11ae60edf3c9596dc706caa289f937bf25ce8e5511b14f4c5aa8397331a75c6c5d2ecfd5f2d23d4514ee0c591b8f7b3942fe4d6331f2018 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch new file mode 100644 index 000000000000..74aba9463062 --- /dev/null +++ b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch @@ -0,0 +1,44 @@ +--- a/avilib/Makefile.am ++++ b/avilib/Makefile.am +@@ -7,7 +7,8 @@ + + INCLUDES = -I./ + +-CFLAGS=-O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@ ++AM_CFLAGS=-Wall ++AM_CPPFLAGS=-DLINUX + libavi_a_SOURCES = avilib.c avidump.c avimisc.c xio.c + + EXTRA_DIST = avilib.h README.avilib +--- a/configure.in ++++ b/configure.in +@@ -8,6 +8,7 @@ + AC_PROG_GCC_TRADITIONAL + AC_PROG_CPP + AC_PROG_RANLIB ++AM_PROG_AR + + XIPH_PATH_OGG() + XIPH_PATH_VORBIS() +@@ -31,7 +32,7 @@ + dnl Check for headers + AC_HEADER_STDC() + +-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@" +-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@" ++CFLAGS+=" -Wall -Wno-sign-compare" ++CXXFLAGS+=" -Wall -Wno-sign-compare" + + AC_OUTPUT(Makefile avilib/Makefile) +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,9 @@ + + AUTOMAKE_OPTIONS = dist-zip foreign + ++AM_CFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS) $(PROFILING_CFLAGS) ++AM_CXXFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS) $(PROFILING_CFLAGS) ++ + SUBDIRS = avilib + + if HAVE_LIBDVDREAD diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild index 7e1a4b01a91a..28fb209d7f3c 100644 --- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild +++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit autotools DESCRIPTION="Information, extraction or creation for OGG media streams" HOMEPAGE="https://www.bunkus.org/videotools/ogmtools/" @@ -12,20 +14,27 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" IUSE="dvd" -RDEPEND="dvd? ( media-libs/libdvdread ) - media-sound/vorbis-tools" +RDEPEND=" + media-sound/vorbis-tools + dvd? ( media-libs/libdvdread )" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-comments.patch" - "${FILESDIR}/${P}-endian-fix.patch" - "${FILESDIR}/${P}-vorbis_verbosity.patch" - "${FILESDIR}/${P}-summary_length.patch" + "${FILESDIR}"/${P}-comments.patch + "${FILESDIR}"/${P}-endian-fix.patch + "${FILESDIR}"/${P}-vorbis_verbosity.patch + "${FILESDIR}"/${P}-summary_length.patch + "${FILESDIR}"/${P}-fix-autotools.patch ) +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + src_configure() { - econf \ - $(use_with dvd dvdread) + econf $(use_with dvd dvdread) } src_install() { diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest index ab1c94820287..2f8268854548 100644 --- a/media-sound/splay/Manifest +++ b/media-sound/splay/Manifest @@ -1,7 +1,7 @@ AUX splay-0.9.5.2-external-id3lib.diff 583 BLAKE2B bea1a5079d03b0fd602fcbe86e1a731fe3492c9fb7bd29836cc04d32065a2d648cedf590f64817e78a040212312d859c4e7b8aae6dbcb33ed1f0c5898867a9ce SHA512 fe5db7a4a624c15dbcfff3c1b6087b33970ae09ecdc6f83348eb6da7cd3ead5df71fac6cbabe6f5b1d3389696676da390982216f53acf9450511bfd9dbfa097e -AUX splay-0.9.5.2-fix-buildsystem.patch 6083 BLAKE2B f30ea37cbeff163df61d0b2a7930150812975ee981f0d7c310c6aaf4e09d91776188535a9b47dc7c7cfcc55a4b2a7b3b8f7f68705f0398bfc18203a35bd5c71a SHA512 135ff607f47322fc13d8d94277f24e4d844e04c9557e689e93d3bec80cb5806f631ebcb07f6b19be7724946592005359f558f0971fe62c5c3225f5c9cd274b95 +AUX splay-0.9.5.2-fix-buildsystem.patch 5907 BLAKE2B 5f352ac545968c53d27c5719de5ab431bbfddf213e5a8a75eb85a9d9893bb82e2a51ed996869fdfad33d3aa3f0070ede738b4ab1f02f2ccfbe61faa9a49fc692 SHA512 ad06d2368ad657717a5d54d69bdeaf8deb0f467b8f983fa46cfef265ffd05ca083888be5a606581532624c8a7ba69b1018dc98a6a434b33b16198e035c5c0fbf AUX splay-0.9.5.2-fix-c++14.patch 953 BLAKE2B 74f464a8a222bbdcc7d414046f998e490e3a81565ce4d0125fe2fb39bc90e4b33b51e8cfb1920f502ffc628f578d47c40621516988b3adfa566e523d9c8251e6 SHA512 150c4dbbb9f2f7dded871d245daffb25c4b3e67f6fe0db09a1f7c893dc2ef8a96eed70aefb32c4418aa83264b82d8a8504c29cb5561e0287fd448a0d398c360b AUX splay-0.9.5.2-gcc43-2.patch 1838 BLAKE2B bd43ad5a0733aae6a76e78f1c2a9ea752205e1767929505bcee8d831559e703888cc50e766387d90bdd3ed9a7516ffbbaf82afbb79392b830ec5cf9c1ea964f5 SHA512 41da577fd4fc7e28d99fd7dc4b340e5555cddef8965e05a2b166a776867a7ec610befe7e7231cd91fb695e438b6c9ba01b688e1030a0fe48d0636c72b6380cf2 DIST splay-0.9.5.2.tar.gz 105510 BLAKE2B fd25a4acb842ecfead7200532e12185da2d1b60bfb099c6339234df7a0ca6cbc2083b12ac32bdd4878744b9de1972196ef19b201b9a7c171b09512ef54639987 SHA512 cab1fa2c753c0d7be58b29328db6c444872969b33b24191409efcf782201716d10b14109f23b2f2368909aa60a8a517ec894aeeb649ee0ac5811413a8ebeae09 -EBUILD splay-0.9.5.2-r2.ebuild 634 BLAKE2B b270e83b1e1c554d78f0cd7c47b175b0e26e17aa155e09d9cb3ffb89bd743866e1fec30f0f150d922c42e1756a99986313faaeb6f731110f48c9f40a37d4197d SHA512 6872f4e3c72b6af615a46b5888baf646749060811c85ad32ac6fadf2b4b305b7d77f77ef8f0d76720f08912eb79d2a82c2204ef64baf9d3d4b64c4931c3bf405 +EBUILD splay-0.9.5.2-r2.ebuild 623 BLAKE2B 3863475c6e86c525bfd209ce5a7984a1552df39b138904f1854e2d3b630914bbfff79004085fa7959939262e531e3e57b31f3420a7501d6ccf0f6cb08ef88bc1 SHA512 3d375ebc74b13ab734e014089180abded936a9996867dd354bb76e33b5a16b4d721b1d47f877b73a08749d699d4e3af6e4535dd5dc88464e04108cd699b7cd8f MISC metadata.xml 328 BLAKE2B d0e57e006d2048a4ebf4eb9a8912f6a46169db378a9c7ba6e91dddee6d22f768ffa246ce228a15460a08a71cbd1f43e27172dbf624c0aae45af123f19699d0c6 SHA512 90224a6fed46fe48538837e0c6252b1b15f33231b9f639f6ab62e1104ebee98a540a831980920820bb4f00cb0bb5db02fddbb28c51ba68bd83613adf5782243a diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch index 52cea88b89ed..07d6f2d3751c 100644 --- a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch +++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch @@ -2,8 +2,19 @@ * Fix ancient C++ includes using '.h' suffixes * Fix warnings caused by not using 'const char*' ---- splay-0.9.5.2/apps/Makefile.am -+++ splay-0.9.5.2/apps/Makefile.am +--- a/apps/common.cc ++++ b/apps/common.cc +@@ -34,7 +34,7 @@ + int splay_threadnum=50; + #endif + +-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= ++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= + { "Failed to open sound device.", + "Sound device is busy.", + "Buffersize of sound device is wrong.", +--- a/apps/Makefile.am ++++ b/apps/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = splay @XSPLAY@ +bin_PROGRAMS = splay @@ -19,30 +30,8 @@ EXTRA_DIST = $(man_MANS) ---- splay-0.9.5.2/configure.ac -+++ splay-0.9.5.2/configure.ac -@@ -15,7 +15,7 @@ - AC_CHECK_LIB(id3, ID3Tag_New) - AC_CHECK_LIB(m, cos) - AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1) --AC_CHECK_LIB(qt, main,XSPLAY=xsplay) -+ - - if test "$INCLUDEPTHREAD" = 1; then - LIBS="$LIBS -lpthread" ---- splay-0.9.5.2/apps/common.cc -+++ splay-0.9.5.2/apps/common.cc -@@ -34,7 +34,7 @@ - int splay_threadnum=50; - #endif - --char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= -+const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= - { "Failed to open sound device.", - "Sound device is busy.", - "Buffersize of sound device is wrong.", ---- splay-0.9.5.2/apps/splay.cc -+++ splay-0.9.5.2/apps/splay.cc +--- a/apps/splay.cc ++++ b/apps/splay.cc @@ -16,20 +16,23 @@ #include <sys/types.h> @@ -70,8 +59,8 @@ "\t-2 : playing with half frequency.\n" "\t-e : exit when playing is done. (only XSPLAY)\n" "\t-f : display frame and time info (played and remaining).\n" ---- splay-0.9.5.2/apps/splay.h -+++ splay-0.9.5.2/apps/splay.h +--- a/apps/splay.h ++++ b/apps/splay.h @@ -20,7 +20,7 @@ splay_forcetomonoflag, splay_frameinfo; @@ -81,8 +70,8 @@ #ifdef PTHREADEDMPEG extern int splay_threadnum; ---- splay-0.9.5.2/apps/xsplay.cc -+++ splay-0.9.5.2/apps/xsplay.cc +--- a/apps/xsplay.cc ++++ b/apps/xsplay.cc @@ -29,8 +29,8 @@ #include <fcntl.h> #include <string.h> @@ -94,8 +83,24 @@ #include "mpegsound.h" #include "xsplay.h" ---- splay-0.9.5.2/libs/fileplayer.cc -+++ splay-0.9.5.2/libs/fileplayer.cc +--- a/configure.in ++++ b/configure.in +@@ -10,12 +10,12 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_RANLIB ++AM_PROG_AR + + dnl Checks for libraries. + AC_CHECK_LIB(id3, ID3Tag_New) + AC_CHECK_LIB(m, cos) + AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1) +-AC_CHECK_LIB(qt, main,XSPLAY=xsplay) + + if test "$INCLUDEPTHREAD" = 1; then + LIBS="$LIBS -lpthread" +--- a/libs/fileplayer.cc ++++ b/libs/fileplayer.cc @@ -10,7 +10,7 @@ #endif @@ -134,8 +139,8 @@ fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ", server->getversion()+1, ---- splay-0.9.5.2/libs/mpegsound.h -+++ splay-0.9.5.2/libs/mpegsound.h +--- a/libs/mpegsound.h ++++ b/libs/mpegsound.h @@ -230,7 +230,7 @@ Soundplayer() {__errorcode=SOUND_ERROR_OK;}; virtual ~Soundplayer(); @@ -190,8 +195,8 @@ void setforcetomono(bool flag); void setdownfrequency(int value); bool playing(int verbose, bool frameinfo, int startframe); ---- splay-0.9.5.2/libs/mpegtoraw.cc -+++ splay-0.9.5.2/libs/mpegtoraw.cc +--- a/libs/mpegtoraw.cc ++++ b/libs/mpegtoraw.cc @@ -552,7 +552,7 @@ #endif @@ -201,8 +206,8 @@ // Convert mpeg to raw bool Mpegtoraw::run(int frames) { ---- splay-0.9.5.2/libs/rawplayer.cc -+++ splay-0.9.5.2/libs/rawplayer.cc +--- a/libs/rawplayer.cc ++++ b/libs/rawplayer.cc @@ -24,7 +24,7 @@ #define IOCTL(a,b,c) (c = ioctl(a,b,c) ) #endif @@ -230,8 +235,8 @@ return true; } ---- splay-0.9.5.2/libs/rawtofile.cc -+++ splay-0.9.5.2/libs/rawtofile.cc +--- a/libs/rawtofile.cc ++++ b/libs/rawtofile.cc @@ -20,7 +20,7 @@ close(filehandle); } diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild index 2878aaf04bc3..b66657bceebf 100644 --- a/media-sound/splay/splay-0.9.5.2-r2.ebuild +++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,20 +12,19 @@ SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" DEPEND="media-libs/id3lib" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${P}-external-id3lib.diff" - "${FILESDIR}/${P}-gcc43-2.patch" - "${FILESDIR}/${P}-fix-buildsystem.patch" - "${FILESDIR}/${P}-fix-c++14.patch" + "${FILESDIR}"/${P}-external-id3lib.diff + "${FILESDIR}"/${P}-gcc43-2.patch + "${FILESDIR}"/${P}-fix-buildsystem.patch + "${FILESDIR}"/${P}-fix-c++14.patch ) src_prepare() { - mv configure.{in,ac} || die default + mv configure.{in,ac} || die eautoreconf } diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index db0a3d63757b..d167410d0c20 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -3,5 +3,5 @@ DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422 EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db -EBUILD spotify-1.1.26.ebuild 3155 BLAKE2B ad28d773c7ceae34dbd8c292ed9bbb56ad82115517e4eb625adc0a5cf4e15081ef97c2b85e5aeb55f1eaeaffef6cff354175b60c26b0fd7470e9038e16e516aa SHA512 6c356e2903ad8feb9d37e741653d7bac0a38c4ef1ae198ce306b1e35492220dd425478b32a78f106041af6cf803e447bfc7f6b2e76ba7ee5aac5ebf295979537 -MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316 +EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553 +MISC metadata.xml 543 BLAKE2B 13703333c28b0f4a9898a30a9f3b8c2a56d360571ef7afed97b794c4fee154f9989c3f53309b71e1ed3135150d6a5aec8303e269117d0689dcca55d2557fd7d1 SHA512 229addc42faddeeb72208081749107adb25eda1cc8201dd629b474e3f733e78e77a4f2cbecd70c3d308e9946bdeb2d5b475a91180d2bde50447d01fdbf3428b6 diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml index 1e06c14d2fd1..ff06ccc103fe 100644 --- a/media-sound/spotify/metadata.xml +++ b/media-sound/spotify/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <use> <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag> + <flag name="pulseaudio">Constrols the dependency on pulseaudio or apulse</flag> <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag> </use> <maintainer type="person"> diff --git a/media-sound/spotify/spotify-1.1.26.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild index 1d3b666674b0..2310f6ff5afb 100644 --- a/media-sound/spotify/spotify-1.1.26.ebuild +++ b/media-sound/spotify/spotify-1.1.26-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" LICENSE="Spotify" SLOT="0" KEYWORDS="~amd64" -IUSE="libnotify libressl systray pax_kernel" +IUSE="libnotify libressl systray pax_kernel pulseaudio" RESTRICT="mirror strip" BDEPEND=">=dev-util/patchelf-0.10" @@ -29,7 +29,8 @@ RDEPEND=" media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] - || ( media-sound/pulseaudio media-sound/apulse ) + pulseaudio? ( media-sound/pulseaudio ) + !pulseaudio? ( media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest index 3844fafcdb93..5c4aa412c942 100644 --- a/media-sound/streamripper/Manifest +++ b/media-sound/streamripper/Manifest @@ -1,3 +1,4 @@ +AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428 -EBUILD streamripper-1.64.6.ebuild 737 BLAKE2B 17c865c63ea4871373e6e9d8ef0413d7045633ab35514a43026cb75ff323537ce001e92e097ee0de63fef75036726d45585d1fc3a836ba1c47ed7af2a5b853f2 SHA512 d744a2ebe015cddc6f5065bedc3b429f25676370d429fe26b1fd501db92a932cbabc3fd4f0a22ed87941b0caa3694b2e7b65e1fcb4904bae3938bc6f4f3a8d3c +EBUILD streamripper-1.64.6.ebuild 863 BLAKE2B 1e05f8a08fdd595d2c8245186e6ab74e7149039101d6d730eecd083405d96f22be920b063debf550c4715ce0d757ecee5d601201b920b3fe5f82cb6f33119367 SHA512 dc83ee9df6e5147f12a9b9a3509973fc8ec4ad6815bf5abbae523e8224d33e87cc3466cb370cd19ca8aabbfe9dc2c2df0f13bebe57f57c8ebe9181497f51f48b MISC metadata.xml 345 BLAKE2B caf6bf6724c60fd86ad8983db7d4a38472aae47ba7bcc0d50f2796d81ef2c1b38cda0a1cb048b7af88dcf82bbde900c289cc6c803dc121404a6f0c19cb97cfc1 SHA512 6830a4fe1eedf9577237eb166dd97594bfe9e19a5d95578992ba2f90de46ec62679dde5a60fb9abc5887e5e7374b0742676b63e25db0106ec4f84cdac85629f0 diff --git a/media-sound/streamripper/files/streamripper-1.64.6-fix-autotools.patch b/media-sound/streamripper/files/streamripper-1.64.6-fix-autotools.patch new file mode 100644 index 000000000000..a0bb6151700a --- /dev/null +++ b/media-sound/streamripper/files/streamripper-1.64.6-fix-autotools.patch @@ -0,0 +1,11 @@ +diff -ur ORIG/configure.ac MOD/configure.ac +--- ORIG/configure.ac 2020-06-21 13:23:49.051525439 +0200 ++++ MOD/configure.ac 2020-06-21 13:24:14.279437637 +0200 +@@ -24,6 +24,7 @@ + + AC_PROG_INSTALL + AC_PROG_RANLIB ++AM_PROG_AR + + dnl test for inline + AC_C_INLINE diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild index 4364a4d2493c..23969844b457 100644 --- a/media-sound/streamripper/streamripper-1.64.6.ebuild +++ b/media-sound/streamripper/streamripper-1.64.6.ebuild @@ -1,7 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit autotools DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams" HOMEPAGE="http://streamripper.sourceforge.net" @@ -12,14 +14,20 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="vorbis" -RDEPEND="media-libs/libmad +RDEPEND=" + media-libs/libmad media-libs/faad2 >=dev-libs/glib-2.16 vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch ) -DOCS=( CHANGES parse_rules.txt README THANKS ) +src_prepare() { + default + eautoreconf +} src_configure() { econf \ @@ -27,3 +35,8 @@ src_configure() { --without-included-argv \ $(use_with vorbis ogg) } + +src_install() { + default + dodoc parse_rules.txt +} diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest index c75a63ad07fc..f57612684910 100644 --- a/media-sound/supercollider/Manifest +++ b/media-sound/supercollider/Manifest @@ -1,7 +1,7 @@ -AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcda9f9834122f7cc6cd0ebc6722aa94e55ae0f8e1d1cf68ad7a5ac05c0a43d993e10decae034e8d17b09c14caa31314a131b3ff9e SHA512 6e57040b2ab9df0ee9c64d72b95ed5cee2d9f6c76231ff36d72ea8662df1cd49f96cfde68e6ba76b0f15ef2a1d9c78386fd886fcfc337630e47a9d35d036d7b1 -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 -DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46 -EBUILD supercollider-3.10.2.ebuild 3050 BLAKE2B 7ff85b0ed811d3dff6e264fe37581a18999ffe932ad2ba80b1f54e8cf44790a67505c0a5e8fe3d1a860178ff3f8e626958b431253f4fcecb552d9764049c74fe SHA512 3aba6aab63e0de30b25c0ea2cdb1cd773d4bad6dd05dce71ba1a06ee6c6441da40c1c0ab9aaae891705ad68f169c2b6eb36f35090a4a686c9c70906ea9ed4efb -MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895 +AUX supercollider-3.11.0-boost-1.72.patch 1830 BLAKE2B b9a9f358199de97865fc0d8a2e55af2b3312797faa1cde25a2f7d110abf5dc7c14d755f4d2e21e99e1aba28cd0ebe96fa4bb15a190454745181c998ed6033b7f SHA512 cac02e7041dfd233a3624d1772a805bcb58a702195f0e4470f62e68834e494ca51b4719ba328c9de88669ae1b9dae5eb5bcc0bd162df12c6c5ea80829207bfb6 +AUX supercollider-3.11.0-fewer-qt-deps.patch 4412 BLAKE2B 433a51ca1e6b537811392891bec8f4de5aa289473c733c78567d4dddb3c5bc1b2b36c8a8f79222f2a70aa3eb6f0908b20d1cae5e87a9a57c1e56e3725b3787cf SHA512 742b4991c3402acb70ad731d4c535bea9671916360b9e0f17c6611359c1488c23599b613c4a0ff4846a74a55a7af7b5848865998bb4ebae4b0a4944f9caa892c +AUX supercollider-3.11.0-qt-5.15.patch 2709 BLAKE2B ec9fd1241d6a5c244716434e0b1b44528f7c55a29dc9df09b47099685f5453e708edec6f106af9282ab31034bd1aa8f8e73c359e0228bbd9d63dc85ed41b4ddf SHA512 d26ae878b83f6cd5c7eca29893954bda1dd0adf70252e074f218851d931c97bd7b9aa6fd3ca9234ed7e7f0a52e26a28ad77ba3d5d08a7dee37bed2313d22a9b8 +DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da +EBUILD supercollider-3.11.0.ebuild 3173 BLAKE2B acc717d7b2ed67113d1b088092af7e07382d0f2498d2328add2a3507aa8d71ee10b13d4650b9587f7da13590addd1934f7a23e53142048dcc66d855363f9820c SHA512 53ed68c6a543537de6d6fe5191496ba383f5f62d175652cb35a8e6fe5383efc741d8bf7d5ad4cacf27fedcc98375059a7b8e5e23cdc1fc86e752cf855974065f +MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f 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 dd51d0b85d8d..000000000000 --- 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 74fc05ac45cd..000000000000 --- 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 93c8c4fc2ab5..000000000000 --- 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/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 000000000000..94329b867915 --- /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 000000000000..8b1014d99919 --- /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 000000000000..37f803312c28 --- /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 8cd1323c9a04..4fbc15376707 100644 --- a/media-sound/supercollider/metadata.xml +++ b/media-sound/supercollider/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>marcan@marcan.st</email> + <name>Hector Martin</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> SuperCollider is a platform for audio synthesis and algorithmic composition, used by musicians, artists, and researchers @@ -17,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.10.2.ebuild b/media-sound/supercollider/supercollider-3.11.0.ebuild index 94a5cc549598..3b3865ba3a00 100644 --- a/media-sound/supercollider/supercollider-3.10.2.ebuild +++ b/media-sound/supercollider/supercollider-3.11.0.ebuild @@ -7,14 +7,17 @@ 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" +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 X zeroconf" +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 )" +REQUIRED_USE=" + qt5? ( X ) + webengine? ( qt5 ) +" BDEPEND=" virtual/pkgconfig @@ -33,17 +36,17 @@ RDEPEND=" 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 ) + webengine? ( + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwebsockets:5 + ) X? ( x11-libs/libX11 x11-libs/libXt @@ -56,19 +59,18 @@ DEPEND="${RDEPEND} 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 + "${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-Source" +S="${WORKDIR}/SuperCollider-${PV}-Source" src_configure() { local mycmakeargs=( @@ -93,6 +95,10 @@ src_configure() { -DNO_AVAHI=$(usex !zeroconf) ) + use qt5 && mycmakeargs+=( + -DSC_USE_QTWEBENGINE=$(usex webengine) + ) + use debug && mycmakeargs+=( -DSC_MEMORY_DEBUGGING=ON -DSN_MEMORY_DEBUGGING=ON diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest index 56e5ad70ced3..02a9ca782b8f 100644 --- a/media-sound/twolame/Manifest +++ b/media-sound/twolame/Manifest @@ -1,6 +1,6 @@ AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03 -EBUILD twolame-0.3.13-r2.ebuild 1245 BLAKE2B 38d3d36302caf690b239ee5552093556672e774ea88c7a50c528f24280f258c6773ac3a66f918b6c39fcb5195ef9766875efcc744ef3e5ebae7ea5194b63e33a SHA512 628e0ed153bcc07499e3174a689e72fa973e44a597bf063cf2f0a215a130d579650e40509e09e0249293b74052d832a64967b4fa99d168b2062d336fb1f72831 -EBUILD twolame-0.4.0.ebuild 1336 BLAKE2B 3899df2d91fcaae03cc9356e142cfd15203f5c7d99fb1bf44e3316081bfc8a9529a9ff57d73bab086ca3ffb72b09776a0ca2fb9032d06a2521b6bd6cf47773ce SHA512 337ad4449bfaf14f9efafb8a9b836b1c6131eb122b3cb828cc9f23515a9205f68afc0710cf035cd7e010abf464a2fd3596f832b8537ce88e4c17697a44e3a083 +EBUILD twolame-0.3.13-r2.ebuild 1246 BLAKE2B 16e43d7796cb506a1173f6ea691474227745f4f89b07068b093df9816b88b4f39cf04ec4ab07148c7425acfe155a70285bc3af2f2836eb70450556e4bbfeab3d SHA512 9b91fb852268aa8cfeeba8a38530a3f1d9b057c269a5d687ece955fa445c5cd5cc5dcd0a850f2341872290939d78324d826ee01ba0fde032136d97ef528b049f +EBUILD twolame-0.4.0.ebuild 1337 BLAKE2B 4305b9e27367069ea41544970eae755d34a38eb4795ae7ee54e5bf3fbb5394e233e5bf71b1dc855f85c2f62a661ddd4e2d9dbac500b24567bf320ea292778c7b SHA512 8da6d2db35357ac2e0408b588243c73868e58164ec9a26007f6eb58c3d017365d4211b634f1a4c88f528032b274de78543467a9a13b1802a67a25c3ab6e901eb MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8 diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild index eb00272fd67a..fa766464fb55 100644 --- a/media-sound/twolame/twolame-0.3.13-r2.ebuild +++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit eutils ltprune multilib-minimal DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder" -HOMEPAGE="http://www.twolame.org" +HOMEPAGE="https://www.twolame.org" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild index 965e12fe4341..0018eda92a5c 100644 --- a/media-sound/twolame/twolame-0.4.0.ebuild +++ b/media-sound/twolame/twolame-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit multilib-minimal DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder" -HOMEPAGE="http://www.twolame.org" +HOMEPAGE="https://www.twolame.org" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" |