mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 15:08:57 +02:00
rtmidi, fix build for 32bit (#7066)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 75d2ff6da72f1cfdb6f0c725b0661b01116f6443 Mon Sep 17 00:00:00 2001
|
||||
From 84b2863754b678df74282b32a24d77e44ce69928 Mon Sep 17 00:00:00 2001
|
||||
From: Cacodemon345 <wahil1976@outlook.com>
|
||||
Date: Sun, 13 Mar 2022 23:56:17 +0600
|
||||
Subject: Add Haiku MidiKit2 backend
|
||||
@@ -63,7 +63,7 @@ index 616fdaf..62801c3 100644
|
||||
# Export library target (build-tree).
|
||||
export(EXPORT RtMidiTargets
|
||||
diff --git a/RtMidi.cpp b/RtMidi.cpp
|
||||
index 6a1c89e..66fd061 100644
|
||||
index 6a1c89e..4a0099e 100644
|
||||
--- a/RtMidi.cpp
|
||||
+++ b/RtMidi.cpp
|
||||
@@ -40,6 +40,13 @@
|
||||
@@ -528,5 +528,28 @@ index efbf977..0325876 100644
|
||||
};
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.36.1
|
||||
|
||||
|
||||
From 5b2e8f5a7286229aac9c8154dbfa565c69d8fe31 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Thu, 21 Jul 2022 14:55:31 +0200
|
||||
Subject: Fix install path for 32bit
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 62801c3..1fdeff2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -265,7 +265,7 @@ export(PACKAGE RtMidi)
|
||||
|
||||
# Set installation path for CMake files.
|
||||
if (HAIKU)
|
||||
- set(RTMIDI_CMAKE_DESTINATION lib/cmake/rtmidi)
|
||||
+ set(RTMIDI_CMAKE_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rtmidi)
|
||||
else()
|
||||
set(RTMIDI_CMAKE_DESTINATION share/rtmidi)
|
||||
endif()
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ MIDI hardware and software."
|
||||
HOMEPAGE="https://www.music.mcgill.ca/~gary/rtmidi"
|
||||
COPYRIGHT="2003-2019 Gary P. Scavone"
|
||||
LICENSE="RtMidi"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/theSTK/rtmidi/archive/refs/tags/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="c7923e4eee82b06c007435892cb2c3212d9007fa482c6b718943bda71c02c5a7"
|
||||
SOURCE_DIR="rtmidi-$portVersion"
|
||||
@@ -15,17 +15,12 @@ PATCHES="rtmidi-$portVersion.patchset"
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
commandBinDir=$binDir
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]
|
||||
then
|
||||
commandBinDir=$prefix/bin
|
||||
commandSuffix=
|
||||
fi
|
||||
libVersion="6.0.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
rtmidi$secondaryArchSuffix = $portVersion
|
||||
lib:librtmidi$secondaryArchSuffix = $portVersion
|
||||
lib:librtmidi$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -33,13 +28,13 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
rtmidi${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:librtmidi$secondaryArchSuffix = $portVersion
|
||||
devel:librtmidi$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku$secondaryArchSuffix
|
||||
rtmidi$secondaryArchSuffix == $portVersion
|
||||
"
|
||||
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
@@ -50,26 +45,23 @@ BUILD_PREREQUIRES="
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake .. $cmakeDirArgs \
|
||||
cmake -Bbuild -S. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DRTMIDI_BUILD_TESTING=0
|
||||
|
||||
make $jobArgs
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
|
||||
make -C build install
|
||||
|
||||
prepareInstalledDevelLib librtmidi
|
||||
fixPkgconfig
|
||||
|
||||
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$libDir/cmake
|
||||
|
||||
Reference in New Issue
Block a user