From: mtboehlke <mtboehlke@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wildmidi: update to 0.4.5.
Date: Sun, 06 Aug 2023 01:23:15 +0200 [thread overview]
Message-ID: <20230805232315.aLeKNyjMlzE24UNbyr8fG7GWwbrlxbgjEV80uF0oW_Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45069@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1520 bytes --]
There is an updated pull request by mtboehlke against master on the void-packages repository
https://github.com/mtboehlke/void-packages wildmidi
https://github.com/void-linux/void-packages/pull/45069
wildmidi: update to 0.4.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
There seems to be a problem with the project website, which is why I have the homepage field set to the github page. I did open an [issue](https://github.com/Mindwerks/wildmidi/issues/244) upstream, since the github page does still reference the project homepage.
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45069.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wildmidi-45069.patch --]
[-- Type: text/x-diff, Size: 4527 bytes --]
From a957bfce7ddfac89def727a547f6c222e1213a85 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 16 Jul 2023 15:11:30 -0500
Subject: [PATCH] wildmidi: update to 0.4.5.
Add patch to refer to github project as the homepage,
and move usr/lib/cmake files to libwildmidi-devel
---
.../wildmidi/patches/replace_home_page.patch | 44 +++++++++++++++++++
srcpkgs/wildmidi/patches/save_midi.patch | 13 ------
srcpkgs/wildmidi/template | 9 ++--
3 files changed, 49 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/wildmidi/patches/replace_home_page.patch
delete mode 100644 srcpkgs/wildmidi/patches/save_midi.patch
diff --git a/srcpkgs/wildmidi/patches/replace_home_page.patch b/srcpkgs/wildmidi/patches/replace_home_page.patch
new file mode 100644
index 0000000000000..6b25316185f44
--- /dev/null
+++ b/srcpkgs/wildmidi/patches/replace_home_page.patch
@@ -0,0 +1,44 @@
+Adapted from
+https://github.com/Mindwerks/wildmidi/commit/a128266be48f2e2fabcf308232f88c2bbaa03677
+
+Replace mindwerks.net home page with the github project page in the package.
+---
+diff --git a/README.md b/README.md
+index 4f33e7e..e05912a 100644
+--- a/README.md
++++ b/README.md
+@@ -8,7 +8,7 @@ applications that wish to include MIDI file playback.
+
+ Version: 0.4.5
+ Licenses: GPLv3+ and LGPLv3
+-Website: http://www.mindwerks.net/projects/wildmidi
++Website: https://github.com/Mindwerks/wildmidi
+
+ PLATFORMS:
+
+diff --git a/include/config.h.cmake b/include/config.h.cmake
+index 65ab0b8..3f52ae7 100644
+--- a/include/config.h.cmake
++++ b/include/config.h.cmake
+@@ -4,7 +4,7 @@
+ #define PACKAGE "wildmidi"
+
+ /* Define to the home page for this package. */
+-#define PACKAGE_URL "http://www.mindwerks.net/projects/wildmidi/"
++#define PACKAGE_URL "https://github.com/Mindwerks/wildmidi"
+
+ /* Define to the address where bug reports for this package should be sent. */
+ #define PACKAGE_BUGREPORT "https://github.com/Mindwerks/wildmidi/issues"
+diff --git a/src/wildmidi.pc.in b/src/wildmidi.pc.in
+index 3d8e84f..1a73284 100644
+--- a/src/wildmidi.pc.in
++++ b/src/wildmidi.pc.in
+@@ -8,7 +8,7 @@ includedir=${exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ Name: WildMIDI
+ Description: software synthesizer library
+ Version: @WILDMIDI_VERSION@
+-URL: https://www.mindwerks.net/projects/wildmidi/
++URL: https://github.com/Mindwerks/wildmidi
+
+ Libs: -L${libdir} -lWildMidi
+ Libs.private: -lm
diff --git a/srcpkgs/wildmidi/patches/save_midi.patch b/srcpkgs/wildmidi/patches/save_midi.patch
deleted file mode 100644
index ed957815cb362..0000000000000
--- a/srcpkgs/wildmidi/patches/save_midi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/wildmidi.c src/wildmidi.c
-index a9ae0f1..fd9c5e7 100644
---- a/src/wildmidi.c
-+++ b/src/wildmidi.c
-@@ -1997,7 +1997,7 @@ int main(int argc, char **argv) {
- WildMidi_ClearError();
- } else {
- char *real_file = FIND_LAST_DIRSEP(argv[optind-1]);
-- if (!real_file) real_file = argv[optind];
-+ if (!real_file) real_file = argv[optind-1];
- else real_file++;
- mk_midifile_name(real_file);
- printf("\rWriting %s: %u bytes.\r\n", midi_file, getmidisize);
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index b137521f535af..be5db7c2f3bf2 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -1,7 +1,7 @@
# Template file for 'wildmidi'
pkgname=wildmidi
-version=0.4.4
-revision=2
+version=0.4.5
+revision=1
build_style=cmake
configure_args="-DWANT_ALSA=1 -DWANT_OSS=1 -DWANT_OPENAL=1"
hostmakedepends="pkg-config"
@@ -10,9 +10,9 @@ depends="libwildmidi"
short_desc="Simple software midi player and core softsynth library"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later, LGPL-3.0-only"
-homepage="https://www.mindwerks.net/projects/wildmidi"
+homepage="https://github.com/Mindwerks/wildmidi"
distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=6f267c8d331e9859906837e2c197093fddec31829d2ebf7b958cf6b7ae935430
+checksum=116c0f31d349eaa74a630ed5a9a17b6a351204877a4ed9fb9aacd9dbd7f6c874
post_install() {
vsconf ${FILESDIR}/wildmidi.cfg
@@ -35,6 +35,7 @@ libwildmidi-devel_package() {
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove usr/share/man/man3
}
}
next prev parent reply other threads:[~2023-08-05 23:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-16 21:00 [PR PATCH] " mtboehlke
2023-07-17 5:32 ` oreo639
2023-07-17 7:13 ` oreo639
2023-07-17 22:47 ` [PR PATCH] [Updated] " mtboehlke
2023-07-17 22:52 ` mtboehlke
2023-08-05 23:23 ` mtboehlke [this message]
2023-08-05 23:28 ` mtboehlke
2023-08-06 1:36 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230805232315.aLeKNyjMlzE24UNbyr8fG7GWwbrlxbgjEV80uF0oW_Q@z \
--to=mtboehlke@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).