public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ams/files/, media-sound/ams/
@ 2016-11-23 19:44 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-11-23 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     7473973a6fca39d7648ead7452ee197d720a890e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 19:43:01 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 19:44:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7473973a

media-sound/ams: Version bump to 2.1.2

Gentoo-bug: 561980, 588942
* EAPI=6
* Add missing depend on sci-libs/fftw
* Use Qt5 instead of Qt4
* Build with GCC 6 in C++98 mode
* [QA] Remove hardcoded CXXFLAGS

Package-Manager: portage-2.3.2

 media-sound/ams/Manifest                           |  1 +
 media-sound/ams/ams-2.1.2.ebuild                   | 44 ++++++++++++
 .../ams/files/ams-2.1.2-fix-build-system.patch     | 80 ++++++++++++++++++++++
 3 files changed, 125 insertions(+)

diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
index 21c0019..c9e8cc5 100644
--- a/media-sound/ams/Manifest
+++ b/media-sound/ams/Manifest
@@ -1,2 +1,3 @@
 DIST ams-2.0.1.tar.bz2 286609 SHA256 1fb95261a302ff464b20a6b7363faed82dcbc0fa50b6580964e384ef0832ed64 SHA512 5be95ed5526de37475cb31480af9e20b6b524eb3086985680efd5dee748eb4947eb8a8265b8a805d843d1e80292fa5743e41bbd463580a0bb23c5e791d34bef8 WHIRLPOOL 57c13f4b31285ced524bb41bb31bd79c8446a8c514be219f7a228cf76a36df06db88e7bae4b2737280ef3a8146819c15426ddab6a5dbfc96628883a8583122f9
 DIST ams-2.1.1.tar.bz2 342456 SHA256 a2fdd93f5f1eb96d0903d1d3f4709fcec28842e44b9e7420ea42618affc767d9 SHA512 04627c15c3e3d0b889c4d17a8393c2417f5004a2bb0035bf9b0d86265d55c214923b9b875cbf3dd2cdb3f0037a0d6f717a9c6b749b68cd786b591d79e06b7580 WHIRLPOOL 1152139cf676707369a3189795833c3a7fdbe2a90e1a557169514a12536fd5279a863058971e36592a4d322d742bed1af704776382c454029d5f718b7ef88a98
+DIST ams-2.1.2.tar.bz2 348027 SHA256 808630674101cefa90567b14f4eefdb61baa0c3facbe79f2f2d692e92eccebab SHA512 3a98ccb54505818b4add1b070e2230ba00d80732fdcc54caecba55ad83f352381ed165ab58ca01fc98550bd0691242fd2f733862ee77fd217141ecec52250e4e WHIRLPOOL defd800af36a4b2af09b80ed6ad81239f383501fa13e6de4115717d7550208de6efa4ac038a36275b05692a1229be4ab81215cdc5f0cbb56456c606019acd569

diff --git a/media-sound/ams/ams-2.1.2.ebuild b/media-sound/ams/ams-2.1.2.ebuild
new file mode 100644
index 00000000..bb363fb
--- /dev/null
+++ b/media-sound/ams/ams-2.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic qmake-utils
+
+DESCRIPTION="Alsa Modular Software Synthesizer"
+HOMEPAGE="http://alsamodular.sourceforge.net"
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-libs/ladspa-sdk
+	media-libs/libclalsadrv
+	media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	sci-libs/fftw:3.0=
+	!dev-ruby/amrita"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.2-fix-build-system.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# C++11/14 fails:
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811645
+	append-cxxflags -std=gnu++98
+	econf --enable-qt5 MOC="$(qt5_get_bindir)/moc"
+}

