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

2022-12-15 Thread Sam James 
commit: 29c8efe4d1690bd639b4e375ab9c1989fc4de3d8
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:45:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:46:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c8efe4

media-libs/sdl-sound: drop 1.0.3-r3

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

 media-libs/sdl-sound/Manifest  |  1 -
 .../files/sdl-sound-1.0.3-automake-1.13.patch  | 11 ---
 .../files/sdl-sound-1.0.3-physfs-3.0.1.patch   | 38 --
 .../files/sdl-sound-1.0.3-underlinking.patch   | 18 -
 media-libs/sdl-sound/metadata.xml  |  3 -
 media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild | 88 --
 6 files changed, 159 deletions(-)

diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 3e2fb92fe0ca..820626233482 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -1,2 +1 @@
-DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 
6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6
 SHA512 
3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
 DIST sdl-sound-1.0.3_p20220525.tar.gz 1044804 BLAKE2B 
f82f7649bd411290d12ec6b6a4879e0f6a5a155b764b307b087ce2cad5b81dc0ac6fed674c666f470201e5aab5182d9e0c4b6f0d9fc94e9d4bc61d7dacd61cdd
 SHA512 
0f4923e8234334c65697c1d9453a66b05aafd859b1586d9ed26005d93f4a27175b06a77616f09e450b586d0f21c7a1d76761de0fe5f1b144d444e6a2379055b5

diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-automake-1.13.patch 
b/media-libs/sdl-sound/files/sdl-sound-1.0.3-automake-1.13.patch
deleted file mode 100644
index 0bd2aa272a78..
--- a/media-libs/sdl-sound/files/sdl-sound-1.0.3-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 SDL_sound-1.0.3/configure.in
-+++ SDL_sound-1.0.3/configure.in
-@@ -43,7 +43,7 @@
- AC_CANONICAL_TARGET
- 
- dnl Setup for automake
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(SDL_sound, $VERSION)
- 
- 

diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch 
b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
deleted file mode 100644
index 1aa06d37f5cd..
--- a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 a/playsound/physfsrwops.h.ini  2008-04-17 13:56:21.0 -0400
-+++ b/playsound/physfsrwops.h  2017-12-23 05:05:31.657371092 -0500
-@@ -39,7 +39,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *   of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
-+SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
- 
- /**
-  * Open a platform-independent filename for writing, and make it accessible
-@@ -51,7 +51,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *   of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
-+SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
- 
- /**
-  * Open a platform-independent filename for appending, and make it accessible
-@@ -63,7 +63,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *   of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
-+SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
- 
- /**
-  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
-@@ -75,7 +75,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *   of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
-+SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
- 
- #ifdef __cplusplus
- }

diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-underlinking.patch 
b/media-libs/sdl-sound/files/sdl-sound-1.0.3-underlinking.patch
deleted file mode 100644
index 36eb24a3e2fb..
--- a/media-libs/sdl-sound/files/sdl-sound-1.0.3-underlinking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald 
-Date: Tue Aug 21 12:42:14 UTC 2012
-Subject: build system
-
-fix underlinking
-
 SDL_sound-1.0.3/Makefile.am
-+++ SDL_sound-1.0.3/Makefile.am
-@@ -32,7 +32,8 @@
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libSDL_sound_la_LIBADD =  \
-   decoders/libdecoders.la \
--  $(TIMIDITY_LIB) $(MPGLIB_LIB)
-+  $(TIMIDITY_LIB) $(MPGLIB_LIB) \
-+  -lm
- 
- EXTRA_DIST =  \
-   CREDITS \

diff --git a/media-libs/sdl-sound/metadata.xml 
b/media-libs/sdl-sound/metadata.xml
index f155573d634e..3399f3f29004 100644
--- a/media-libs/sdl-sound/metadata.xml
+++

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

2022-11-11 Thread Sam James 
commit: 8ab5097f819e140eeb8a4266e5b77b2156beef19
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 12 02:52:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 12 02:53:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab5097f

media-libs/sdl-sound: fix linking with lld

See patch header for commentary but I was pretty sure I'd
checked one of the sdl-* for an underlinking patch and it
was obsolete. Maybe it was another one. In any case,
sent upstream this time, unlike the one from 10 years ago(!)

Reported-by: John Helmert III  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 .../sdl-sound-1.0.3_p20220525-underlinking.patch   | 45 ++
 .../sdl-sound/sdl-sound-1.0.3_p20220525.ebuild | 13 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git 
a/media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch 
b/media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch
new file mode 100644
index ..cbf96a66320e
--- /dev/null
+++ b/media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch
@@ -0,0 +1,45 @@
+https://github.com/icculus/SDL_sound/pull/80
+
+From 83f33e04125517197520e26452d06b81c2d7b429 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 12 Nov 2022 02:49:21 +
+Subject: [PATCH] Fix underlinking with lld (missing -lm)
+
+We need to explicitly search for and link with -lm if needed by
+libc for math libraries like `log` and `sin`:
+```
+ld.lld: error: undefined reference due to --no-allow-shlib-undefined: sin
+>>> referenced by ../.libs/libSDL_sound.so
+
+ld.lld: error: undefined reference due to --no-allow-shlib-undefined: log
+>>> referenced by ../.libs/libSDL_sound.so
+```
+
+It turns out Gentoo has actually had a patch for this since 2012 (mea
+culpa!) but it never made its way upstream.
+
+We're already using libtool, so just use the macro it provides for
+this purpose.
+
+Signed-off-by: Sam James 
+--- a/Makefile.am
 b/Makefile.am
+@@ -12,7 +12,7 @@ endif
+ SDLSOUND_HDRS = SDL_sound.h
+ SDLSOUND_SRCS = SDL_sound.c SDL_sound_internal.h alt_audio_convert.c 
alt_audio_convert.h audio_convert.c
+ SDLSOUND_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info 
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-SDLSOUND_LIBADD = decoders/libdecoders.la $(TIMIDITY_LIB)
++SDLSOUND_LIBADD = decoders/libdecoders.la $(TIMIDITY_LIB) $(LIBM)
+ 
+ if USE_SDL2
+ lib_LTLIBRARIES = libSDL2_sound.la
+--- a/configure.ac
 b/configure.ac
+@@ -54,6 +54,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ LT_INIT([win32-dll])
++LT_LIB_M
+ PKG_PROG_PKG_CONFIG
+ 
+ 

diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild 
b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
index 59d4ac776545..f4f1d4c6bc7c 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # Check stable-1.0 branch for possible backports/new snapshots
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 SDL_SOUND_COMMIT="2076a4f555f95ed28dead5e28ee8e57cc74e425f"
 
@@ -36,6 +36,17 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.3_p20220525-underlinking.patch
+)
+
+src_prepare() {
+   default
+
+   # Drop this once sdl-sound-1.0.3_p20220525-underlinking.patch merged
+   eautoreconf
+}
+
 multilib_src_configure() {
local myeconfargs=(
# TODO: make this optional or switch unconditionally?

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

2019-03-09 Thread James Le Cuirot 
commit: dd01fdf7773b74566b1371632c3f9ff90927dcd3
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sat Mar  9 15:02:52 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 21:59:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd01fdf7

media-libs/sdl-sound: fix build with dev-games/physfs-3.0.1

Also reworked whole eBuild and bumped to EAPI=7.
Added also new build options, to support more formats.

Closes: https://bugs.gentoo.org/636266
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki  kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11319
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/sdl-sound-1.0.3-physfs-3.0.1.patch   | 38 ++
 media-libs/sdl-sound/metadata.xml  | 17 +++--
 media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild | 84 ++
 3 files changed, 132 insertions(+), 7 deletions(-)

diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch 
b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
new file mode 100644
index 000..1aa06d37f5c
--- /dev/null
+++ b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
@@ -0,0 +1,38 @@
+--- a/playsound/physfsrwops.h.ini  2008-04-17 13:56:21.0 -0400
 b/playsound/physfsrwops.h  2017-12-23 05:05:31.657371092 -0500
+@@ -39,7 +39,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *   of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for writing, and make it accessible
+@@ -51,7 +51,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *   of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for appending, and make it accessible
+@@ -63,7 +63,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *   of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+ 
+ /**
+  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
+@@ -75,7 +75,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *   of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
++SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+ 
+ #ifdef __cplusplus
+ }

diff --git a/media-libs/sdl-sound/metadata.xml 
b/media-libs/sdl-sound/metadata.xml
index 1e8838a2661..b8a69a91b16 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -1,11 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-ga...@gentoo.org
-Gentoo Games Project
-  
-  
-Enable physfs support
-  
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   Enable support for various formats through 
dev-games/physfs.
+   
+   
+   mailto:sdlso...@icculus.org
+   
 

diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild 
b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
new file mode 100644
index 000..96b514fa29e
--- /dev/null
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+
+DESCRIPTION="A library for handling the decoding of various sound file formats"
+HOMEPAGE="https://icculus.org/SDL_sound/;
+SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
+IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
+
+RDEPEND="
+   >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+   flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+   mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
+   modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+   mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+   physfs? ( >=dev-games/physfs-3.0.1[${MULTILIB_USEDEP}] )
+   speex? (
+   >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]
+   >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+   )
+   vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+