Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wildmidi: update to 0.4.5.
@ 2023-07-16 21:00 mtboehlke
  2023-07-17  5:32 ` oreo639
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: mtboehlke @ 2023-07-16 21:00 UTC (permalink / raw)
  To: ml

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

There is a new 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: 2324 bytes --]

From e2efe084a4e89c62856a7b5193077d7ec8a45696 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.

---
 srcpkgs/wildmidi/patches/save_midi.patch | 13 -------------
 srcpkgs/wildmidi/template                |  8 ++++----
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/wildmidi/patches/save_midi.patch

diff --git a/srcpkgs/wildmidi/patches/save_midi.patch b/srcpkgs/wildmidi/patches/save_midi.patch
deleted file mode 100644
index ed957815cb36..000000000000
--- 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 b137521f535a..431feb2757f9 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
@ 2023-07-17  5:32 ` oreo639
  2023-07-17  7:13 ` oreo639
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2023-07-17  5:32 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/45069#issuecomment-1637405891

Comment:
Hrm, I went to test this an apparently I was already running 0.4.5, probably was testing it and forgot about it.

Thank you for noticing the website issue, I tested this PR and it works for me.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
  2023-07-17  5:32 ` oreo639
@ 2023-07-17  7:13 ` oreo639
  2023-07-17 22:47 ` [PR PATCH] [Updated] " mtboehlke
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2023-07-17  7:13 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/45069#issuecomment-1637405891

Comment:
Hrm, I went to test this an apparently I was already running 0.4.5, probably was testing it and forgot about it.

Thank you for noticing the website issue, I tested this PR and it works for me.
Might be a good idea to add this patch as well: https://github.com/Mindwerks/wildmidi/commit/a128266be48f2e2fabcf308232f88c2bbaa03677

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
  2023-07-17  5:32 ` oreo639
  2023-07-17  7:13 ` oreo639
@ 2023-07-17 22:47 ` mtboehlke
  2023-07-17 22:52 ` mtboehlke
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: mtboehlke @ 2023-07-17 22:47 UTC (permalink / raw)
  To: ml

[-- 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: 12485 bytes --]

From a9440cd073757cee1d8ed64d580468b00c267713 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 upstream patch to refer to github project as homepage
---
 .../wildmidi/patches/replace_home_page.patch  | 268 ++++++++++++++++++
 srcpkgs/wildmidi/patches/save_midi.patch      |  13 -
 srcpkgs/wildmidi/template                     |   8 +-
 3 files changed, 272 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 000000000000..95346b66fdd7
