diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /media-sound/bristol | |
parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) |
gentoo resync : 07.10.2018
Diffstat (limited to 'media-sound/bristol')
-rw-r--r-- | media-sound/bristol/Manifest | 7 | ||||
-rw-r--r-- | media-sound/bristol/bristol-0.60.11-r1.ebuild (renamed from media-sound/bristol/bristol-0.60.11.ebuild) | 34 | ||||
-rw-r--r-- | media-sound/bristol/bristol-0.60.9.ebuild | 44 | ||||
-rw-r--r-- | media-sound/bristol/files/bristol-0.60.11-dontcompress.patch | 12 | ||||
-rw-r--r-- | media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch | 26 | ||||
-rw-r--r-- | media-sound/bristol/files/bristol-0.60.9-cflags.patch | 10 |
6 files changed, 63 insertions, 70 deletions
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest index 002559d3206e..d618971f1936 100644 --- a/media-sound/bristol/Manifest +++ b/media-sound/bristol/Manifest @@ -1,8 +1,7 @@ AUX bristol-0.60.11-cflags.patch 7046 BLAKE2B 1b51164828f40f722afeafd955efae25f11cd913bb223f670ea65368a56e8aad1c12480b3d5ec4b0787bebd5425ebc291d71bdc6f74ef1efdcc726d5d388606b SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e +AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6fc485acddf12051a5be33ccde597ba20b8064dc8d597d6e93424c56eacd2ce8cb32bcce7c42bb9530b308136747cf21bbc5b SHA512 dd2fa1859af1e071784138af701caf65d9a076e287d767d64d70cba56462e6ce5c62aea2c50dd617598059372ef1cbe5d9571e3d18110bd64e7789fdb5d9edad AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341 -AUX bristol-0.60.9-cflags.patch 553 BLAKE2B be5f096b1627d15d90b2c915e45e4f9112d41ff29bcc7121141c91928724af4fec0bc78a85ca79f5f398c4c304fb41f61cb41fcbfd84bae80a31bc2a1f6a89c2 SHA512 a687832402925cf596fdc563496607dd366bb6bd0f0ca6873ab28053eb6f03a164308cbcb2a9da3acce199610b225b3581e2dc3dab723693a57a1498aa32c4f3 +AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180 -DIST bristol-0.60.9.tar.gz 4323706 BLAKE2B 39c9a834ba9411f7a434dbc8db8630dd0200c25e645a315b57f1ed8626c816b42da6b5473ff882a01f766ed10240cf7bce98d3091be5c2a8e16c4af0cd6afd5f SHA512 216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff -EBUILD bristol-0.60.11.ebuild 1080 BLAKE2B f12711b0229ea0a2521e38751900c22837609d96de5a1ae5995b4f99d5b7a6cb62964de14f7a47878e87272b6bfb217f01c434ee327decfdd65f544311b878f2 SHA512 9e5066243a226662bc0909e8336365d46422f94104783db4455edaf3a1708a97606429f6c5e215a989ca94605e1c710ed2f57a1a3a322f38c0c0052d7a39ea13 -EBUILD bristol-0.60.9.ebuild 1025 BLAKE2B 26bc547f9f90b14e036d6eca5518145cab2a67dacba5ab41c1e7efbe74e2d3f01f87ea80b6df0e0c1300e371a966841614b7dd5e0910353e18c849965457134e SHA512 21c3632efc9d820b1f6fd5277117c59d03d941767e67710845eb7913dd49ed2a4d295b282b7ecadf735a559988b5fe87835604cb087bbf08d10c434e86b2f8e4 +EBUILD bristol-0.60.11-r1.ebuild 1196 BLAKE2B e32f880e80f8b418bc7a96b319a8ce108f7b6d1ad904c61b3732b16cc3fc497f8fd746e865679240bdde50fb084d2a8f858b09ace5af1f2d415f65f801927aff SHA512 3ec5ec5cda247f80c95189fa89f8783b4af16892df646e5784b814cc025808f366a57424c6571128ee7729494207ab2ad8b6745dd10840790ed295f89ca43430 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild index a5df5a182405..0cb211ac2850 100644 --- a/media-sound/bristol/bristol-0.60.11.ebuild +++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils autotools +inherit autotools DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others" HOMEPAGE="https://sourceforge.net/projects/bristol" @@ -17,31 +17,41 @@ IUSE="alsa oss static-libs" # jack: fails to build if disabled # pulseaudio: not fully supported -RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2 +RDEPEND=" + >=media-sound/jack-audio-connection-kit-0.109.2 + x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 ) - x11-libs/libX11" +" # osc? ( >=media-libs/liblo-0.22 ) -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - x11-base/xorg-proto" + x11-base/xorg-proto +" DOCS=( AUTHORS ChangeLog HOWTO NEWS README ) +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-implicit-dec.patch + "${FILESDIR}"/${P}-dontcompress.patch + "${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch - epatch "${FILESDIR}"/${P}-implicit-dec.patch + default eautoreconf } src_configure() { econf \ - $(use_enable static-libs static) \ --disable-version-check \ + $(use_enable alsa) \ $(use_enable oss) \ - $(use_enable alsa) + $(use_enable static-libs static) } src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -delete || die } diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild deleted file mode 100644 index 1b2744c0bfc8..000000000000 --- a/media-sound/bristol/bristol-0.60.9.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils autotools-utils - -DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others" -HOMEPAGE="https://sourceforge.net/projects/bristol" -SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa oss static-libs" -# osc : configure option but no code it seems... -# jack: fails to build if disabled - -RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2 - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - x11-libs/libX11" -# osc? ( >=media-libs/liblo-0.22 ) -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -DOCS=( AUTHORS ChangeLog HOWTO NEWS README ) - -PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) - -src_prepare() { - autotools-utils_src_prepare - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-version-check - $(use_enable alsa) - $(use_enable oss) - #$(use_enable osc liblo) - ) - autotools-utils_src_configure -} diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch new file mode 100644 index 000000000000..0b7cedc9e29d --- /dev/null +++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch @@ -0,0 +1,12 @@ +--- a/Makefile.am 2012-01-12 18:23:23.000000000 +0100 ++++ b/Makefile.am 2018-10-04 01:22:03.656483227 +0200 +@@ -9,9 +9,6 @@ + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/ + $(INSTALL) -m 0644 $(srcdir)/bristoljackstats.1 $(DESTDIR)$(mandir)/man1/ +- gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1 +- gzip -9fn $(DESTDIR)$(mandir)/man1/bristoljackstats.1 +- cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz + + installdb: + mkdir -p -m 0755 $(DESTDIR)$(bristoldir) diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch new file mode 100644 index 000000000000..9d11b4f7d99b --- /dev/null +++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch @@ -0,0 +1,26 @@ +Description: Stop using alsa/iatomic.h + Technically this is an API breakage in libasound 1.1.2, + but it makes sense to me that this header was removed + by ALSA upstream. + . + bristol was the only user in Debian, and even here the + code that once used it was already commented out. +Author: Adrian Bunk <bunk@stusta.de> +Reviewed-by: James Cowgill <jcowgill@debian.org> + Herbert Parentes Fortes Neto <hpfn@debian.org> +Bug-Debian: https://bugs.debian.org/834180 +Forwarded: no +Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c +=================================================================== +--- a/libbristolaudio/audioEngineJack.c ++++ b/libbristolaudio/audioEngineJack.c +@@ -38,9 +38,6 @@ + #include <string.h> + + #ifdef _BRISTOL_JACK +-#if (BRISTOL_HAS_ALSA == 1) +-#include <alsa/iatomic.h> +-#endif + + /* + * Drop this atomic stuff, it comes from the ALSA library and it not present on diff --git a/media-sound/bristol/files/bristol-0.60.9-cflags.patch b/media-sound/bristol/files/bristol-0.60.9-cflags.patch deleted file mode 100644 index 502b8eb937fe..000000000000 --- a/media-sound/bristol/files/bristol-0.60.9-cflags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bristol-0.60.9/libbrighton/Makefile.am.orig -+++ bristol-0.60.9/libbrighton/Makefile.am -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = foreign - --AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@ -+AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@ - libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@ - - lib_LTLIBRARIES = libbrighton.la |