pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rtmidi: remove unneeded part of patch



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Sun Dec 19 12:05:21 2021 +0100
Changeset:	fe8e71060249a683d86a5f72753a5e6880a7dbd9

Modified Files:
	rtmidi/PLIST
	rtmidi/distinfo
	rtmidi/patches/patch-CMakeLists.txt

Log Message:
rtmidi: remove unneeded part of patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fe8e71060249a683d86a5f72753a5e6880a7dbd9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rtmidi/PLIST                        |  8 ++++----
 rtmidi/distinfo                     |  2 +-
 rtmidi/patches/patch-CMakeLists.txt | 12 +-----------
 3 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/rtmidi/PLIST b/rtmidi/PLIST
index cdbfb81900..77a995ae50 100644
--- a/rtmidi/PLIST
+++ b/rtmidi/PLIST
@@ -1,11 +1,11 @@
 @comment $NetBSD$
 include/rtmidi/RtMidi.h
 include/rtmidi/rtmidi_c.h
-lib/cmake/rtmidi/RtMidiTargets-noconfig.cmake
-lib/cmake/rtmidi/RtMidiTargets.cmake
-lib/cmake/rtmidi/rtmidi-config-version.cmake
-lib/cmake/rtmidi/rtmidi-config.cmake
 lib/librtmidi.so
 lib/librtmidi.so.6
 lib/librtmidi.so.6.0.0
 lib/pkgconfig/rtmidi.pc
+share/rtmidi/RtMidiTargets-noconfig.cmake
+share/rtmidi/RtMidiTargets.cmake
+share/rtmidi/rtmidi-config-version.cmake
+share/rtmidi/rtmidi-config.cmake
diff --git a/rtmidi/distinfo b/rtmidi/distinfo
index 238381de89..1574e37465 100644
--- a/rtmidi/distinfo
+++ b/rtmidi/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (rtmidi-5.0.0.tar.gz) = c41c51342aad49d0d65f0c13c981dc92f2e811b227bd13b5af772cae99711482
 SHA512 (rtmidi-5.0.0.tar.gz) = d2688b6777c09c213e1f6800c67bca6905ac9a0161480e7c167583322a64be086bb47f1452cc45d4a4e2c1d3d3fe626d57b4a187e79c0a20af4f6e23d4a3530a
 Size (rtmidi-5.0.0.tar.gz) = 528747 bytes
-SHA1 (patch-CMakeLists.txt) = 4b596c7a83105191f1bd38e5187d6472431f4cb0
+SHA1 (patch-CMakeLists.txt) = 061d5dfd081b53dcea486dd2d9154c1d676d5a3d
 SHA1 (patch-RtMidi.cpp) = 9eaac880696e3ea95718e4a8b9dfeffb85fc1be4
diff --git a/rtmidi/patches/patch-CMakeLists.txt b/rtmidi/patches/patch-CMakeLists.txt
index 24c009d6ad..6a1b2f774c 100644
--- a/rtmidi/patches/patch-CMakeLists.txt
+++ b/rtmidi/patches/patch-CMakeLists.txt
@@ -6,8 +6,7 @@ $NetBSD$
 * Define GNUIInstallDirs varibles before they are used and remove
   over inclusion of GNUInstallDirs
 
-* Install cmake package files into the right directory and
-  give them correct names so that they can be found by cmake 
+* Give cmake package files correct names so that they can be found by cmake 
 
 --- CMakeLists.txt.orig	2021-11-16 17:19:37.000000000 +0000
 +++ CMakeLists.txt
@@ -56,15 +55,6 @@ $NetBSD$
  # Message
  string(REPLACE ";" " " apilist "${API_LIST}")
  message(STATUS "Compiling with support for: ${apilist}")
-@@ -251,7 +248,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)
- 
- # Export library target (build-tree).
- export(EXPORT RtMidiTargets
 @@ -280,7 +277,7 @@ include(CMakePackageConfigHelpers)
  
  # Write cmake package version file


Home | Main Index | Thread Index | Old Index