diff --git a/media-sound/ams/files/ams-2.1.2-fix-build-system.patch b/media-sound/ams/files/ams-2.1.2-fix-build-system.patch
new file mode 100644
index 00000000..f18f5e7
--- /dev/null
+++ b/media-sound/ams/files/ams-2.1.2-fix-build-system.patch
@@ -0,0 +1,80 @@
+* Remove extraneous CXXFLAGS
+* Missing -ldl for dlsym, dlerror, and dlopen
+See also: https://bugs.gentoo.org/379251
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,46 +31,7 @@
+ AC_FUNC_SELECT_ARGTYPES
+ AC_FUNC_STAT
+ 
+-dnl set basic compiler flags
+-AMS_CORE_CXXFLAGS="-Wall"
+-
+-dnl set compiler optimization flags
+-AC_MSG_CHECKING(which processor class to optimize for)
+-case "$target" in
+-    i486-*-*)
+-         AMS_OPT_CXXFLAGS="-march=i486"
+-         AC_MSG_RESULT(i486)
+-         ;;
+-    i586-*-*)
+-         AMS_OPT_CXXFLAGS="-march=pentium"
+-         AC_MSG_RESULT(i586)
+-         ;;
+-    i686-*-*)
+-         AMS_OPT_CXXFLAGS="-march=pentiumpro -msse -mfpmath=sse -ffast-math"
+-         AC_MSG_RESULT(i686)
+-         ;;
+-    i786-*-*)
+-         AMS_OPT_CXXFLAGS="-march=pentium4 -msse -mfpmath=sse -ffast-math"
+-         AC_MSG_RESULT(i786)
+-         ;;
+-    x86_64-*-*)
+-         AMS_OPT_CXXFLAGS="-m64 -msse -mfpmath=sse -ffast-math"
+-         AC_MSG_RESULT(x86_64)
+-         ;;
+-    *)
+-         AC_MSG_RESULT(i386)
+-         AC_MSG_WARN(This is probably not what you want, use --target)
+-         ;;
+-esac
+-
+-if test "x$AMS_OPT_CXXFLAGS" = "x"; then
+-    AMS_CXXFLAGS=$AMS_CORE_CXXFLAGS
+-else
+-    AC_MSG_NOTICE([Compiler optimization... $AMS_OPT_CXXFLAGS])
+-    AMS_CXXFLAGS="$AMS_CORE_CXXFLAGS $AMS_OPT_CXXFLAGS"
+-fi
+-AC_SUBST(AMS_CXXFLAGS)
+-
++CXXFLAGS="${CXXFLAGS} -Wall"
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([asound], [snd_pcm_open], ,
+@@ -81,8 +42,12 @@
+              [AC_MSG_ERROR(pthread is required)])
+ AC_CHECK_LIB([m], [roundf], ,
+              [AC_MSG_ERROR([required libm missing])])
+-AC_CHECK_LIB([dl], [dlopen], ,
+-             [AC_MSG_ERROR(libdl is required)])
++dnl The dlopen() function is in the C library for *BSD and in
++dnl libdl on GLIBC-based systems
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++             AC_MSG_ERROR([unable to find the dlopen() function])
++])
++
+ dnl for vocoder module
+ AC_CHECK_LIB([fftw3], [fftw_execute], ,
+              [AC_MSG_ERROR(libfftw3 is required)])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -267,7 +267,7 @@
+ # all generated files to be removed by "make clean"
+ CLEANFILES = $(nodist_ams_SOURCES) $(translations_DATA)
+ 
+-ams_CXXFLAGS = $(QT_CXXFLAGS) $(AMS_CXXFLAGS)
++ams_CXXFLAGS = $(QT_CXXFLAGS)
+ DEFS = -D_REENTRANT -DLADSPA_PATH=\"$(LADSPA_PATH)\" -DTRANSLATIONSDIR=\"$(translationsdir)\" -DDEMOFILEPATH=\"$(pkgdatadir)/demos\" -DINSTRUMENTFILEPATH=\"$(pkgdatadir)/instruments\" @DEFS@
+ 
+ # rule for moc-file generation


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ams/files/, media-sound/ams/
@ 2017-01-04 17:18 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-01-04 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     16d4cef32748af086012ba8bb764760290f36c82
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 17:17:40 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 17:17:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d4cef3

media-sound/ams: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/ams/Manifest                 |  2 --
 media-sound/ams/ams-2.0.1.ebuild         | 37 --------------------------------
 media-sound/ams/ams-2.1.1.ebuild         | 37 --------------------------------
 media-sound/ams/files/ams-2.0.1-dl.patch | 21 ------------------
 media-sound/ams/files/ams-2.1.1-dl.patch | 13 -----------
 5 files changed, 110 deletions(-)

diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
index c9e8cc5..aea2e52 100644
--- a/media-sound/ams/Manifest
+++ b/media-sound/ams/Manifest
@@ -1,3 +1 @@
-DIST ams-2.0.1.tar.bz2 286609 SHA256 1fb95261a302ff464b20a6b7363faed82dcbc0fa50b6580964e384ef0832ed64 SHA512 5be95ed5526de37475cb31480af9e20b6b524eb3086985680efd5dee748eb4947eb8a8265b8a805d843d1e80292fa5743e41bbd463580a0bb23c5e791d34bef8 WHIRLPOOL 57c13f4b31285ced524bb41bb31bd79c8446a8c514be219f7a228cf76a36df06db88e7bae4b2737280ef3a8146819c15426ddab6a5dbfc96628883a8583122f9
-DIST ams-2.1.1.tar.bz2 342456 SHA256 a2fdd93f5f1eb96d0903d1d3f4709fcec28842e44b9e7420ea42618affc767d9 SHA512 04627c15c3e3d0b889c4d17a8393c2417f5004a2bb0035bf9b0d86265d55c214923b9b875cbf3dd2cdb3f0037a0d6f717a9c6b749b68cd786b591d79e06b7580 WHIRLPOOL 1152139cf676707369a3189795833c3a7fdbe2a90e1a557169514a12536fd5279a863058971e36592a4d322d742bed1af704776382c454029d5f718b7ef88a98
 DIST ams-2.1.2.tar.bz2 348027 SHA256 808630674101cefa90567b14f4eefdb61baa0c3facbe79f2f2d692e92eccebab SHA512 3a98ccb54505818b4add1b070e2230ba00d80732fdcc54caecba55ad83f352381ed165ab58ca01fc98550bd0691242fd2f733862ee77fd217141ecec52250e4e WHIRLPOOL defd800af36a4b2af09b80ed6ad81239f383501fa13e6de4115717d7550208de6efa4ac038a36275b05692a1229be4ab81215cdc5f0cbb56456c606019acd569

diff --git a/media-sound/ams/ams-2.0.1.ebuild b/media-sound/ams/ams-2.0.1.ebuild
deleted file mode 100644
index 12b1a7a..00000000
--- a/media-sound/ams/ams-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Alsa Modular Software Synthesizer"
-HOMEPAGE="http://alsamodular.sourceforge.net"
-SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/ladspa-sdk
-	media-libs/libclalsadrv
-	!dev-ruby/amrita"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dl.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/qt4
-	econf
-}

diff --git a/media-sound/ams/ams-2.1.1.ebuild b/media-sound/ams/ams-2.1.1.ebuild
deleted file mode 100644
index 9063752..00000000
--- a/media-sound/ams/ams-2.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Alsa Modular Software Synthesizer"
-HOMEPAGE="http://alsamodular.sourceforge.net"
-SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/ladspa-sdk
-	media-libs/libclalsadrv
-	!dev-ruby/amrita"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dl.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/qt4
-	econf
-}

diff --git a/media-sound/ams/files/ams-2.0.1-dl.patch b/media-sound/ams/files/ams-2.0.1-dl.patch
deleted file mode 100644
index ce2327d..00000000
--- a/media-sound/ams/files/ams-2.0.1-dl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Missing -ldl for dlsym, dlerror, and dlopen, see http://bugs.gentoo.org/379251
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -232,6 +232,8 @@
- 	textedit.h \
- 	notelist.h
- 
-+ams_LDADD = -ldl @QT_LIBS@
-+
- translationsdir = $(pkgdatadir)/translations
- translations = \
- 	translations/ams_de.ts \
-@@ -247,7 +249,6 @@
- # all generated files to be removed by "make clean"
- CLEANFILES = $(nodist_ams_SOURCES) $(translations_DATA)
- 
--AM_LDFLAGS = @QT_LIBS@
- AM_CXXFLAGS = @QT_CXXFLAGS@ @AMS_CXXFLAGS@
- DEFS = -D_REENTRANT -DLADSPA_PATH=\"$(LADSPA_PATH)\" -DTRANSLATIONSDIR=\"$(translationsdir)\" @DEFS@
- 

diff --git a/media-sound/ams/files/ams-2.1.1-dl.patch b/media-sound/ams/files/ams-2.1.1-dl.patch
deleted file mode 100644
index 00bec61..00000000
--- a/media-sound/ams/files/ams-2.1.1-dl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Missing -ldl for dlsym, dlerror, and dlopen, see http://bugs.gentoo.org/379251
-
---- ams-2.1.1/src/Makefile.am
-+++ ams-2.1.1/src/Makefile.am
-@@ -252,6 +252,8 @@
- 	textedit.h \
- 	notelist.h
- 
-+ams_LDADD = -ldl
-+
- translationsdir = $(pkgdatadir)/translations
- translations = \
- 	translations/ams_de.ts \


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ams/files/, media-sound/ams/
@ 2017-07-04 13:41 Michael Palimaka
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-07-04 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f666238833b31c9ed115d0f98cda0d3d8844b7a1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 13:40:30 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 13:40:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6662388

media-sound/ams: remove last rited package

Gentoo-bug: 603564

 media-sound/ams/Manifest                           |   1 -
 media-sound/ams/ams-2.1.2.ebuild                   |  48 --------
 .../ams/files/ams-2.1.2-fix-build-system.patch     | 127 ---------------------
 media-sound/ams/metadata.xml                       |  11 --
 4 files changed, 187 deletions(-)

diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
deleted file mode 100644
index aea2e52aec3..00000000000
--- a/media-sound/ams/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ams-2.1.2.tar.bz2 348027 SHA256 808630674101cefa90567b14f4eefdb61baa0c3facbe79f2f2d692e92eccebab SHA512 3a98ccb54505818b4add1b070e2230ba00d80732fdcc54caecba55ad83f352381ed165ab58ca01fc98550bd0691242fd2f733862ee77fd217141ecec52250e4e WHIRLPOOL defd800af36a4b2af09b80ed6ad81239f383501fa13e6de4115717d7550208de6efa4ac038a36275b05692a1229be4ab81215cdc5f0cbb56456c606019acd569

diff --git a/media-sound/ams/ams-2.1.2.ebuild b/media-sound/ams/ams-2.1.2.ebuild
deleted file mode 100644
index 95a6fec6f18..00000000000
--- a/media-sound/ams/ams-2.1.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils
-
-DESCRIPTION="Alsa Modular Software Synthesizer"
-HOMEPAGE="http://alsamodular.sourceforge.net"
-SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-libs/ladspa-sdk
-	media-libs/libclalsadrv
-	media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	sci-libs/fftw:3.0=
-	!dev-ruby/amrita"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.2-fix-build-system.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# C++11/14 fails:
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811645
-	append-cxxflags -std=gnu++98
-	econf \
-		--disable-nsm \
-		--enable-qt5 \
-		MOC="$(qt5_get_bindir)/moc" \
-		LUPDATE="$(qt5_get_bindir)/lupdate" \
-		LRELEASE="$(qt5_get_bindir)/lrelease"
-}

