Skip to content

Commit

Permalink
media-plugins/calf: 0.90.1 version bump, EAPI-7 bump, various QA
Browse files Browse the repository at this point in the history
Fix automagic
Fix desktop file
Fix htmldir

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Mar 10, 2019
1 parent acee938 commit a526be6
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 0 deletions.
1 change: 1 addition & 0 deletions media-plugins/calf/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff
76 changes: 76 additions & 0 deletions media-plugins/calf/calf-0.90.1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

inherit autotools xdg

DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
HOMEPAGE="http://calf-studio-gear.org/"

if [[ "${PV}" = "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
else
SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi

LICENSE="LGPL-2.1"
SLOT="0"
IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs"

REQUIRED_USE="jack? ( gtk )"

BDEPEND="
virtual/pkgconfig
"
DEPEND="
dev-libs/atk
dev-libs/expat
dev-libs/glib:2
media-sound/fluidsynth:=
gtk? (
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/pango
)
jack? ( virtual/jack )
lash? ( media-sound/lash )
lv2? ( media-libs/lv2 )
"
RDEPEND="${DEPEND}"

PATCHES=(
"${FILESDIR}/${P}-no-automagic.patch"
"${FILESDIR}/${P}-htmldir.patch"
"${FILESDIR}/${P}-desktop.patch"
)

src_prepare() {
default
eautoreconf
}

src_configure() {
local myeconfargs=(
--prefix="${EPREFIX}"/usr
--without-obsolete-check
$(use_enable experimental)
$(use_enable gtk gui)
$(use_enable jack)
$(use_with lash)
$(use_with lv2 lv2)
$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "")
$(use_enable static-libs static)
$(use_enable cpu_flags_x86_sse sse)
)
econf "${myeconfargs[@]}"
}

src_install() {
default
mv "${ED}"/usr/share/bash-completion/completions/calf \
"${ED}"/usr/share/bash-completion/completions/calfjackhost
}
24 changes: 24 additions & 0 deletions media-plugins/calf/files/calf-0.90.1-desktop.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
* QA Notice: This package installs one or more .desktop files that do not
* pass validation.
*
* /usr/share/applications/calf.desktop: error: value "0.90.1" for key "Version" in group "Desktop Entry" is not a known version
* /usr/share/applications/calf.desktop: warning: value "Application;AudioVideo;Audio;GNOME" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"


--- a/calf.desktop.in 2018-07-08 12:35:56.000000000 +0200
+++ b/calf.desktop.in 2019-03-10 20:19:01.251946945 +0100
@@ -3,7 +3,6 @@
Name[pl]=Zestaw wtyczek Calf
Name[ru]=Набор эффектов и инструментов Calf для JACK
Name[fr]=Ensemble de greffons Calf pour JACK
-Version=@VERSION@
Comment=Process and produce sounds using a set of plugins with JACK interface
Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK
Comment[ru]=Обработка и создание музыки при помощи эффектов и инструментов через JACK
@@ -11,5 +10,5 @@
Exec=calfjackhost
Terminal=false
Type=Application
-Categories=Application;AudioVideo;Audio;GNOME
+Categories=AudioVideo;Audio;GNOME
Icon=calf
66 changes: 66 additions & 0 deletions media-plugins/calf/files/calf-0.90.1-htmldir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
Make PKGDOCDIR configurable for distributions.

--- a/configure.ac 2018-07-08 12:35:56.000000000 +0200
+++ b/configure.ac 2019-03-10 20:11:45.053432800 +0100
@@ -227,7 +227,7 @@

# Other defines
AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
-AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory])
+AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory])

############################################################################################

--- a/Makefile.am 2018-07-08 12:35:56.000000000 +0200
+++ b/Makefile.am 2019-03-10 20:55:12.448824164 +0100
@@ -25,29 +25,29 @@
rm -rf autom4te.cache

install-data-local:
- install -d -m 755 $(DESTDIR)$(docdir)
- install -d -m 755 $(DESTDIR)$(docdir)/images
- install -d -m 755 $(DESTDIR)$(docdir)/images/icons
- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto
- install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded
- install -d -m 755 $(DESTDIR)$(docdir)/scripts
+ install -d -m 755 $(DESTDIR)$(htmldir)
+ install -d -m 755 $(DESTDIR)$(htmldir)/images
+ install -d -m 755 $(DESTDIR)$(htmldir)/images/icons
+ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto
+ install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded
+ install -d -m 755 $(DESTDIR)$(htmldir)/scripts
install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2
- install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir)
- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/
- install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/
- install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/
- install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/
- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/
- install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/
+ install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir)
+ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/
+ install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/
+ install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/
+ install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/
+ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/
+ install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/
install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/

uninstall-local:
- rm -f $(DESTDIR)$(docdir)/*.html
- rm -f $(DESTDIR)$(docdir)/images/*.png
- rm -f $(DESTDIR)$(docdir)/images/*.jpg
- rm -f $(DESTDIR)$(docdir)/images/icons/*.png
- rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/*
- rm -f $(DESTDIR)$(docdir)/scripts/*.css
- rm -f $(DESTDIR)$(docdir)/scripts/*.js
+ rm -f $(DESTDIR)$(htmldir)/*.html
+ rm -f $(DESTDIR)$(htmldir)/images/*.png
+ rm -f $(DESTDIR)$(htmldir)/images/*.jpg
+ rm -f $(DESTDIR)$(htmldir)/images/icons/*.png
+ rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/*
+ rm -f $(DESTDIR)$(htmldir)/scripts/*.css
+ rm -f $(DESTDIR)$(htmldir)/scripts/*.js
rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2
- rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true
+ rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true
43 changes: 43 additions & 0 deletions media-plugins/calf/files/calf-0.90.1-no-automagic.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Fix gtk+ and jack automagic detection.

https://github.com/calf-studio-gear/calf/issues/166

--- a/configure.ac 2018-07-08 12:35:56.000000000 +0200
+++ b/configure.ac 2019-03-10 19:22:05.578887471 +0100
@@ -150,13 +150,35 @@
[set_enable_sse="no"])
AC_MSG_RESULT($set_enable_sse)

+AC_MSG_CHECKING([whether to enable GUI])
+AC_ARG_ENABLE(gui,
+ AS_HELP_STRING([--enable-gui],[enable graphical user interface]),
+ [set_enable_gui=$enableval],
+ [set_enable_gui=yes])
+AC_MSG_RESULT($set_enable_gui)
+
+AC_MSG_CHECKING([whether to enable JACK])
+AC_ARG_ENABLE(jack,
+ AS_HELP_STRING([--enable-jack],[enable support for JACK]),
+ [set_enable_jack=$enableval],
+ [set_enable_jack=yes])
+AC_MSG_RESULT($set_enable_jack)
+
############################################################################################
# Compute status shell variables

-if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
+if test "x$set_enable_gui" = "xno"; then
+ GUI_ENABLED="no (disabled by user choice)"
+fi
+
+if test "$JACK_FOUND" = "yes"; then
JACK_ENABLED="yes"
fi

+if test "x$set_enable_jack" = "xno"; then
+ JACK_ENABLED="no (disabled by user choice)"
+fi
+
if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then
LV2_GUI_ENABLED="yes"
fi

0 comments on commit a526be6

Please sign in to comment.