[gentoo-commits] repo/gentoo:master commit in: media-libs/libmikmod/, media-libs/libmikmod/files/

2022-11-22 Thread Sam James 
commit: 63177ddd27328191cd402ec03ea358017800dedd
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 23 03:16:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 23 03:16:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63177ddd

media-libs/libmikmod: EAPI 8, fix -Wstrict-prototypes in configure

We may well have people proactively trying to use it and it's cheap to fix & 
build.

Signed-off-by: Sam James  gentoo.org>

 .../files/libmikmod-3.3.11.1-macro-strict-prototypes.patch | 14 ++
 media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild  |  4 
 2 files changed, 18 insertions(+)

diff --git 
a/media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch 
b/media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch
new file mode 100644
index ..9e408866df16
--- /dev/null
+++ 
b/media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch
@@ -0,0 +1,14 @@
+Already fixed upstream in 
https://github.com/sezero/mikmod/commit/4ceeed3f3929b9d9f7cfe891d44f43d202b64416.
+
+Fixes -Wstrict-prototypes.
+--- a/libmikmod.m4
 b/libmikmod.m4
+@@ -79,7 +79,7 @@ char* my_strdup (char *str)
+   return new_str;
+ }
+ 
+-int main()
++int main(void)
+ {
+   int major,minor,micro;
+   int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;

diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild 
b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild
index 96b5ee258b0b..56f0a26c6fa8 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild
@@ -32,6 +32,10 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/libmikmod-config
 )
 
+PATCHES=(
+   "${FILESDIR}"/${P}-macro-strict-prototypes.patch
+)
+
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmikmod/, media-libs/libmikmod/files/3.2.0/

2015-11-20 Thread Alexis Ballier 
commit: 1ab8a9812c16c8207df695c18ccbea517810730b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Nov 20 15:20:10 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Nov 20 15:24:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab8a981

media-libs/libmikmod: remove old

Package-Manager: portage-2.2.25
Signed-off-by: Alexis Ballier  gentoo.org>

 media-libs/libmikmod/Manifest  |   3 -
 .../libmikmod/files/3.2.0/001_all_64bit.patch  |  26 -
 .../libmikmod/files/3.2.0/002_all_strip-lib.patch  |  13 ---
 .../libmikmod/files/3.2.0/003_all_multilib.patch   |  35 ---
 .../files/3.2.0/004_all_malloc-fail.patch  |  22 -
 .../files/3.2.0/005_all_CVE-2007-6720.patch| 109 -
 .../files/3.2.0/006_all_CVE-2009-0179.patch|  12 ---
 .../files/3.2.0/007_all_loopingvolume-fix.patch|  21 
 .../libmikmod/files/3.2.0/008_all_ldflags.patch|  15 ---
 .../libmikmod/files/3.2.0/009_all_shell.patch  |  17 
 .../libmikmod/files/3.2.0/010_all_altivec.patch|  13 ---
 media-libs/libmikmod/libmikmod-3.2.0.ebuild|  63 
 media-libs/libmikmod/libmikmod-3.3.5.ebuild|  65 
 media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild |  69 -
 14 files changed, 483 deletions(-)

diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index fff1d96..e418d54 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,4 +1 @@
-DIST libmikmod-3.2.0.tar.gz 873258 SHA256 
734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 
1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d
 WHIRLPOOL 
f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3
-DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 
b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6 SHA512 
ded555754dcc582a112386ad80c11a29c77d696a184a593964449a6c2c024da5d4cc59133a20d0e0e18a6fbad710a5d8ff567527654c91dff06e070749442aab
 WHIRLPOOL 
30a72a0239257b511d1c2805b5812a57ec271263bbd306e327583a1ac0c8f83b31cdf0ff39846ddd72b650ad122ded2ea741dfdb16f6d43979a49f3c5fe2844e
-DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 
3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 
708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0
 WHIRLPOOL 
42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0
 DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 
4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 
3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9
 WHIRLPOOL 
708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf

diff --git a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch 
b/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
deleted file mode 100644
index 5aa4556..000
--- a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-64bit.patch
-
 include/mikmod.h.in
-+++ include/mikmod.h.in
-@@ -85,7 +85,8 @@ typedef char CHAR;
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || 
defined(__powerpc64__)
-+#include 
-+#if __WORDSIZE == 64
- /* 64 bit architectures */
- 
- typedef signed char SBYTE;  /* 1 byte, signed */
 include/mikmod_internals.h
-+++ include/mikmod_internals.h
-@@ -43,7 +43,8 @@ extern "C" {
- /*== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined 
(_LP64) || defined (__powerpc64__)
-+#include 
-+#if __WORDSIZE == 64
- typedef long  SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)

diff --git a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch 
b/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
deleted file mode 100644
index beef612..000
--- a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-strip-lib.patch
-
 libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -51,7 +51,7 @@
- 
- install:  $(LIB)
-   $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--  $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir)
-+  $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
- 
- uninstall:$(LIB)
-   $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)

diff --git