diff --git a/media-sound/ams/files/ams-2.1.2-fix-build-system.patch b/media-sound/ams/files/ams-2.1.2-fix-build-system.patch
deleted file mode 100644
index 5120859ef21..00000000000
--- a/media-sound/ams/files/ams-2.1.2-fix-build-system.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-* Remove extraneous CXXFLAGS
-* Missing -ldl for dlsym, dlerror, and dlopen
-See also:
-  https://bugs.gentoo.org/show_bug.cgi?id=379251
-  https://bugs.gentoo.org/show_bug.cgi?id=600642
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,9 +3,9 @@
- 
- AC_PREREQ(2.61)
- AC_INIT(ams, [2.1.2], [alsamodular-devel@lists.sourceforge.net])
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET
- AC_CONFIG_SRCDIR([src/box.h])
--AC_CONFIG_HEADER([src/config.h])
-+AC_CONFIG_HEADERS([src/config.h])
- AM_INIT_AUTOMAKE([dist-bzip2])
- 
- # Checks for programs.
-@@ -31,46 +31,7 @@
- AC_FUNC_SELECT_ARGTYPES
- AC_FUNC_STAT
- 
--dnl set basic compiler flags
--AMS_CORE_CXXFLAGS="-Wall"
--
--dnl set compiler optimization flags
--AC_MSG_CHECKING(which processor class to optimize for)
--case "$target" in
--    i486-*-*)
--         AMS_OPT_CXXFLAGS="-march=i486"
--         AC_MSG_RESULT(i486)
--         ;;
--    i586-*-*)
--         AMS_OPT_CXXFLAGS="-march=pentium"
--         AC_MSG_RESULT(i586)
--         ;;
--    i686-*-*)
--         AMS_OPT_CXXFLAGS="-march=pentiumpro -msse -mfpmath=sse -ffast-math"
--         AC_MSG_RESULT(i686)
--         ;;
--    i786-*-*)
--         AMS_OPT_CXXFLAGS="-march=pentium4 -msse -mfpmath=sse -ffast-math"
--         AC_MSG_RESULT(i786)
--         ;;
--    x86_64-*-*)
--         AMS_OPT_CXXFLAGS="-m64 -msse -mfpmath=sse -ffast-math"
--         AC_MSG_RESULT(x86_64)
--         ;;
--    *)
--         AC_MSG_RESULT(i386)
--         AC_MSG_WARN(This is probably not what you want, use --target)
--         ;;
--esac
--
--if test "x$AMS_OPT_CXXFLAGS" = "x"; then
--    AMS_CXXFLAGS=$AMS_CORE_CXXFLAGS
--else
--    AC_MSG_NOTICE([Compiler optimization... $AMS_OPT_CXXFLAGS])
--    AMS_CXXFLAGS="$AMS_CORE_CXXFLAGS $AMS_OPT_CXXFLAGS"
--fi
--AC_SUBST(AMS_CXXFLAGS)
--
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- # Checks for libraries.
- AC_CHECK_LIB([asound], [snd_pcm_open], ,
-@@ -81,8 +42,12 @@
-              [AC_MSG_ERROR(pthread is required)])
- AC_CHECK_LIB([m], [roundf], ,
-              [AC_MSG_ERROR([required libm missing])])
--AC_CHECK_LIB([dl], [dlopen], ,
--             [AC_MSG_ERROR(libdl is required)])
-+dnl The dlopen() function is in the C library for *BSD and in
-+dnl libdl on GLIBC-based systems
-+AC_SEARCH_LIBS([dlopen], [dl dld], [], [
-+             AC_MSG_ERROR([unable to find the dlopen() function])
-+])
-+
- dnl for vocoder module
- AC_CHECK_LIB([fftw3], [fftw_execute], ,
-              [AC_MSG_ERROR(libfftw3 is required)])
-@@ -111,7 +76,7 @@
- fi
- 
- dnl option to enable Qt5 instead of default Qt4 library 
--AC_ARG_ENABLE(qt5, AC_HELP_STRING([--enable-qt5],
-+AC_ARG_ENABLE(qt5, AS_HELP_STRING([--enable-qt5],
-                           [enable Qt5 instead of Qt4 library]),,
-                           enable_qt4=yes)
- AS_IF([test x$enable_qt4 = xyes],
-@@ -215,7 +180,7 @@
- 
- # Check for ladspa plugins path
- AC_ARG_WITH(ladspa-path,
--  [AC_HELP_STRING([--with-ladspa-path=DIR],
-+  [AS_HELP_STRING([--with-ladspa-path=DIR],
-     [directory for ladspa plugins])],
-   [ if test "x$withval" != "x" ; then
-      LADSPA_PATH="$withval"
-@@ -250,14 +215,6 @@
-     if test "$have_liblo" = "yes"; then
-         AC_DEFINE(NSM_SUPPORT, 1,
-                   [Define to enable NSM support])
--        LIBSsave=$LIBS
--        CFLAGSsave=$CFLAGS
--        CFLAGS=$LIBLO_CFLAGS
--        LIBS=$LIBLO_LIBS
--        AC_SUBST(LIBLO_CFLAGS)
--        AC_SUBST(LIBLO_LIBS)
--        LIBS+=$LIBSsave
--        CFLAGS+=$CFLAGSsave
-     fi
- fi
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -267,7 +267,7 @@
- # all generated files to be removed by "make clean"
- CLEANFILES = $(nodist_ams_SOURCES) $(translations_DATA)
- 
--ams_CXXFLAGS = $(QT_CXXFLAGS) $(AMS_CXXFLAGS)
-+ams_CXXFLAGS = $(QT_CXXFLAGS)
- DEFS = -D_REENTRANT -DLADSPA_PATH=\"$(LADSPA_PATH)\" -DTRANSLATIONSDIR=\"$(translationsdir)\" -DDEMOFILEPATH=\"$(pkgdatadir)/demos\" -DINSTRUMENTFILEPATH=\"$(pkgdatadir)/instruments\" @DEFS@
- 
- # rule for moc-file generation

diff --git a/media-sound/ams/metadata.xml b/media-sound/ams/metadata.xml
deleted file mode 100644
index 7b3a323df70..00000000000
--- a/media-sound/ams/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">alsamodular</remote-id>
-	</upstream>
-</pkgmetadata>


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

end of thread, other threads:[~2017-07-04 13:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-23 19:44 [gentoo-commits] repo/gentoo:master commit in: media-sound/ams/files/, media-sound/ams/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2017-01-04 17:18 David Seifert
2017-07-04 13:41 Michael Palimaka

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