public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aeolus/files/, media-sound/aeolus/
@ 2020-07-08  7:59 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2020-07-08  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     dbe2c49460148c97c4d2726c3470f1bc7d7e431a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  8 07:59:07 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 07:59:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe2c494

media-sound/aeolus: bump to 0.9.9

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/aeolus/Manifest                        |  1 +
 media-sound/aeolus/aeolus-0.9.9.ebuild             | 59 ++++++++++++++++++++++
 .../aeolus/files/aeolus-0.9.9-fix-Makefile.patch   | 22 ++++++++
 3 files changed, 82 insertions(+)

diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index 726581e0e3f..36fdeeb63ae 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1 +1,2 @@
 DIST aeolus-0.9.7.tar.bz2 66532 BLAKE2B 611d48724b0b85afb8b82e5c2c9590a1da5d22154a5f8c228bdc4f83490113115132c08b79d07d0a5b9a2c66e0b5f9776504a3e919f00f75202ec43d0c7da193 SHA512 ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2
+DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2

diff --git a/media-sound/aeolus/aeolus-0.9.9.ebuild b/media-sound/aeolus/aeolus-0.9.9.ebuild
new file mode 100644
index 00000000000..7f64304a1bd
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.9.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib desktop xdg
+
+DESCRIPTION="A synthesised pipe organ emulator"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	dev-libs/libclthreads
+	media-libs/alsa-lib
+	>=media-libs/zita-alsa-pcmi-0.3
+	sys-libs/readline:0
+	virtual/jack
+	x11-libs/libclxclient
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	media-libs/stops
+"
+
+DOCS=( README COPYING AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-Makefile.patch
+)
+
+src_compile() {
+	cd "${S}"/source || die "Failed to cd to source dir"
+	tc-export CXX
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EXPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	cd "${S}"/source || die "Failed to cd to source dir"
+	emake PREFIX="${D}/usr" install
+	echo "-S ${EPREFIX}/usr/share/stops" > "${T}/aeolus.conf"
+	insinto /etc
+	doins "${T}/aeolus.conf"
+
+	make_desktop_entry aeolus Aeolus "" "AudioVideo"
+}

diff --git a/media-sound/aeolus/files/aeolus-0.9.9-fix-Makefile.patch b/media-sound/aeolus/files/aeolus-0.9.9-fix-Makefile.patch
new file mode 100644
index 00000000000..0c6e6d49130
--- /dev/null
+++ b/media-sound/aeolus/files/aeolus-0.9.9-fix-Makefile.patch
@@ -0,0 +1,22 @@
+diff --git a/source/Makefile b/source/Makefile
+index 756c603..4275ca2 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -25,7 +25,7 @@ LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
+ 
+ VERSION = 0.9.9
+ CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\"
+-CXXFLAGS += -O2 -Wall
++CXXFLAGS += -Wall
+ CXXFLAGS += -march=native
+ 
+ 
+@@ -75,7 +75,7 @@ install:	aeolus aeolus_x11.so aeolus_txt.so
+ 	install -m 755 aeolus $(DESTDIR)$(BINDIR)
+ 	install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR)
+ 	install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR)
+-	ldconfig $(PREFIX)/$(LIBDIR)
++	true $(PREFIX)/$(LIBDIR)
+ 
+ 
+ clean:


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/aeolus/files/, media-sound/aeolus/
@ 2020-08-11 15:26 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2020-08-11 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     af61a978708d72a1b758bef18503d785c4216965
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 15:26:23 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 15:26:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af61a978

media-sound/aeolus: removed obsolete 0.9.7

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/aeolus/Manifest                        |  1 -
 media-sound/aeolus/aeolus-0.9.7.ebuild             | 59 ----------------------
 .../aeolus/files/aeolus-0.9.7-fix-Makefile.patch   | 31 ------------
 3 files changed, 91 deletions(-)

diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index 36fdeeb63ae..15e88bbbb73 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1,2 +1 @@
-DIST aeolus-0.9.7.tar.bz2 66532 BLAKE2B 611d48724b0b85afb8b82e5c2c9590a1da5d22154a5f8c228bdc4f83490113115132c08b79d07d0a5b9a2c66e0b5f9776504a3e919f00f75202ec43d0c7da193 SHA512 ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2
 DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2

diff --git a/media-sound/aeolus/aeolus-0.9.7.ebuild b/media-sound/aeolus/aeolus-0.9.7.ebuild
deleted file mode 100644
index d67d9e69d32..00000000000
--- a/media-sound/aeolus/aeolus-0.9.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib desktop xdg
-
-DESCRIPTION="A synthesised pipe organ emulator"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	dev-libs/libclthreads
-	media-libs/alsa-lib
-	>=media-libs/zita-alsa-pcmi-0.3
-	sys-libs/readline:0
-	virtual/jack
-	x11-libs/libclxclient
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	media-libs/stops
-"
-
-DOCS=( README COPYING AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-Makefile.patch
-)
-
-src_compile() {
-	cd "${S}"/source || die "Failed to cd to source dir"
-	tc-export CXX
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EXPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	default
-
-	cd "${S}"/source || die "Failed to cd to source dir"
-	emake PREFIX="${D}/usr" install
-	echo "-S ${EPREFIX}/usr/share/stops" > "${T}/aeolus.conf"
-	insinto /etc
-	doins "${T}/aeolus.conf"
-
-	make_desktop_entry aeolus Aeolus "" "AudioVideo"
-}

diff --git a/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch b/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch
deleted file mode 100644
index 07619475eca..00000000000
--- a/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/source/Makefile b/source/Makefile
-index f9e75bd..8390bd2 100644
---- a/source/Makefile
-+++ b/source/Makefile
-@@ -24,7 +24,7 @@ LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
- 
- VERSION = 0.9.7
- CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\"
--CXXFLAGS += -O2 -Wall
-+CXXFLAGS += -Wall
- CXXFLAGS += -march=native
- 
- 
-@@ -45,7 +45,7 @@ $(AEOLUS_O):
- XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o \
- 	midimatrix.o multislider.o functionwin.o xiface.o addsynth.o
- aeolus_x11.so:	CPPFLAGS += -D_REENTRANT
--aeolus_x11.so:	CPPFLAGS += $(shell pkgconf --cflags freetype2)
-+aeolus_x11.so:	CPPFLAGS += $(shell pkg-config --cflags freetype2)
- aeolus_x11.so:	CXXFLAGS += -shared -fPIC
- aeolus_x11.so:	LDFLAGS += -shared
- aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lpthread -lXft -lX11
-@@ -74,7 +74,7 @@ install:	aeolus aeolus_x11.so aeolus_txt.so
- 	install -m 755 aeolus $(DESTDIR)$(BINDIR)
- 	install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR)
- 	install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR)
--	ldconfig $(PREFIX)/$(LIBDIR)
-+	true $(PREFIX)/$(LIBDIR)
- 
- 
- clean:


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-08-11 15:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-11 15:26 [gentoo-commits] repo/gentoo:master commit in: media-sound/aeolus/files/, media-sound/aeolus/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2020-07-08  7:59 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox