rtmidi: upgrade 3.0.0 -> 4.0.0 / build with cmake
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,39 +0,0 @@
|
|||||||
From c25d1f794cdd478129ea01e525fbe87f623be9ed Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
|
||||||
Date: Sat, 7 Jan 2017 22:35:23 +0100
|
|
||||||
Subject: [PATCH] configure.ac: do not run temp binary in cross envirnoment
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
it is more a developer check before packing new version
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [embedded specific]
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
|
||||||
---
|
|
||||||
configure.ac | 8 --------
|
|
||||||
1 file changed, 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 39b532c..f45ca0e 100755
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -28,14 +28,6 @@ m4_define([lt_current_minus_age], [m4_eval(lt_current - lt_age)])
|
|
||||||
SO_VERSION=lt_version_info
|
|
||||||
AC_SUBST(SO_VERSION)
|
|
||||||
|
|
||||||
-# Check version number coherency between RtMidi.h and configure.ac
|
|
||||||
-AC_MSG_CHECKING([that version numbers are coherent])
|
|
||||||
-AC_RUN_IFELSE(
|
|
||||||
- [AC_LANG_PROGRAM([#include <string.h>
|
|
||||||
- `grep "define RTMIDI_VERSION" $srcdir/RtMidi.h`],
|
|
||||||
- [return strcmp(RTMIDI_VERSION, PACKAGE_VERSION);])],
|
|
||||||
- [AC_MSG_RESULT([yes])],
|
|
||||||
- [AC_MSG_FAILURE([testing RTMIDI_VERSION==PACKAGE_VERSION failed, check that RtMidi.h defines RTMIDI_VERSION as "$PACKAGE_VERSION" or that the first line of configure.ac has been updated.])])
|
|
||||||
|
|
||||||
# Enable some nice automake features if they are available
|
|
||||||
m4_ifdef([AM_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
|
|
||||||
--
|
|
||||||
2.5.5
|
|
||||||
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
From 3afd4de13c7019d7ad5ee63cb6557e18d52622ab Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
||||||
Date: Fri, 10 Aug 2018 15:52:36 +0200
|
|
||||||
Subject: [PATCH] configure.ac: do not reset CXXFLAGS
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
||||||
---
|
|
||||||
configure.ac | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 3f4cb0a..5049632 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -77,7 +77,7 @@ CPPFLAGS="$CPPFLAGS $cppflag"
|
|
||||||
|
|
||||||
# For debugging and optimization ... overwrite default because it has both -g and -O2
|
|
||||||
#CXXFLAGS="$CXXFLAGS $cxxflag"
|
|
||||||
-CXXFLAGS="$cxxflag"
|
|
||||||
+#CXXFLAGS="$cxxflag"
|
|
||||||
|
|
||||||
# Check compiler and use -Wall if gnu.
|
|
||||||
if [test $GXX = "yes" ;] then
|
|
||||||
--
|
|
||||||
2.14.4
|
|
||||||
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
From 5034424a8e11ea05f0149f038d981e667e838267 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
||||||
Date: Fri, 10 Aug 2018 16:00:27 +0200
|
|
||||||
Subject: [PATCH] configure.ac: do not add absolute prefixes to build flags
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
||||||
---
|
|
||||||
configure.ac | 6 ------
|
|
||||||
1 file changed, 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 5049632..3f7e183 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -66,12 +66,6 @@ AC_ARG_ENABLE(debug,
|
|
||||||
[AC_SUBST( cppflag, [-D__RTMIDI_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
|
|
||||||
[AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
|
|
||||||
|
|
||||||
-# Set paths if prefix is defined
|
|
||||||
-if test "x$prefix" != "x" && test "x$prefix" != "xNONE"; then
|
|
||||||
- LIBS="$LIBS -L$prefix/lib"
|
|
||||||
- CPPFLAGS="$CPPFLAGS -I$prefix/include/rtmidi"
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
# For -I and -D flags
|
|
||||||
CPPFLAGS="$CPPFLAGS $cppflag"
|
|
||||||
|
|
||||||
--
|
|
||||||
2.14.4
|
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
From 2298f90cd077301bc52ff10926f09d0e30d783a8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||||
|
Date: Fri, 2 Sep 2022 00:03:30 +0200
|
||||||
|
Subject: [PATCH] Fix cmake file installation path
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 28ee1f8..a5fb541 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -237,7 +237,7 @@ install(TARGETS ${LIB_TARGETS}
|
||||||
|
export(PACKAGE RtMidi)
|
||||||
|
|
||||||
|
# Set installation path for CMake files.
|
||||||
|
-set(RTMIDI_CMAKE_DESTINATION share/rtmidi)
|
||||||
|
+set(RTMIDI_CMAKE_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rtmidi)
|
||||||
|
|
||||||
|
# Create CMake configuration export file.
|
||||||
|
if(NEED_PTHREAD)
|
||||||
|
--
|
||||||
|
2.35.3
|
||||||
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
SUMMARY = "Real-time Midi I/O C++ Library"
|
|
||||||
HOMEPAGE = "http://www.music.mcgill.ca/~gary/rtmidi/index.html"
|
|
||||||
LICENSE = "MIT"
|
|
||||||
LIC_FILES_CHKSUM = "file://README.md;beginline=36;endline=61;md5=59cd2daf27733a6f784821dada162c75"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
|
||||||
|
|
||||||
PACKAGECONFIG ??= "alsa jack"
|
|
||||||
PACKAGECONFIG[alsa] = "--with-alsa,--without-alsa,alsa-lib"
|
|
||||||
PACKAGECONFIG[jack] = "--with-jack,--without-jack,jack"
|
|
||||||
|
|
||||||
SRC_URI = " \
|
|
||||||
http://www.music.mcgill.ca/~gary/${BPN}/release/${BPN}-${PV}.tar.gz \
|
|
||||||
file://0001-configure.ac-do-not-run-temp-binary-in-cross-envirno.patch \
|
|
||||||
file://0002-configure.ac-do-not-reset-CXXFLAGS.patch \
|
|
||||||
file://0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch \
|
|
||||||
"
|
|
||||||
SRC_URI[md5sum] = "d22e3a5dee972fa0725c420923f1ce65"
|
|
||||||
SRC_URI[sha256sum] = "d6ee3620236904a1067bd615ff012f1064cbfb389b09ac0b847bbcbd0f565214"
|
|
||||||
16
recipes-musicians/rtmidi/rtmidi_4.0.0.bb
Normal file
16
recipes-musicians/rtmidi/rtmidi_4.0.0.bb
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
SUMMARY = "Real-time Midi I/O C++ Library"
|
||||||
|
HOMEPAGE = "http://www.music.mcgill.ca/~gary/rtmidi/index.html"
|
||||||
|
LICENSE = "MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://README.md;beginline=39;endline=66;md5=1fe9a84d1f8505107a519996977deba8"
|
||||||
|
|
||||||
|
inherit cmake pkgconfig
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "alsa jack"
|
||||||
|
PACKAGECONFIG[alsa] = "-DRTMIDI_API_ALSA=ON,-DRTMIDI_API_ALSA=OFF,alsa-lib"
|
||||||
|
PACKAGECONFIG[jack] = "-DRTMIDI_API_JACK=ON,-DRTMIDI_API_JACK=OFF,jack"
|
||||||
|
|
||||||
|
SRC_URI = " \
|
||||||
|
https://www.music.mcgill.ca/~gary/${BPN}/release/${BPN}-${PV}.tar.gz \
|
||||||
|
file://0001-Fix-cmake-file-installation-path.patch \
|
||||||
|
"
|
||||||
|
SRC_URI[sha256sum] = "370cfe710f43fbeba8d2b8c8bc310f314338c519c2cf2865e2d2737b251526cd"
|
||||||
Reference in New Issue
Block a user