public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/files/, media-sound/qsampler/
@ 2020-01-15 21:20 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2020-01-15 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f3e3beb812da01af40fd07cb0f06640f3b2a0f92
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 21:20:11 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 21:20:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e3beb8

media-sound/qsampler: fixed 9999 patch

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

 media-sound/qsampler/files/qsampler-9999-Makefile.patch | 12 ++++++++++++
 media-sound/qsampler/qsampler-9999.ebuild               |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
new file mode 100644
index 00000000000..5da44d8a817
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.in b/Makefile.in
+index 9756274..f88b2fd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -111,7 +111,6 @@ install:	$(target) translations_lrelease $(name).1
+ 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+ 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
+ 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
+-	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name)*.1
+ 
+ uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+ 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall

diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 968945ad9b5..c59da124ba7 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-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
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
 
 src_prepare() {
 	default


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/files/, media-sound/qsampler/
@ 2020-08-22 16:06 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-08-22 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     a1f671108292d4f56cec3a87d59ed2285a00e4ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 22:20:34 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 16:05:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f67110

media-sound/qsampler: 0.6.3 version bump

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/qsampler/Manifest                             |  1 +
 ...-9999-Makefile.patch => qsampler-0.6.3-Makefile.patch} |  0
 .../{qsampler-9999.ebuild => qsampler-0.6.3.ebuild}       | 15 ++++-----------
 media-sound/qsampler/qsampler-9999.ebuild                 |  2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index d31cd249bd6..54e462243bf 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1 +1,2 @@
 DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
+DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae

diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
similarity index 100%
rename from media-sound/qsampler/files/qsampler-9999-Makefile.patch
rename to media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch

diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
similarity index 79%
copy from media-sound/qsampler/qsampler-9999.ebuild
copy to media-sound/qsampler/qsampler-0.6.3.ebuild
index b7063d57ab8..6cb59ab6dfc 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-0.6.3.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-inherit qmake-utils xdg autotools git-r3
+inherit qmake-utils xdg
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
 HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="debug +libgig"
 
 DEPEND="
@@ -32,14 +32,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
-
-src_prepare() {
-	default
-
-	emake -f Makefile.git
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_configure() {
 	local myeconfargs=(

diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index b7063d57ab8..fbbbc262bb9 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -32,7 +32,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-0.6.3-Makefile.patch )
 
 src_prepare() {
 	default


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/files/, media-sound/qsampler/
@ 2020-09-17  8:03 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2020-09-17  8:03 UTC (permalink / raw
  To: gentoo-commits

commit:     316abf776e342e4502c1fe7b7770127b30c1589b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 08:03:29 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 08:03:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316abf77

media-sound/qsampler: fixed installation of 9999

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

 media-sound/qsampler/files/qsampler-9999-Makefile.patch | 15 +++++++++++++++
 media-sound/qsampler/qsampler-9999.ebuild               |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
new file mode 100644
index 00000000000..29788b0fd35
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index e683df9..5c2d4f0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -111,10 +111,8 @@ install:	$(target) translations_lrelease $(name).1
+ 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
+ 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+ 	@install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1
+-	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name).1
+ 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/fr/man1
+ 	@install -v -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1
+-	@gzip -nvf $(DESTDIR)$(mandir)/fr/man1/$(name).1
+ 
+ uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+ 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall

diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index fbbbc262bb9..23f189c07e1 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -32,7 +32,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}"/${PN}-0.6.3-Makefile.patch )
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_prepare() {
 	default


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/files/, media-sound/qsampler/
@ 2020-12-20 17:57 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2020-12-20 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     44f4b7525c49f9d84b6e4098f099f9aa982acb60
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 17:56:34 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 17:56:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f4b752

media-sound/qsampler: removed obsolete 0.5.6

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

 media-sound/qsampler/Manifest                      |  1 -
 .../qsampler/files/qsampler-0.5.3-Makefile.patch   | 10 -----
 media-sound/qsampler/qsampler-0.5.6.ebuild         | 48 ----------------------
 3 files changed, 59 deletions(-)

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 54e462243bf..66b24d017d6 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,2 +1 @@
-DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae

diff --git a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
deleted file mode 100644
index 7f23e78b669..00000000000
--- a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.in	2018-12-16 23:40:26.001395069 +0100
-+++ b/Makefile.in	2018-12-16 23:46:00.210638503 +0100
-@@ -109,7 +109,6 @@
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall

diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild
deleted file mode 100644
index ab5a0073a2c..00000000000
--- a/media-sound/qsampler/qsampler-0.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-sound/linuxsampler-0.5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
-	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/files/, media-sound/qsampler/
@ 2021-02-07 14:42 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2021-02-07 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     643fa50bb6f0bbb52c5e176d3d905027fdedb7f4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 14:41:56 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 14:42:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643fa50b

media-sound/qsampler: bump to 0.9.1, switched to cmake, updated live

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

 media-sound/qsampler/Manifest                      |  1 +
 .../files/qsampler-0.9.1-cmake-no-git.patch        | 21 ++++++++
 media-sound/qsampler/qsampler-0.9.1.ebuild         | 58 ++++++++++++++++++++++
 media-sound/qsampler/qsampler-9999.ebuild          | 38 +++++++-------
 4 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 66b24d017d6..894056cf727 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1 +1,2 @@
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
+DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d

diff --git a/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch
new file mode 100644
index 00000000000..44b7c3cb644
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8304e80..666deb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,7 @@ project(qsampler
+   LANGUAGES C CXX)
+ 
+ set (CONFIG_VERSION ${PROJECT_VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -27,6 +28,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+ else ()
+   set (VERSION "${PROJECT_VERSION}")
+ endif ()
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ set (PACKAGE_NAME "Qsampler")
+ set (PACKAGE_VERSION "${VERSION}")

diff --git a/media-sound/qsampler/qsampler-0.9.1.ebuild b/media-sound/qsampler/qsampler-0.9.1.ebuild
new file mode 100644
index 00000000000..d2d0dd804cb
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake qmake-utils xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +libgig"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-no-git.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+	)
+	cmake_src_configure
+}

diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 23f189c07e1..cd513200a60 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -1,10 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-inherit qmake-utils xdg autotools git-r3
+inherit cmake qmake-utils xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
 HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
@@ -21,34 +28,27 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
+	media-libs/liblscp:=
 	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
+	libgig? ( media-libs/libgig:= )
 "
 RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5
+	media-sound/linuxsampler
 "
 BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
 src_prepare() {
-	default
+	cmake_src_prepare
 
-	emake -f Makefile.git
-	eautoreconf
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
 	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
+	cmake_src_configure
 }


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

end of thread, other threads:[~2021-02-07 14:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-20 17:57 [gentoo-commits] repo/gentoo:master commit in: media-sound/qsampler/files/, media-sound/qsampler/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2021-02-07 14:42 Miroslav Šulc
2020-09-17  8:03 Miroslav Šulc
2020-08-22 16:06 Andreas Sturmlechner
2020-01-15 21:20 Miroslav Šulc

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