summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-17 05:49:59 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-17 05:49:59 +0000
commit018e68074e80e7b0343efc7bcc4758d67c38b6a9 (patch)
treec43e1f0e16985da293abb0d017f6d2bc19622dfe
parent0ff8195edaad3e3f8b4fb39cdd4903420da5262d (diff)
downloadpackages-018e68074e80e7b0343efc7bcc4758d67c38b6a9.tar.gz
packages-018e68074e80e7b0343efc7bcc4758d67c38b6a9.tar.bz2
packages-018e68074e80e7b0343efc7bcc4758d67c38b6a9.tar.xz
packages-018e68074e80e7b0343efc7bcc4758d67c38b6a9.zip
experimental/lmms: bump to 1.2.0, remove patch, add SDL support
-rw-r--r--experimental/lmms/APKBUILD8
-rw-r--r--experimental/lmms/isinff.patch11
2 files changed, 3 insertions, 16 deletions
diff --git a/experimental/lmms/APKBUILD b/experimental/lmms/APKBUILD
index 0ab893cb8..5a045f66e 100644
--- a/experimental/lmms/APKBUILD
+++ b/experimental/lmms/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lmms
-pkgver=1.2.0_rc7
+pkgver=1.2.0
pkgrel=0
pkgdesc="Music production software"
url="https://lmms.io/"
@@ -11,12 +11,11 @@ depends=""
makedepends="alsa-lib-dev cmake fftw-dev fltk-dev fluidsynth-dev lame-dev
libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev libxml2-dev
pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtx11extras-dev
- extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev"
+ sdl-dev extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="lmms-${pkgver/_/-}.tar.gz::https://github.com/LMMS/lmms/archive/v${pkgver/_/-}.tar.gz
https://distfiles.adelielinux.org/source/qt5-x11embed-20171106.tar.xz
rpmalloc-1.3.1.tar.gz::https://github.com/rampantpixels/rpmalloc/archive/1.3.1.tar.gz
- isinff.patch
thread.patch
use-system-ecm.patch
"
@@ -58,9 +57,8 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e16b5bd050a0a5f3ac9312654cd3ce65e497258dead836fb222918af4eb71ea23175292b7943bff495e0b53445b70e80d26bebe059e46724f39f8e8f29d37dd6 lmms-1.2.0-rc7.tar.gz
+sha512sums="55b338b68013645175f79fb8e68278cc31defdc04e6c069b4f9adbdb6f8aaf52a60087bbbef56caeceac179e19754b1fd341df201adee4b1ff90de6bbd49ef22 lmms-1.2.0.tar.gz
d00b5dfb2931ae1614b419b06f795c5627e51eb2159612eb058484c2b1c6817532d4e321ce514518ce2009d8c7f886e384d6cc8b8428b05b268db3f28bb90e63 qt5-x11embed-20171106.tar.xz
c9a42c635774285a8467eaa1931109528c08931c73873c366d0e4949921c8956a31db7422378cd548bbbaf24d0fcc41470ab6751e67238db53677832e5fb5db4 rpmalloc-1.3.1.tar.gz
-8896727616d361d22876ce353adeaa587a506f4fa649575f8444e89c5b86165c6e4c29b5862221530e5840023bd012bf6183666b958b7841dbf2cde1f2924353 isinff.patch
e6b5b87af969bf8c1c24cef2748485d86d58139704efdebf0645c376c9c40de54b0ff08d9fd3b41865670539c7dac50e4178d06dfb779e1d8d4fc7cdd08c4a32 thread.patch
70f1467340f7f5c9e94af702e036aa3355c036b13523a9d5183d5b0fb7c18f8878ec92c6d84a49837739b207bd0546ef5264a4e17f30ddf27b6f8eb9d09c4c76 use-system-ecm.patch"
diff --git a/experimental/lmms/isinff.patch b/experimental/lmms/isinff.patch
deleted file mode 100644
index 6c83c5052..000000000
--- a/experimental/lmms/isinff.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lmms-1.2.0-rc7/include/lmms_math.h.old 2018-09-25 07:47:51.000000000 +0000
-+++ lmms-1.2.0-rc7/include/lmms_math.h 2019-01-20 19:22:47.190000000 +0000
-@@ -34,7 +34,7 @@
- #include <cmath>
- using namespace std;
-
--#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__)
-+#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) || (defined(LMMS_BUILD_LINUX) && !defined(__GLIBC__))
- #ifndef isnanf
- #define isnanf(x) isnan(x)
- #endif