--- /dev/null
+++ b/srcpkgs/wildmidi/patches/replace_home_page.patch
@@ -0,0 +1,268 @@
+From a128266be48f2e2fabcf308232f88c2bbaa03677 Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Mon, 17 Jul 2023 01:10:10 +0300
+Subject: [PATCH] replaced the mindwerks.net home page with the github project
+ page.
+
+---
+ README.md              |  2 +-
+ amiga/config.h         |  2 +-
+ android/jni/config.h   |  3 +--
+ djgpp/config.h         |  4 ++--
+ include/config.h.cmake |  2 +-
+ macosx/config.h        |  2 +-
+ mingw/config.h         |  2 +-
+ os2/config.h           |  2 +-
+ src/DevTest.c          | 29 ++++++++++++-----------------
+ src/wildmidi.pc.in     |  2 +-
+ 10 files changed, 22 insertions(+), 28 deletions(-)
+
+diff --git a/README.md b/README.md
+index 4f33e7ed..e05912a9 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/amiga/config.h b/amiga/config.h
+index 69af0d6f..a462ae84 100644
+--- a/amiga/config.h
++++ b/amiga/config.h
+@@ -3,7 +3,7 @@
+ 
+ #define WILDMIDI_CFG "wildmidi.cfg"
+ 
+-#define PACKAGE_URL "http://www.mindwerks.net/projects/wildmidi/"
++#define PACKAGE_URL "https://github.com/Mindwerks/wildmidi"
+ #define PACKAGE_BUGREPORT "https://github.com/Mindwerks/wildmidi/issues"
+ 
+ #define PACKAGE_VERSION "0.4.5"
+diff --git a/android/jni/config.h b/android/jni/config.h
+index 99b4de71..a9882d87 100644
+--- a/android/jni/config.h
++++ b/android/jni/config.h
+@@ -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"
+@@ -63,7 +63,6 @@
+ 
+ /* Define our audio drivers */
+ /* #undef HAVE_SYS_SOUNDCARD_H */
+-
+ /* #undef AUDIODRV_ALSA */
+ /* #undef AUDIODRV_OSS */
+ /* #undef AUDIODRV_OPENAL */
+diff --git a/djgpp/config.h b/djgpp/config.h
+index c70926c5..115beaf3 100644
+--- a/djgpp/config.h
++++ b/djgpp/config.h
+@@ -1,6 +1,6 @@
+ #define WILDMIDI_CFG "wildmidi.cfg"
+ 
+-#define PACKAGE_URL "http://www.mindwerks.net/projects/wildmidi/"
++#define PACKAGE_URL "https://github.com/Mindwerks/wildmidi"
+ #define PACKAGE_BUGREPORT "https://github.com/Mindwerks/wildmidi/issues"
+ 
+ #define PACKAGE_VERSION "0.4.5"
+@@ -14,4 +14,4 @@
+ #define __builtin_expect(x,c) x
+ #endif
+ 
+-#define WM_NO_LOCK 1 /* don't need locking in MSDOS */
++#define WM_NO_LOCK 1 /* don't need locking in MS-DOS */
+diff --git a/include/config.h.cmake b/include/config.h.cmake
+index 65ab0b8e..3f52ae7c 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/macosx/config.h b/macosx/config.h
+index 34ccadae..776f46dc 100644
+--- a/macosx/config.h
++++ b/macosx/config.h
+@@ -1,6 +1,6 @@
+ #define WILDMIDI_CFG "wildmidi.cfg"
+ 
+-#define PACKAGE_URL "http://www.mindwerks.net/projects/wildmidi/"
++#define PACKAGE_URL "https://github.com/Mindwerks/wildmidi"
+ #define PACKAGE_BUGREPORT "https://github.com/Mindwerks/wildmidi/issues"
+ 
+ #define PACKAGE_VERSION "0.4.5"
+diff --git a/mingw/config.h b/mingw/config.h
+index efed7ac9..f91c316d 100644
+--- a/mingw/config.h
++++ b/mingw/config.h
+@@ -1,6 +1,6 @@
+ #define WILDMIDI_CFG "wildmidi.cfg"
+ 
+-#define PACKAGE_URL "http://www.mindwerks.net/projects/wildmidi/"
++#define PACKAGE_URL "https://github.com/Mindwerks/wildmidi"
+ #define PACKAGE_BUGREPORT "https://github.com/Mindwerks/wildmidi/issues"
+ 
+ #define PACKAGE_VERSION "0.4.5"
+diff --git a/os2/config.h b/os2/config.h
+index d0832fd6..162d17ee 100644
+--- a/os2/config.h
++++ b/os2/config.h
+@@ -1,6 +1,6 @@
+ #define WILDMIDI_CFG "wildmidi.cfg"
+ 
+-#define PACKAGE_URL "http://www.mindwerks.net/projects/wildmidi/"
++#define PACKAGE_URL "https://github.com/Mindwerks/wildmidi"
+ #define PACKAGE_BUGREPORT "https://github.com/Mindwerks/wildmidi/issues"
+ 
+ #define PACKAGE_VERSION "0.4.5"
+diff --git a/src/DevTest.c b/src/DevTest.c
+index e3ce8cd7..84c72f05 100644
+--- a/src/DevTest.c
++++ b/src/DevTest.c
+@@ -109,7 +109,7 @@ static float env_time_table[] = {
+ };
+ 
+ /* the following hardcoded to avoid the need for a config.h : */
+-static const char *PACKAGE_URL = "http://www.mindwerks.net/projects/wildmidi/";
++static const char *PACKAGE_URL = "https://github.com/Mindwerks/wildmidi";
+ static const char *PACKAGE_BUGREPORT = "https://github.com/Mindwerks/wildmidi/issues";
+ static const char *PACKAGE_VERSION = "0.4";
+ 
+@@ -1576,10 +1576,10 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+     unsigned long int tempo = 500000;
+     int check_ret = 0;
+     unsigned int total_count = 0;
+-    
++
+     unsigned long int changeTempoAtTick[256][2] = {{0}};
+     unsigned long int changeTempoOfs = 0;
+-    
++
+     if (strncmp((char *) midi_data, "RIFF", 4) == 0) {
+         midi_data += 20;
+         midi_size -= 20;
+@@ -1672,7 +1672,6 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+     }
+ 
+     for (i = 0; i < no_tracks; i++) {
+-        
+         if (midi_size < 8) {
+             printf("Midi File Too Short\n");
+             return -1;
+@@ -1689,10 +1688,9 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+                 reset_time();
+             delta_accum = 0;
+             changeTempoOfs = 0;
+-            
++
+             tempo = 500000;
+             set_secs_per_tick (divisions, tempo);
+-            
+         }
+         midi_data += 4;
+         midi_size -= 4;
+@@ -1711,7 +1709,7 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+             printf("Midi File Too Short: Missing Track Data\n");
+             return -1;
+         }
+-        
++
+         /* Ignore EOT check for type 0 */
+         if (midi_type != 0) {
+             if ((midi_data[track_size - 3] != 0xFF)
+@@ -1739,10 +1737,10 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+                 }
+             }
+             delta = (delta << 7) | (*midi_data & 0x7F);
+-            
++
+             if (verbose) {
+                 delta_accum += delta;
+-                
++
+                 if ((midi_type == 1) && (i != 0)) {
+                     /*
+                      * since type 1 midi's store tempo info on first track
+@@ -1750,20 +1748,18 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+                      */
+                     if ((changeTempoOfs == 0) || changeTempoAtTick[changeTempoOfs][0] > 0) {
+                         if (changeTempoAtTick[changeTempoOfs][0] <= delta_accum) {
+-                            
+                             new_delta = delta_accum - changeTempoAtTick[changeTempoOfs][0];
+                             delta -= new_delta;
+                             add_time(delta);
+                             set_secs_per_tick (divisions, changeTempoAtTick[changeTempoOfs][1]);
+                             changeTempoOfs++;
+                             delta = new_delta;
+-                            
+                         }
+                     }
+                 }
+                 add_and_display_time(delta);
+             }
+-           
++
+             midi_data++;
+             if (midi_size == 0) {
+                 printf("Corrupt Midi, Missing or Corrupt Track Data\n");
+@@ -1771,7 +1767,7 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+             }
+             midi_size--;
+             total_count++;
+-            
++
+             if (*midi_data < 0x80) {
+                 if (running_event == 0) {
+                     printf("Currupt Midi: expected event, got data\n");
+@@ -1832,19 +1828,18 @@ static int test_midi(unsigned char * midi_data, unsigned long int midi_size,
+                     return 0;
+                 }
+                 midi_data += check_ret;
+-                
++
+             } else {
+                 unsigned char *tmp_ptr = midi_data + check_ret;
+-                
++
+                 if (tmp_ptr > next_track) {
+                     printf("Corrupt Midi, Track Data went beyond track boundries.\n");
+                     return -1;
+                 }
+-                    
++
+                 /*
+                  * For type 1 & 2 we do check for EOT
+                  */
+-                
+                 if ((midi_data[0] == 0xff) && (midi_data[1] == 0x2f) && (midi_data[2] == 0x0)) {
+                     /*
+                      * Because some Midi files have data after EOT we just ignore the
+diff --git a/src/wildmidi.pc.in b/src/wildmidi.pc.in
+index 3d8e84f2..1a732848 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 ed957815cb36..000000000000
--- 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 b137521f535a..431feb2757f9 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
                   ` (2 preceding siblings ...)
  2023-07-17 22:47 ` [PR PATCH] [Updated] " mtboehlke
@ 2023-07-17 22:52 ` mtboehlke
  2023-08-05 23:23 ` [PR PATCH] [Updated] " mtboehlke
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: mtboehlke @ 2023-07-17 22:52 UTC (permalink / raw)
  To: ml

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/45069#issuecomment-1638995776

Comment:
Thanks!  I did go ahead and include that patch.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
                   ` (3 preceding siblings ...)
  2023-07-17 22:52 ` mtboehlke
@ 2023-08-05 23:23 ` mtboehlke
  2023-08-05 23:28 ` mtboehlke
  2023-08-06  1:36 ` [PR PATCH] [Merged]: " classabbyamp
  6 siblings, 0 replies; 8+ messages in thread
From: mtboehlke @ 2023-08-05 23:23 UTC (permalink / raw)
  To: ml

[-- 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
 	}
 }

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
                   ` (4 preceding siblings ...)
  2023-08-05 23:23 ` [PR PATCH] [Updated] " mtboehlke
@ 2023-08-05 23:28 ` mtboehlke
  2023-08-06  1:36 ` [PR PATCH] [Merged]: " classabbyamp
  6 siblings, 0 replies; 8+ messages in thread
From: mtboehlke @ 2023-08-05 23:28 UTC (permalink / raw)
  To: ml

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/45069#issuecomment-1666639254

Comment:
Instead of patching in that whole commit, I'm leaving out the changes for non-linux specific files and those whitespaces changes, which makes for a smaller patch.  Also moving usr/lib/cmake to -devel subpackage.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Merged]: wildmidi: update to 0.4.5.
  2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 mtboehlke
                   ` (5 preceding siblings ...)
  2023-08-05 23:28 ` mtboehlke
@ 2023-08-06  1:36 ` classabbyamp
  6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2023-08-06  1:36 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

wildmidi: update to 0.4.5.
https://github.com/void-linux/void-packages/pull/45069

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-08-06  1:36 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-16 21:00 [PR PATCH] wildmidi: update to 0.4.5 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 ` [PR PATCH] [Updated] " mtboehlke
2023-08-05 23:28 ` mtboehlke
2023-08-06  1:36 ` [PR PATCH] [Merged]: " classabbyamp

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).