commit: cd07e4913f17461bde872154089937b236f668c8
parent: 8e9ec343b5d56fb093492e4864f6abd498af1650
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Thu, 4 Apr 2019 07:22:20 +0200
media-sound/milkytracker: Bump to 1.02.00 (w/ fixes, based on ::gentoo)
Diffstat:
5 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
@@ -0,0 +1 @@
+DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-EQConstants.cpp.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-EQConstants.cpp.patch
@@ -0,0 +1,22 @@
+From beb9839495a282414dab3dbe36ea39075e2a979e Mon Sep 17 00:00:00 2001
+From: Christopher O'Neill <code@chrisoneill.co.uk>
+Date: Wed, 28 Feb 2018 19:35:18 +0000
+Subject: [PATCH] Fix #152: Type mismatch in EQConstants.cpp
+
+---
+ src/tracker/EQConstants.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
+index ffbf6ea8..f221364c 100644
+--- a/src/tracker/EQConstants.cpp
++++ b/src/tracker/EQConstants.cpp
+@@ -23,7 +23,7 @@
+ #include "EQConstants.h"
+ #include "math.h"
+
+-#define p(e) ldexp(0x10558, e-4*4)
++#define p(e) ldexp(66904.0f, e-4*4)
+
+ const float EQConstants::EQ3bands[3] =
+ {
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang-6.0.0-fix.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang-6.0.0-fix.patch
@@ -0,0 +1,32 @@
+From 857d3d68cb3bc2cf3da50bc9daff9325d05179a4 Mon Sep 17 00:00:00 2001
+From: Christopher O'Neill <code@chrisoneill.co.uk>
+Date: Tue, 27 Feb 2018 10:21:34 +0000
+Subject: [PATCH] Fix #151: clang6.0.0 (freeBSD) build failure
+
+Add explicit cast for narrowing conversion to hopefully fix the build failure.
+---
+ src/tracker/sdl/SDL_Main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
+index 420b4d92..526302bc 100644
+--- a/src/tracker/sdl/SDL_Main.cpp
++++ b/src/tracker/sdl/SDL_Main.cpp
+@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Event& event)
+ printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym);
+ #endif
+
+- pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++ pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), static_cast<pp_uint16> (keysym.sym)};
+
+ PPEvent myEvent(eKeyDown, &chr, sizeof(chr));
+ RaiseEventSerialized(&myEvent);
+@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event& event)
+
+ preTranslateKey(keysym);
+
+- pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++ pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), static_cast<pp_uint16> (keysym.sym)};
+
+ PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
+ RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-fix_FindSDL2.cmake.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-fix_FindSDL2.cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindSDL2.cmake.old b/cmake/FindSDL2.cmake
+index 27c78f0..0506fc4 100644
+--- a/cmake/FindSDL2.cmake.old
++++ b/cmake/FindSDL2.cmake
+@@ -93,7 +93,7 @@ if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
+ endif()
+
+ set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
++set(SDL2_LIBRARIES ${SDL2_LIBRARY})
+
+ include(FindPackageHandleStandardArgs)
+
diff --git a/media-sound/milkytracker/milkytracker-1.02.00.ebuild b/media-sound/milkytracker/milkytracker-1.02.00.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop
+
+DESCRIPTION="FastTracker 2 inspired music tracker"
+HOMEPAGE="https://milkytracker.titandemo.org/"
+SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND="
+ dev-libs/zziplib
+ media-libs/libsdl2[X]
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-clang-6.0.0-fix.patch"
+ "${FILESDIR}/${P}-EQConstants.cpp.patch"
+ "${FILESDIR}/${P}-fix_FindSDL2.cmake.patch"
+)
+
+S="${WORKDIR}/MilkyTracker-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+ $(cmake-utils_use_find_package alsa ALSA)
+ $(cmake-utils_use_find_package jack JACK)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ newicon resources/pictures/carton.png ${PN}.png
+ make_desktop_entry ${PN} MilkyTracker ${PN} \
+ "AudioVideo;Audio;Sequencer"
+}
