Github messages for voidlinux
 help / color / mirror / Atom feed
From: Oreo639 <Oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wildmidi: update to 0.4.4
Date: Sun, 21 Mar 2021 21:59:25 +0100	[thread overview]
Message-ID: <20210321205925.E2J4w_SC8m7MEo4C6QSy36ap9UIoCyWdp0QNt4P8Ubw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29668@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]

There is an updated pull request by Oreo639 against master on the void-packages repository

https://github.com/Oreo639/void-packages wildmidi
https://github.com/void-linux/void-packages/pull/29668

wildmidi: update to 0.4.4
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29668.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wildmidi-29668.patch --]
[-- Type: text/x-diff, Size: 3537 bytes --]

From 9db11eb875814174f563f026384e6c1c405ec9fd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Mar 2021 12:50:35 -0700
Subject: [PATCH] wildmidi: update to 0.4.4

---
 srcpkgs/wildmidi/patches/fix-midi_file.patch | 17 -----------------
 srcpkgs/wildmidi/patches/save_midi.patch     | 13 +++++++++++++
 srcpkgs/wildmidi/template                    |  6 +++---
 3 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/wildmidi/patches/fix-midi_file.patch
 create mode 100644 srcpkgs/wildmidi/patches/save_midi.patch

diff --git a/srcpkgs/wildmidi/patches/fix-midi_file.patch b/srcpkgs/wildmidi/patches/fix-midi_file.patch
deleted file mode 100644
index 99c56fba6290..000000000000
--- a/srcpkgs/wildmidi/patches/fix-midi_file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/wildmidi.c	2018-11-24 09:55:50.000000000 +0100
-+++ src/wildmidi.c	2020-01-23 17:07:12.497649804 +0100
-@@ -1978,12 +1978,8 @@
-                         if (!real_file) real_file = argv[optind];
-                         else real_file++;
- 
--                        strncpy(midi_file, real_file, strlen(real_file));
--                        midi_file[strlen(real_file)-4] = '.';
--                        midi_file[strlen(real_file)-3] = 'm';
--                        midi_file[strlen(real_file)-2] = 'i';
--                        midi_file[strlen(real_file)-1] = 'd';
--
-+                        snprintf(midi_file, sizeof(midi_file), "%.*s.mid",
-+                            (int)(strlen(real_file) - 4), real_file);
-                         printf("\rWriting %s: %u bytes.\r\n", midi_file, getmidisize);
-                         write_midi_output(getmidibuffer,getmidisize);
-                         free(getmidibuffer);
diff --git a/srcpkgs/wildmidi/patches/save_midi.patch b/srcpkgs/wildmidi/patches/save_midi.patch
new file mode 100644
index 000000000000..6f8cf832ad67
--- /dev/null
+++ b/srcpkgs/wildmidi/patches/save_midi.patch
@@ -0,0 +1,13 @@
+diff --git src/wildmidi.c src/wildmidi.c
+index a9ae0f1..fd9c5e7 100644
+--- src/wildmidi.c
++++ 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 e6772c66ca00..33843c0b7f4e 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -1,7 +1,7 @@
 # Template file for 'wildmidi'
 pkgname=wildmidi
-version=0.4.3
-revision=6
+version=0.4.4
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 configure_args="-DWANT_ALSA=1 -DWANT_OSS=1 -DWANT_OPENAL=1"
@@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="http://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=498e5a96455bb4b91b37188ad6dcb070824e92c44f5ed452b90adbaec8eef3c5
+checksum=6f267c8d331e9859906837e2c197093fddec31829d2ebf7b958cf6b7ae935430
 
 post_install() {
 	vsconf ${FILESDIR}/wildmidi.cfg

  parent reply	other threads:[~2021-03-21 20:59 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-21 20:00 [PR PATCH] " Oreo639
2021-03-21 20:02 ` Oreo639
2021-03-21 20:58 ` [PR REVIEW] " ericonr
2021-03-21 20:59 ` Oreo639 [this message]
2021-03-21 21:00 ` [PR PATCH] [Updated] " Oreo639
2021-03-21 21:00 ` [PR REVIEW] " Oreo639
2021-03-21 21:00 ` Oreo639
2021-03-21 21:06 ` ericonr
2021-03-21 21:09 ` Oreo639
2021-03-21 21:10 ` Oreo639
2021-03-21 21:11 ` Oreo639
2021-03-21 21:12 ` Oreo639
2021-03-21 21:17 ` Oreo639
2021-03-21 21:25 ` ericonr
2021-03-21 21:28 ` Oreo639
2021-03-21 21:33 ` Oreo639
2021-03-21 21:39 ` ericonr
2021-03-21 21:39 ` [PR PATCH] [Merged]: " ericonr

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=20210321205925.E2J4w_SC8m7MEo4C6QSy36ap9UIoCyWdp0QNt4P8Ubw@z \
    --to=oreo639@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).