* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2023-07-13 7:06 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-13 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 5e2d8bde0380beb2d6da474685542a4d4039dcfa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 07:05:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 07:05:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2d8bde
media-sound/milkytracker: backport UB fix (-Wreturn-type)
Closes: https://bugs.gentoo.org/910283
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/milkytracker-1.04.00-wreturn-type.patch | 20 ++++++++++++++++++++
...1.04.00.ebuild => milkytracker-1.04.00-r1.ebuild} | 4 ++++
2 files changed, 24 insertions(+)
diff --git a/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch b/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch
new file mode 100644
index 000000000000..977264a8f37b
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/910283
+https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d
+https://github.com/milkytracker/MilkyTracker/issues/316
+https://github.com/milkytracker/MilkyTracker/issues/318
+
+From 7e9171488fc47ad2de646a4536794fda21e7303d Mon Sep 17 00:00:00 2001
+From: Leon van Kammen <leonvankammen@gmail.com>
+Date: Thu, 6 Jul 2023 14:38:20 +0200
+Subject: [PATCH] possible bugfix: return nPorts
+
+--- a/src/midi/posix/MidiReceiver_pthread.cpp
++++ b/src/midi/posix/MidiReceiver_pthread.cpp
+@@ -145,4 +145,5 @@ unsigned int MidiReceiver::countPorts()
+ }
+ delete midiin;
+ midiin = NULL;
+-}
+\ No newline at end of file
++ return nPorts;
++}
diff --git a/media-sound/milkytracker/milkytracker-1.04.00.ebuild b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
similarity index 95%
rename from media-sound/milkytracker/milkytracker-1.04.00.ebuild
rename to media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
index 77adb777bea0..33cb60194fdb 100644
--- a/media-sound/milkytracker/milkytracker-1.04.00.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
@@ -26,6 +26,10 @@ RDEPEND="
jack? ( virtual/jack )"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-wreturn-type.patch
+)
+
src_prepare() {
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2024-05-27 13:56 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-05-27 13:56 UTC (permalink / raw
To: gentoo-commits
commit: c41061e9e847b8e02295e2290efafd5ccd3d572f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 13:55:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 27 13:55:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41061e9
media-sound/milkytracker: fix build w/ >= GCC 13 (?)
We need C++11 here, not C++98.
Closes: https://bugs.gentoo.org/909761
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../milkytracker/files/milkytracker-1.04.00-cxx-std.patch | 15 +++++++++++++++
media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild | 1 +
2 files changed, 16 insertions(+)
diff --git a/media-sound/milkytracker/files/milkytracker-1.04.00-cxx-std.patch b/media-sound/milkytracker/files/milkytracker-1.04.00-cxx-std.patch
new file mode 100644
index 000000000000..1e8037023a38
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.04.00-cxx-std.patch
@@ -0,0 +1,15 @@
+https://github.com/milkytracker/MilkyTracker/pull/328
+https://bugs.gentoo.org/909761
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,8 +22,8 @@
+ cmake_minimum_required(VERSION 3.10)
+ project(MilkyTracker)
+
+-# Set C++ standard to C++98
+-set(CMAKE_CXX_STANDARD 98)
++# Set C++ standard to C++11
++set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+
+ # Enable IDE solution folders
diff --git a/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
index aa271bf6bf5c..78160baf76fe 100644
--- a/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-wreturn-type.patch
+ "${FILESDIR}"/${PN}-1.04.00-cxx-std.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2021-04-19 20:54 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-04-19 20:54 UTC (permalink / raw
To: gentoo-commits
commit: c0fc45f304e244844864b395e9b6198aeee6faaa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 20:10:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 20:53:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fc45f3
media-sound/milkytracker: drop 1.02.00-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/milkytracker/Manifest | 2 -
.../milkytracker-1.02.00-CVE-2019-14464.patch | 26 ------
.../milkytracker-1.02.00-CVE-2019-1449x.patch | 104 ---------------------
.../milkytracker-1.02.00-CVE-2020-15569.patch | 35 -------
.../files/milkytracker-1.02.00-clang.patch | 85 -----------------
...ker-1.02.00-fix-hard-dependency-on-rtmidi.patch | 85 -----------------
.../milkytracker/milkytracker-1.02.00-r1.ebuild | 59 ------------
7 files changed, 396 deletions(-)
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index e97cd0100e2..20fb22d338f 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,3 +1 @@
-DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
-DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
DIST milkytracker-1.03.00.tar.gz 3705395 BLAKE2B f14a7112de39748121933d242d89dc6efb71a73c3591fedb92785814e2edc788edfb6608e9237cdfed19ee7337d5920d0232eed5d85f692dbef5d4cb43a27cd0 SHA512 d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch
deleted file mode 100644
index d59522d6d1d..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-14464.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/fd607a3439fcdd0992e5efded3c16fc79c804e34
-
-commit fd607a3439fcdd0992e5efded3c16fc79c804e34
-Author: Christopher O'Neill <code@chrisoneill.co.uk>
-Date: Tue Jul 30 19:11:58 2019 +0100
-
- Fix #184: Heap overflow in S3M loader
-
-diff --git a/src/milkyplay/LoaderS3M.cpp b/src/milkyplay/LoaderS3M.cpp
-index 5abf211..edf0fd5 100644
---- a/src/milkyplay/LoaderS3M.cpp
-+++ b/src/milkyplay/LoaderS3M.cpp
-@@ -340,7 +340,11 @@ mp_sint32 LoaderS3M::load(XMFileBase& f, XModule* module)
- return MP_OUT_OF_MEMORY;
-
- header->insnum = f.readWord(); // number of instruments
-- header->patnum = f.readWord(); // number of patterns
-+ if (header->insnum > MP_MAXINS)
-+ return MP_LOADER_FAILED;
-+ header->patnum = f.readWord(); // number of patterns
-+ if (header->patnum > 256)
-+ return MP_LOADER_FAILED;
-
- mp_sint32 flags = f.readWord(); // st3 flags
-
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch
deleted file mode 100644
index 0560cd2b825..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2019-1449x.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-This patch is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/ea7772a3fae0a9dd0a322e8fec441d15843703b7
-
-commit ea7772a3fae0a9dd0a322e8fec441d15843703b7
-Author: Christopher O'Neill <code@chrisoneill.co.uk>
-Date: Tue Jul 30 18:40:03 2019 +0100
-
- Fixes for buffer overflow issues #182 & #183
-
-diff --git a/src/milkyplay/LoaderXM.cpp b/src/milkyplay/LoaderXM.cpp
-index 108d915..f87f5c1 100644
---- a/src/milkyplay/LoaderXM.cpp
-+++ b/src/milkyplay/LoaderXM.cpp
-@@ -63,8 +63,8 @@ const char* LoaderXM::identifyModule(const mp_ubyte* buffer)
- mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- {
- mp_ubyte insData[230];
-- mp_sint32 smpReloc[96];
-- mp_ubyte nbu[96];
-+ mp_sint32 smpReloc[MP_MAXINSSAMPS];
-+ mp_ubyte nbu[MP_MAXINSSAMPS];
- mp_uint32 fileSize = 0;
-
- module->cleanUp();
-@@ -117,6 +117,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- memcpy(header->ord, hdrBuff+16, 256);
- if(header->ordnum > MP_MAXORDERS)
- header->ordnum = MP_MAXORDERS;
-+ if(header->insnum > MP_MAXINS)
-+ return MP_LOADER_FAILED;
-
- delete[] hdrBuff;
-
-@@ -143,7 +145,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- f.read(&instr[y].type,1,1);
- mp_uword numSamples = 0;
- f.readWords(&numSamples,1);
-- if(numSamples > 96)
-+ if(numSamples > MP_MAXINSSAMPS)
- return MP_LOADER_FAILED;
- instr[y].samp = numSamples;
-
-@@ -169,8 +171,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- if (instr[y].samp) {
- mp_ubyte* insDataPtr = insData;
-
-- memcpy(nbu, insDataPtr, 96);
-- insDataPtr+=96;
-+ memcpy(nbu, insDataPtr, MP_MAXINSSAMPS);
-+ insDataPtr+=MP_MAXINSSAMPS;
-
- TEnvelope venv;
- TEnvelope penv;
-@@ -285,7 +287,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
-
- instr[y].samp = g;
-
-- for (sc = 0; sc < 96; sc++) {
-+ for (sc = 0; sc < MP_MAXINSSAMPS; sc++) {
- if (smpReloc[nbu[sc]] == -1)
- instr[y].snum[sc] = -1;
- else
-@@ -491,6 +493,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
- f.read(&instr[y].type,1,1);
- f.readWords(&instr[y].samp,1);
- }
-+ if (instr[y].samp > MP_MAXINSSAMPS)
-+ return MP_LOADER_FAILED;
-
- //printf("%i, %i\n", instr[y].size, instr[y].samp);
-
-@@ -532,8 +536,8 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
-
- //f.read(&nbu,1,96);
-
-- memcpy(nbu, insDataPtr, 96);
-- insDataPtr+=96;
-+ memcpy(nbu, insDataPtr, MP_MAXINSSAMPS);
-+ insDataPtr+=MP_MAXINSSAMPS;
-
- TEnvelope venv;
- TEnvelope penv;
-@@ -650,7 +654,7 @@ mp_sint32 LoaderXM::load(XMFileBase& f, XModule* module)
-
- instr[y].samp = g;
-
-- for (sc = 0; sc < 96; sc++) {
-+ for (sc = 0; sc < MP_MAXINSSAMPS; sc++) {
- if (smpReloc[nbu[sc]] == -1)
- instr[y].snum[sc] = -1;
- else
-diff --git a/src/milkyplay/XModule.h b/src/milkyplay/XModule.h
-index f42d04b..4f04a2d 100644
---- a/src/milkyplay/XModule.h
-+++ b/src/milkyplay/XModule.h
-@@ -40,6 +40,8 @@
-
- #define MP_MAXTEXT 32
- #define MP_MAXORDERS 256
-+#define MP_MAXINS 255
-+#define MP_MAXINSSAMPS 96
-
- struct TXMHeader
- {
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch
deleted file mode 100644
index 59c2f9942ae..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-CVE-2020-15569.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix is from upstream:
-https://github.com/milkytracker/MilkyTracker/commit/7afd55c42ad80d01a339197a2d8b5461d214edaf
-
-Gentoo Bug: https://bugs.gentoo.org/711280
-
-commit 7afd55c42ad80d01a339197a2d8b5461d214edaf
-Author: Jeremy Clarke <geckojsc@gmail.com>
-Date: Mon Apr 13 23:53:51 2020 +0100
-
- Fix use-after-free in PlayerGeneric destructor
-
-diff --git a/src/milkyplay/PlayerGeneric.cpp b/src/milkyplay/PlayerGeneric.cpp
-index 8df2c13..59f7cba 100644
---- a/src/milkyplay/PlayerGeneric.cpp
-+++ b/src/milkyplay/PlayerGeneric.cpp
-@@ -202,15 +202,16 @@ PlayerGeneric::PlayerGeneric(mp_sint32 frequency, AudioDriverInterface* audioDri
-
- PlayerGeneric::~PlayerGeneric()
- {
-- if (mixer)
-- delete mixer;
-
- if (player)
- {
-- if (mixer->isActive() && !mixer->isDeviceRemoved(player))
-+ if (mixer && mixer->isActive() && !mixer->isDeviceRemoved(player))
- mixer->removeDevice(player);
- delete player;
- }
-+
-+ if (mixer)
-+ delete mixer;
-
- delete[] audioDriverName;
-
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
deleted file mode 100644
index 48e6dc39cb5..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
-index ffbf6ea..fa6fdce 100644
---- a/src/tracker/EQConstants.cpp
-+++ b/src/tracker/EQConstants.cpp
-@@ -27,9 +27,9 @@
-
- const float EQConstants::EQ3bands[3] =
- {
-- p(5), // 32 Hz
-- p(9), // 522 Hz
-- p(12), // 4181.5 Hz
-+ (float) p(5), // 32 Hz
-+ (float) p(9), // 522 Hz
-+ (float) p(12), // 4181.5 Hz
- };
-
- const float EQConstants::EQ3bandwidths[3] =
-@@ -41,28 +41,28 @@ const float EQConstants::EQ3bandwidths[3] =
-
- const float EQConstants::EQ10bands[10] =
- {
-- p(3), // 8 Hz
-- p(4), // 16 Hz
-- p(5), // 32 Hz
-- p(6), // 65 Hz
-- p(7), // 130 Hz
-- p(8), // 261 Hz
-- p(9), // 522 Hz
-- p(10), // 1 kHz
-- p(11), // 2 kHz
-- p(12), // 4181.5 Hz
-+ (float) p(3), // 8 Hz
-+ (float) p(4), // 16 Hz
-+ (float) p(5), // 32 Hz
-+ (float) p(6), // 65 Hz
-+ (float) p(7), // 130 Hz
-+ (float) p(8), // 261 Hz
-+ (float) p(9), // 522 Hz
-+ (float) p(10), // 1 kHz
-+ (float) p(11), // 2 kHz
-+ (float) p(12), // 4181.5 Hz
- };
-
- const float EQConstants::EQ10bandwidths[10] =
- {
- 16,
-- p(3)*1.5f,
-- p(4)*1.5f,
-- p(5)*1.5f,
-- p(6)*1.5f,
-- p(7)*1.5f,
-- p(8)*1.0f,
-- p(9)*1.0f,
-+ (float) p(3)*1.5f,
-+ (float) p(4)*1.5f,
-+ (float) p(5)*1.5f,
-+ (float) p(6)*1.5f,
-+ (float) p(7)*1.5f,
-+ (float) p(8)*1.0f,
-+ (float) p(9)*1.0f,
- 600.0f,
- 800.0f
- };
-diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
-index 420b4d9..d404f08 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] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (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] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
-
- PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
- RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
deleted file mode 100644
index 090e433b5fd..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From f85f5336df72dc44e407ae756ed20a8f8422cb76 Mon Sep 17 00:00:00 2001
-From: Dale Whinham <daleyo@gmail.com>
-Date: Sat, 11 Apr 2020 16:51:31 +0100
-Subject: [PATCH] Fix hard dependency on RtMidi
-
-It is perfectly reasonable for libasound to be installed, but not
-librtmidi, and so we should only enable the MIDI code if both are
-present.
-
-Fixes #207.
----
- src/tracker/CMakeLists.txt | 1 +
- src/tracker/sdl/SDL_Main.cpp | 12 ++++++------
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
-index 0a935330..f4243a0f 100644
---- a/src/tracker/CMakeLists.txt
-+++ b/src/tracker/CMakeLists.txt
-@@ -348,6 +348,7 @@ elseif(WIN32)
- target_link_libraries(tracker midi)
- else()
- if(ALSA_FOUND AND RTMIDI_FOUND)
-+ target_compile_definitions(tracker PRIVATE -DHAVE_LIBRTMIDI)
- target_link_libraries(tracker midi)
- endif()
- endif()
-diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
-index 1a49fc12..75ffa1df 100644
---- a/src/tracker/sdl/SDL_Main.cpp
-+++ b/src/tracker/sdl/SDL_Main.cpp
-@@ -78,7 +78,7 @@
- #include "PPSystem_POSIX.h"
- #include "PPPath_POSIX.h"
-
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- #include "../midi/posix/MidiReceiver_pthread.h"
- #endif
- // --------------------------------------------------------------------------
-@@ -89,7 +89,7 @@ static SDL_TimerID timer;
- static PPScreen* myTrackerScreen = NULL;
- static Tracker* myTracker = NULL;
- static PPDisplayDevice* myDisplayDevice = NULL;
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- static MidiReceiver* myMidiReceiver = NULL;
- #endif
-
-@@ -223,7 +223,7 @@ static Uint32 SDLCALL timerCallback(Uint32 interval, void* param)
- return interval;
- }
-
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- class MidiEventHandler : public MidiReceiver::MidiEventHandler
- {
- public:
-@@ -829,7 +829,7 @@ myDisplayDevice = new PPDisplayDeviceFB(windowSize.width, windowSize.height, sca
- // Startup procedure
- myTracker->startUp(noSplash);
-
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- InitMidi();
- #endif
-
-@@ -962,7 +962,7 @@ int main(int argc, char *argv[])
- initTracker(defaultBPP, orientation, swapRedBlue, noSplash);
- globalMutex->unlock();
-
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- if (myMidiReceiver && recVelocity)
- {
- myMidiReceiver->setRecordVelocity(true);
-@@ -1036,7 +1036,7 @@ int main(int argc, char *argv[])
- SDL_RemoveTimer(timer);
-
- globalMutex->lock();
--#ifdef HAVE_LIBASOUND
-+#ifdef HAVE_LIBRTMIDI
- delete myMidiReceiver;
- #endif
- delete myTracker;
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
deleted file mode 100644
index ca410696e6b..00000000000
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-# This commit is needed so the milkytrace binary is linked properly, bug 711564
-# It is also ~40kb so it is better to fetch it rather than ship it in-tree
-COMMIT="2b145b074581ddf3b4ad78a402cdf5fab500b125"
-
-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
- https://github.com/milkytracker/MilkyTracker/commit/${COMMIT}.patch -> ${P}-cmake.patch"
-
-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? ( virtual/jack )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${DISTDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-CVE-2019-14464.patch"
- "${FILESDIR}/${P}-CVE-2019-1449x.patch"
- "${FILESDIR}/${P}-CVE-2020-15569.patch"
- "${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
- "${FILESDIR}/${P}-clang.patch"
-)
-
-S="${WORKDIR}/MilkyTracker-${PV}"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package alsa ALSA)
- $(cmake_use_find_package jack JACK)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- newicon resources/pictures/carton.png ${PN}.png
- make_desktop_entry ${PN} MilkyTracker ${PN} \
- "AudioVideo;Audio;Sequencer"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2020-09-08 8:30 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2020-09-08 8:30 UTC (permalink / raw
To: gentoo-commits
commit: 877d04a251b527dd22730b95457353af1a8a20dd
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 08:30:12 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 08:30:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877d04a2
media-sound/milkytracker: fixed compilation with clang++ in 1.02.00-r1
Closes: https://bugs.gentoo.org/740394
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/milkytracker-1.02.00-clang.patch | 85 ++++++++++++++++++++++
.../milkytracker/milkytracker-1.02.00-r1.ebuild | 1 +
2 files changed, 86 insertions(+)
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
new file mode 100644
index 00000000000..48e6dc39cb5
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
@@ -0,0 +1,85 @@
+diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
+index ffbf6ea..fa6fdce 100644
+--- a/src/tracker/EQConstants.cpp
++++ b/src/tracker/EQConstants.cpp
+@@ -27,9 +27,9 @@
+
+ const float EQConstants::EQ3bands[3] =
+ {
+- p(5), // 32 Hz
+- p(9), // 522 Hz
+- p(12), // 4181.5 Hz
++ (float) p(5), // 32 Hz
++ (float) p(9), // 522 Hz
++ (float) p(12), // 4181.5 Hz
+ };
+
+ const float EQConstants::EQ3bandwidths[3] =
+@@ -41,28 +41,28 @@ const float EQConstants::EQ3bandwidths[3] =
+
+ const float EQConstants::EQ10bands[10] =
+ {
+- p(3), // 8 Hz
+- p(4), // 16 Hz
+- p(5), // 32 Hz
+- p(6), // 65 Hz
+- p(7), // 130 Hz
+- p(8), // 261 Hz
+- p(9), // 522 Hz
+- p(10), // 1 kHz
+- p(11), // 2 kHz
+- p(12), // 4181.5 Hz
++ (float) p(3), // 8 Hz
++ (float) p(4), // 16 Hz
++ (float) p(5), // 32 Hz
++ (float) p(6), // 65 Hz
++ (float) p(7), // 130 Hz
++ (float) p(8), // 261 Hz
++ (float) p(9), // 522 Hz
++ (float) p(10), // 1 kHz
++ (float) p(11), // 2 kHz
++ (float) p(12), // 4181.5 Hz
+ };
+
+ const float EQConstants::EQ10bandwidths[10] =
+ {
+ 16,
+- p(3)*1.5f,
+- p(4)*1.5f,
+- p(5)*1.5f,
+- p(6)*1.5f,
+- p(7)*1.5f,
+- p(8)*1.0f,
+- p(9)*1.0f,
++ (float) p(3)*1.5f,
++ (float) p(4)*1.5f,
++ (float) p(5)*1.5f,
++ (float) p(6)*1.5f,
++ (float) p(7)*1.5f,
++ (float) p(8)*1.0f,
++ (float) p(9)*1.0f,
+ 600.0f,
+ 800.0f
+ };
+diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
+index 420b4d9..d404f08 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] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (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] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
+
+ PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
+ RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
index b27c6c5260b..b86251123c5 100644
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${P}-CVE-2019-1449x.patch"
"${FILESDIR}/${P}-CVE-2020-15569.patch"
"${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
+ "${FILESDIR}/${P}-clang.patch"
)
S="${WORKDIR}/MilkyTracker-${PV}"
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2020-08-08 8:49 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2020-08-08 8:49 UTC (permalink / raw
To: gentoo-commits
commit: 0396facd8f27eee98893cfc68de03905d9b95892
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 08:48:35 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 08:48:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0396facd
media-sound/milkytracker: fixes
1) added xdg
2) switched to virtual/jack
3) fixed compilation wrt rtmidi
Closes: https://bugs.gentoo.org/736306
Closes: https://bugs.gentoo.org/735916
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...ker-1.02.00-fix-hard-dependency-on-rtmidi.patch | 85 ++++++++++++++++++++++
...02.00.ebuild => milkytracker-1.02.00-r1.ebuild} | 9 ++-
2 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
new file mode 100644
index 00000000000..090e433b5fd
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch
@@ -0,0 +1,85 @@
+From f85f5336df72dc44e407ae756ed20a8f8422cb76 Mon Sep 17 00:00:00 2001
+From: Dale Whinham <daleyo@gmail.com>
+Date: Sat, 11 Apr 2020 16:51:31 +0100
+Subject: [PATCH] Fix hard dependency on RtMidi
+
+It is perfectly reasonable for libasound to be installed, but not
+librtmidi, and so we should only enable the MIDI code if both are
+present.
+
+Fixes #207.
+---
+ src/tracker/CMakeLists.txt | 1 +
+ src/tracker/sdl/SDL_Main.cpp | 12 ++++++------
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
+index 0a935330..f4243a0f 100644
+--- a/src/tracker/CMakeLists.txt
++++ b/src/tracker/CMakeLists.txt
+@@ -348,6 +348,7 @@ elseif(WIN32)
+ target_link_libraries(tracker midi)
+ else()
+ if(ALSA_FOUND AND RTMIDI_FOUND)
++ target_compile_definitions(tracker PRIVATE -DHAVE_LIBRTMIDI)
+ target_link_libraries(tracker midi)
+ endif()
+ endif()
+diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
+index 1a49fc12..75ffa1df 100644
+--- a/src/tracker/sdl/SDL_Main.cpp
++++ b/src/tracker/sdl/SDL_Main.cpp
+@@ -78,7 +78,7 @@
+ #include "PPSystem_POSIX.h"
+ #include "PPPath_POSIX.h"
+
+-#ifdef HAVE_LIBASOUND
++#ifdef HAVE_LIBRTMIDI
+ #include "../midi/posix/MidiReceiver_pthread.h"
+ #endif
+ // --------------------------------------------------------------------------
+@@ -89,7 +89,7 @@ static SDL_TimerID timer;
+ static PPScreen* myTrackerScreen = NULL;
+ static Tracker* myTracker = NULL;
+ static PPDisplayDevice* myDisplayDevice = NULL;
+-#ifdef HAVE_LIBASOUND
++#ifdef HAVE_LIBRTMIDI
+ static MidiReceiver* myMidiReceiver = NULL;
+ #endif
+
+@@ -223,7 +223,7 @@ static Uint32 SDLCALL timerCallback(Uint32 interval, void* param)
+ return interval;
+ }
+
+-#ifdef HAVE_LIBASOUND
++#ifdef HAVE_LIBRTMIDI
+ class MidiEventHandler : public MidiReceiver::MidiEventHandler
+ {
+ public:
+@@ -829,7 +829,7 @@ myDisplayDevice = new PPDisplayDeviceFB(windowSize.width, windowSize.height, sca
+ // Startup procedure
+ myTracker->startUp(noSplash);
+
+-#ifdef HAVE_LIBASOUND
++#ifdef HAVE_LIBRTMIDI
+ InitMidi();
+ #endif
+
+@@ -962,7 +962,7 @@ int main(int argc, char *argv[])
+ initTracker(defaultBPP, orientation, swapRedBlue, noSplash);
+ globalMutex->unlock();
+
+-#ifdef HAVE_LIBASOUND
++#ifdef HAVE_LIBRTMIDI
+ if (myMidiReceiver && recVelocity)
+ {
+ myMidiReceiver->setRecordVelocity(true);
+@@ -1036,7 +1036,7 @@ int main(int argc, char *argv[])
+ SDL_RemoveTimer(timer);
+
+ globalMutex->lock();
+-#ifdef HAVE_LIBASOUND
++#ifdef HAVE_LIBRTMIDI
+ delete myMidiReceiver;
+ #endif
+ delete myTracker;
diff --git a/media-sound/milkytracker/milkytracker-1.02.00.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
similarity index 90%
rename from media-sound/milkytracker/milkytracker-1.02.00.ebuild
rename to media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
index d9dc64d7f6e..b27c6c5260b 100644
--- a/media-sound/milkytracker/milkytracker-1.02.00.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake desktop
+inherit cmake desktop xdg
# This commit is needed so the milkytrace binary is linked properly, bug 711564
# It is also ~40kb so it is better to fetch it rather than ship it in-tree
@@ -24,7 +24,7 @@ RDEPEND="
media-libs/libsdl2[X]
sys-libs/zlib
alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )"
+ jack? ( virtual/jack )"
DEPEND="${RDEPEND}"
PATCHES=(
@@ -32,10 +32,15 @@ PATCHES=(
"${FILESDIR}/${P}-CVE-2019-14464.patch"
"${FILESDIR}/${P}-CVE-2019-1449x.patch"
"${FILESDIR}/${P}-CVE-2020-15569.patch"
+ "${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
)
S="${WORKDIR}/MilkyTracker-${PV}"
+src_prepare() {
+ cmake_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package alsa ALSA)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2020-07-19 23:45 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-07-19 23:45 UTC (permalink / raw
To: gentoo-commits
commit: 6e850373228ff95fb18186bf65f5cf31e127f99e
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Mon Jul 6 03:50:38 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 23:38:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e850373
media-sound/milkytracker: Drop 1.0.0
Bug: https://bugs.gentoo.org/711280
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16605
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/milkytracker/Manifest | 1 -
.../files/milkytracker-1.0.0-cmake.patch | 148 ---------------------
.../files/milkytracker-1.0.0-docdir.patch | 71 ----------
media-sound/milkytracker/milkytracker-1.0.0.ebuild | 46 -------
4 files changed, 266 deletions(-)
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 34a0214ebc1..ebeb8bcf05c 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,3 +1,2 @@
-DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
deleted file mode 100644
index 391ec55c7d8..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 87d0f55cd8868d91472f96cccafaf6fdb9e0cbbc Mon Sep 17 00:00:00 2001
-From: Dale Whinham <daleyo@gmail.com>
-Date: Thu, 31 Oct 2019 21:21:28 +0000
-Subject: [PATCH] CMake: Use SDL2's official CMake package mechanism
-
-We shouldn't need to rely on a FindSDL2.cmake, as SDL2 comes with a
-CMake package definition that should be installed by the distro into a
-location where CMake can find it.
-
-Fixes #168.
----
- CMakeLists.txt | 4 +-
- cmake/FindSDL2.cmake | 104 -------------------------------------------
- 2 files changed, 1 insertion(+), 107 deletions(-)
- delete mode 100644 cmake/FindSDL2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27ad4a18..5b6ed9f1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,6 @@ if(FORCESDL)
- unset(APPLE)
- unset(WIN32)
- add_definitions(-D__FORCE_SDL_AUDIO__)
-- # Frameworks not supported by findSDL2.cmake
-- set(CMAKE_FIND_FRAMEWORK NEVER)
- endif()
-
- # Lowercase project name for binaries and packaging
-@@ -166,7 +164,7 @@ else()
- # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
- cmake_policy(SET CMP0004 OLD)
-
-- find_package(SDL2 2 REQUIRED)
-+ find_package(SDL2 REQUIRED)
- endif()
-
- # Prefer static linkage under OS X for libraries located with find_package()
-diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
-deleted file mode 100644
-index 27c78f05..00000000
---- a/cmake/FindSDL2.cmake
-+++ /dev/null
-@@ -1,104 +0,0 @@
--# - Find SDL2 library and headers
--#
--# Find module for SDL 2.0 (http://www.libsdl.org/).
--# It defines the following variables:
--# SDL2_INCLUDE_DIRS - The location of the headers, e.g., SDL.h.
--# SDL2_LIBRARIES - The libraries to link against to use SDL2.
--# SDL2_FOUND - If false, do not try to use SDL2.
--# SDL2_VERSION_STRING - Human-readable string containing the version of SDL2.
--#
--# This module responds to the the flag:
--# SDL2_BUILDING_LIBRARY
--# If this is defined, then no SDL2_main will be linked in because
--# only applications need main().
--# Otherwise, it is assumed you are building an application and this
--# module will attempt to locate and set the the proper link flags
--# as part of the returned SDL2_LIBRARIES variable.
--#
--# Also defined, but not for general use are:
--# SDL2_INCLUDE_DIR - The directory that contains SDL.h.
--# SDL2_LIBRARY - The location of the SDL2 library.
--# SDL2MAIN_LIBRARY - The location of the SDL2main library.
--#
--
--#=============================================================================
--# Copyright 2013 Benjamin Eikel
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions are met:
--# * Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# * Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--# * Neither the name of the <organization> nor the
--# names of its contributors may be used to endorse or promote products
--# derived from this software without specific prior written permission.
--#
--# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
--# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
--# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
--# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
--# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--find_package(PkgConfig QUIET)
--pkg_check_modules(PC_SDL2 QUIET sdl2)
--
--find_path(SDL2_INCLUDE_DIR
-- NAMES SDL.h
-- HINTS
-- ${PC_SDL2_INCLUDEDIR}
-- ${PC_SDL2_INCLUDE_DIRS}
-- PATH_SUFFIXES SDL2
--)
--
--find_library(SDL2_LIBRARY
-- NAMES SDL2
-- HINTS
-- ${PC_SDL2_LIBDIR}
-- ${PC_SDL2_LIBRARY_DIRS}
-- PATH_SUFFIXES x64 x86
--)
--
--if(NOT SDL2_BUILDING_LIBRARY)
-- find_library(SDL2MAIN_LIBRARY
-- NAMES SDL2main
-- HINTS
-- ${PC_SDL2_LIBDIR}
-- ${PC_SDL2_LIBRARY_DIRS}
-- PATH_SUFFIXES x64 x86
-- )
--endif()
--
--if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
-- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
-- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
-- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
-- string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
-- string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
-- string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
-- set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH})
-- unset(SDL2_VERSION_MAJOR_LINE)
-- unset(SDL2_VERSION_MINOR_LINE)
-- unset(SDL2_VERSION_PATCH_LINE)
-- unset(SDL2_VERSION_MAJOR)
-- unset(SDL2_VERSION_MINOR)
-- unset(SDL2_VERSION_PATCH)
--endif()
--
--set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
--set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
--
--include(FindPackageHandleStandardArgs)
--
--find_package_handle_standard_args(SDL2
-- REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARY
-- VERSION_VAR SDL2_VERSION_STRING)
--
--mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY)
diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
deleted file mode 100644
index aeae02af2b0..00000000000
--- a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 7 May 2017 10:49:21 +0200
-Subject: [PATCH] Use GNUInstallDirs in order to change installation paths
-
-* This allows distro-specific modification of directories
- to adjust to different FHS layouts.
----
- CMakeLists.txt | 5 ++++-
- docs/CMakeLists.txt | 2 +-
- resources/music/CMakeLists.txt | 2 +-
- src/tracker/CMakeLists.txt | 2 +-
- 4 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 996e2f0..bac54f3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,9 +19,12 @@
- # along with MilkyTracker. If not, see <http://www.gnu.org/licenses/>.
- #
-
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 2.8.5)
- project(MilkyTracker)
-
-+# Adhere to GNU filesystem layout conventions
-+include(GNUInstallDirs)
-+
- # Force SDL if requested
- option(FORCESDL "Force SDL instead of native" OFF)
- if(FORCESDL)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 0aacc60..aca4a61 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -35,7 +35,7 @@ elseif(WIN32)
- set(INSTALL_DEST .)
- else()
- list(APPEND DOCUMENTS readme_unix)
-- set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER})
-+ set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR})
- endif()
-
- install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST})
-diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt
-index f918b6e..f29fcd6 100644
---- a/resources/music/CMakeLists.txt
-+++ b/resources/music/CMakeLists.txt
-@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm")
- if(APPLE OR WIN32)
- set(INSTALL_DEST "Example Songs")
- else()
-- set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs)
-+ set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs)
- endif()
-
- install(FILES ${SONGS} DESTINATION ${INSTALL_DEST})
-diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
-index 1e4062e..b7a96a7 100644
---- a/src/tracker/CMakeLists.txt
-+++ b/src/tracker/CMakeLists.txt
-@@ -399,7 +399,7 @@ target_link_libraries(
- if(APPLE OR WIN32)
- set(INSTALL_DEST .)
- else()
-- set(INSTALL_DEST bin)
-+ set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR})
- endif()
-
- install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST})
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
deleted file mode 100644
index 3d5f9f04861..00000000000
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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}-docdir.patch
- "${FILESDIR}"/${P}-cmake.patch
-)
-
-S="${WORKDIR}/MilkyTracker-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package alsa ALSA)
- $(cmake_use_find_package jack JACK)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- newicon resources/pictures/carton.png ${PN}.png
- make_desktop_entry ${PN} MilkyTracker ${PN} \
- "AudioVideo;Audio;Sequencer"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/
@ 2017-05-07 9:04 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-05-07 9:04 UTC (permalink / raw
To: gentoo-commits
commit: ac6ac7ced985938d1a57678a853794f50cf75a95
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 09:03:35 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 7 09:04:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6ac7ce
media-sound/milkytracker: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-sound/milkytracker/Manifest | 1 -
.../files/milkytracker-0.90.86-underlinking.patch | 11 ------
.../milkytracker/milkytracker-0.90.86.ebuild | 45 ----------------------
3 files changed, 57 deletions(-)
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 3b3a5da9eb6..395a73d3e98 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,2 +1 @@
-DIST milkytracker-0.90.86.tar.bz2 2202256 SHA256 eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed SHA512 8142f0b438e478571db25960d1b31f1d8c7e68feea96bdd238d1b1c1744105d929f18c990a301af6bebfc2d517bad687232410477ced6d8c4bfec8053cfcad8e WHIRLPOOL 3c388cde08c81a73e80ee834e7b1cef90dc32d3e7885de47259cb3b219bd7207f816c240b87fede59335ec5a2561a00e23ab3aa05b5e34f4bbe3ae7866ff5045
DIST milkytracker-1.0.0.tar.gz 3749140 SHA256 7fa982561c297aae7ed8223d2535c1f0a72057da01d002e8665b9223206932dc SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4 WHIRLPOOL 859f8604b8b61cfd8467dfe5d72d68800938d1054f69c91abcb129bb8082c549d9791a94f10429aa1c7a7b3e0db097f1f5828213526af6af640ea44b9ead0a34
diff --git a/media-sound/milkytracker/files/milkytracker-0.90.86-underlinking.patch b/media-sound/milkytracker/files/milkytracker-0.90.86-underlinking.patch
deleted file mode 100644
index fb270ab17e2..00000000000
--- a/media-sound/milkytracker/files/milkytracker-0.90.86-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tracker/Makefile.am
-+++ src/tracker/Makefile.am
-@@ -76,7 +76,7 @@
- $(top_builddir)/src/ppui/osinterface/libosinterface.a \
- $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \
- $(top_builddir)/src/compression/zziplib/generic/libzzip.a \
--$(Z_LIBS)
-+$(Z_LIBS) $(ALSA_LIBS)
- #$(ZZIP_LIBS) read below
-
- # NOTE: The MilkyTracker source contains a MODIFIED version of the zzip
diff --git a/media-sound/milkytracker/milkytracker-0.90.86.ebuild b/media-sound/milkytracker/milkytracker-0.90.86.ebuild
deleted file mode 100644
index 70be7c3dcc7..00000000000
--- a/media-sound/milkytracker/milkytracker-0.90.86.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# TODO: Unbundle dev-libs/zziplib!
-
-inherit autotools eutils
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="http://milkytracker.org/"
-SRC_URI="http://milkytracker.org/files/${P}.tar.bz2"
-
-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=">=media-libs/libsdl-1.2:=[X]
- sys-libs/zlib:=
- alsa? ( media-libs/alsa-lib:= )
- jack? ( media-sound/jack-audio-connection-kit:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-underlinking.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with alsa) \
- $(use_with jack)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS docs/{readme_unix,TiTAN.nfo}
- dohtml docs/{ChangeLog,FAQ,MilkyTracker}.html
-
- newicon resources/pictures/carton.png ${PN}.png
- make_desktop_entry ${PN} MilkyTracker ${PN} \
- "AudioVideo;Audio;Sequencer"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-27 13:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-13 7:06 [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/, media-sound/milkytracker/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-05-27 13:56 Sam James
2021-04-19 20:54 Sam James
2020-09-08 8:30 Miroslav Šulc
2020-08-08 8:49 Miroslav Šulc
2020-07-19 23:45 Sam James
2017-05-07 9:04 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox