public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/
@ 2018-01-17 16:43 Daniel Pielmeier
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier @ 2018-01-17 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     62baa4781b9b7c6ba860d47b095d9b9ad4d40770
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 16:43:19 2018 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 16:43:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62baa478

media-sound/aqualung: Remove unused patch.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-sound/aqualung/files/aqualung-1.0-mac.patch | 26 -----------------------
 1 file changed, 26 deletions(-)

diff --git a/media-sound/aqualung/files/aqualung-1.0-mac.patch b/media-sound/aqualung/files/aqualung-1.0-mac.patch
deleted file mode 100644
index 16689ee0ae7..00000000000
--- a/media-sound/aqualung/files/aqualung-1.0-mac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Revert this patch.
-
-From 12c3a45a6d5b6ef0da70e0cdc424beff993eeef6 Mon Sep 17 00:00:00 2001
-From: Tom Szilagyi <tszilagyi@users.sourceforge.net>
-Date: Mon, 9 Jun 2014 12:54:54 +0000
-Subject: [PATCH] Make the APE decoder compile with current libmac-dev
- (4.11-u4-b5-s7-d)
-
-git-svn-id: https://svn.code.sf.net/p/aqualung/code/trunk@1303 3cd24cdc-1f22-0410-b8b1-dcf80e670293
----
- src/decoder/dec_mac.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
-index 024c8b9..2e9bc01 100644
---- a/src/decoder/dec_mac.cpp
-+++ b/src/decoder/dec_mac.cpp
-@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char * filename) {
- 
- 
- 	int ret = 0;
-+        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
--        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
-         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
-         free(pUTF16);
- 


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/
@ 2023-08-13 14:04 Daniel Pielmeier
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier @ 2023-08-13 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     58d529eec174f6457a6a1b15dec1e3208977d25b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:39:13 2023 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 14:02:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d529ee

media-sound/aqualung: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32286
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 media-sound/aqualung/files/aqualung-1.1-ifp.patch  | 41 ----------------------
 .../files/aqualung-1.1-var-collision.patch         | 31 ----------------
 2 files changed, 72 deletions(-)

diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
deleted file mode 100644
index 490999be9485..000000000000
--- a/media-sound/aqualung/files/aqualung-1.1-ifp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Tue, 8 Sep 2020 15:55:12 +0100
-Subject: [PATCH] Fix arr_strlcpy call in ifp_device.
-
-directory_chooser needs to know the length of the target.
----
- src/ifp_device.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ifp_device.c b/src/ifp_device.c
-index 9ef5741..42236cb 100644
---- a/src/ifp_device.c
-+++ b/src/ifp_device.c
-@@ -824,7 +824,7 @@ gchar *npath;
- 
- 
- void
--directory_chooser(char * title, GtkWidget * parent, char * directory) {
-+directory_chooser(char * title, GtkWidget * parent, char * directory, size_t directory_len) {
- 
-         GtkWidget * dialog;
- 	const gchar * selected_directory;
-@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
- 			gtk_widget_destroy(dialog);
- 		}
- 
--                arr_strlcpy(directory, selected_directory);
-+                g_strlcpy(directory, selected_directory, directory_len);
- 		g_free(utf8);
-         }
- 
-@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
- 
- void
- local_path_selected_cb(GtkButton * button, gpointer data) {
--	directory_chooser(_("Please select a local path."), aifp_window, dest_dir);
-+	directory_chooser(_("Please select a local path."), aifp_window, dest_dir, sizeof dest_dir);
-         gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir);
- }
- 

diff --git a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
deleted file mode 100644
index 2606a0bea00c..000000000000
--- a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sun, 10 Jan 2021 22:32:04 +0000
-Subject: [PATCH] Don't call a variable "bool".
-
-If one of the headers happens to #include <stdbool.h>, this'll clash
-with the C99 type definition.
----
- src/build_store.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/build_store.c b/src/build_store.c
-index 56b0eaf..ed4bfca 100644
---- a/src/build_store.c
-+++ b/src/build_store.c
-@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data)
- 	data_src_gui_t * gui = (data_src_gui_t *)data;
- 
- 	if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) {
--		gboolean bool;
-+		gboolean value;
- 		int type;
- 
--		gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1);
-+		gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1);
- 		gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter,
--				   0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
-+				   0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
- 	}
- }
- 


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/
@ 2023-09-30 14:48 Daniel Pielmeier
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier @ 2023-09-30 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6f9633fa02ef5fcb8f300a098b950addb78d438b
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 14:48:28 2023 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 14:48:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f9633fa

media-sound/aqualung/files: Add missing patches

Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../files/aqualung-1.2-mac-configure.patch         |  48 ++++++++
 .../aqualung/files/aqualung-1.2-mac-dec.patch      | 136 +++++++++++++++++++++
 .../files/aqualung-1.2-mac-endianness.patch        |  73 +++++++++++
 .../aqualung/files/aqualung-1.2-mac-glib.patch     |  22 ++++
 4 files changed, 279 insertions(+)

diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
new file mode 100644
index 000000000000..6418228158bf
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
@@ -0,0 +1,48 @@
+diff -Naur aqualung-1.2_orig/configure.ac aqualung-1.2/configure.ac
+--- aqualung-1.2_orig/configure.ac	2023-08-13 18:12:52.281251038 +0200
++++ aqualung-1.2/configure.ac	2023-08-13 18:13:55.693247259 +0200
+@@ -275,11 +275,11 @@
+         [AQUALUNG_FOUND([lavc])],
+         [AQUALUNG_MISSING([lavc], [$lavc_PKG_ERRORS])])])
+ 
+-AQUALUNG_DETECT([mac], [Monkey's Audio Codec],
+-    [AC_CHECK_LIB([mac], [CreateIAPEDecompress],
+-        [AQUALUNG_FOUND([mac], [-lmac -lstdc++])],
+-        [AQUALUNG_MISSING([mac],
+-            [Monkey's Audio Codec support requires libmac])],
++AQUALUNG_DETECT([MAC], [Monkey's Audio Codec],
++    [AC_CHECK_LIB([MAC], [CreateIAPEDecompress],
++        [AQUALUNG_FOUND([MAC], [-lMAC -lstdc++])],
++        [AQUALUNG_MISSING([MAC],
++            [Monkey's Audio Codec support requires libMAC])],
+         [-lstdc++])])
+ 
+ AQUALUNG_DETECT([mod], [MOD Audio],
+diff -Naur aqualung-1.2_orig/src/decoder/dec_mac.cpp aqualung-1.2/src/decoder/dec_mac.cpp
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp	2023-08-13 18:20:40.318223141 +0200
++++ aqualung-1.2/src/decoder/dec_mac.cpp	2023-08-13 18:21:33.661219962 +0200
+@@ -31,9 +31,9 @@
+ #define DLLEXPORT
+ 
+ #include "../undef_ac_pkg.h"
+-#include <mac/All.h>
+-#include <mac/MACLib.h>
+-#include <mac/CharacterHelper.h>
++#include <MAC/All.h>
++#include <MAC/MACLib.h>
++#include <MAC/CharacterHelper.h>
+ #include "../undef_ac_pkg.h"
+ #include <config.h>	/* re-establish undefined autoconf macros */
+ 
+diff -Naur aqualung-1.2_orig/src/Makefile.am aqualung-1.2/src/Makefile.am
+--- aqualung-1.2_orig/src/Makefile.am	2023-08-14 00:51:00.972827161 +0200
++++ aqualung-1.2/src/Makefile.am	2023-08-14 00:51:10.563826590 +0200
+@@ -25,7 +25,7 @@
+ aqualung_LDADD = $(LDADD) $(xml_LIBS) $(gtk_LIBS) $(glib_LIBS) \
+                  $(alsa_LIBS) $(jack_LIBS) $(oss_LIBS) $(pulse_LIBS) \
+                  $(sndio_LIBS) $(winmm_LIBS) \
+-                 $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(mac_LIBS) \
++                 $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(MAC_LIBS) \
+                  $(mad_LIBS) $(mod_LIBS) $(mpc_LIBS) $(sndfile_LIBS) \
+                  $(speex_LIBS) $(vorbis_LIBS) $(vorbisenc_LIBS) \
+                  $(wavpack_LIBS) \

diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
new file mode 100644
index 000000000000..a7fb369cb1c2
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
@@ -0,0 +1,136 @@
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp	2023-08-13 19:40:59.245935911 +0200
++++ aqualung-1.2/src/decoder/dec_mac.cpp	2023-08-13 19:41:33.660933860 +0200
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <glib.h>
+ 
+ 
+ /* expand this to nothing so there's no error when including MACLib.h */
+@@ -60,16 +61,16 @@
+ 
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++        APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 
+-	int act_read = 0;
++	APE::int64 act_read = 0;
+ 	unsigned long scale = 1 << (pd->bits_per_sample - 1);
+ 	float fbuf[2 * BLOCKS_PER_READ];
+ 	int n = 0;
+ 
+ 	switch (pd->bits_per_sample) {
+ 	case 8:
+-		char data8[2 * BLOCKS_PER_READ];
++		unsigned char data8[2 * BLOCKS_PER_READ];
+ 		pdecompress->GetData(data8, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+@@ -84,7 +85,7 @@
+ 
+ 	case 16:
+ 		short data16[2 * BLOCKS_PER_READ];
+-		pdecompress->GetData((char *)data16, BLOCKS_PER_READ, &act_read);
++		pdecompress->GetData((unsigned char *)data16, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+ 		}
+@@ -100,7 +101,7 @@
+ 
+ 	case 32:
+ 		int data32[2 * BLOCKS_PER_READ];
+-		pdecompress->GetData((char *)data32, BLOCKS_PER_READ, &act_read);
++		pdecompress->GetData((unsigned char *)data32, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+ 		}
+@@ -170,31 +171,33 @@
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+ 	metadata_t * meta;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 	const char * comp_level = NULL;
+ 
+ 
+ 	int ret = 0;
+ #ifdef __OpenBSD__
+         wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-#else
+-        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+-#endif
+         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+         free(pUTF16);
++#else
++        gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
++        pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret, FALSE, FALSE, FALSE);
++        g_free(pUTF16);
++#endif
+ 
+         if (!pdecompress || ret != ERROR_SUCCESS) {
+                 return DECODER_OPEN_BADLIB;
+         }
+ 
+ 	pd->decompress = (void *)pdecompress;
+-        pd->sample_rate = pdecompress->GetInfo(APE_INFO_SAMPLE_RATE);
+-        pd->bits_per_sample = pdecompress->GetInfo(APE_INFO_BITS_PER_SAMPLE);
+-        pd->bitrate = pdecompress->GetInfo(APE_DECOMPRESS_AVERAGE_BITRATE);
+-        pd->channels = pdecompress->GetInfo(APE_INFO_CHANNELS);
+-        pd->length_in_ms = pdecompress->GetInfo(APE_DECOMPRESS_LENGTH_MS);
+-        pd->block_align = pdecompress->GetInfo(APE_INFO_BLOCK_ALIGN);
+-	pd->compression_level = pdecompress->GetInfo(APE_INFO_COMPRESSION_LEVEL);
++        pd->sample_rate = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_SAMPLE_RATE);
++        pd->bits_per_sample = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_BITS_PER_SAMPLE);
++        pd->bitrate = pdecompress->GetInfo(APE::IAPEDecompress::APE_DECOMPRESS_AVERAGE_BITRATE);
++        pd->channels = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_CHANNELS);
++        pd->length_in_ms = pdecompress->GetInfo(APE::IAPEDecompress::APE_DECOMPRESS_LENGTH_MS);
++        pd->block_align = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_BLOCK_ALIGN);
++	pd->compression_level = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_COMPRESSION_LEVEL);
+ 
+ 	if ((pd->channels != 1) && (pd->channels != 2)) {
+ 		printf("Sorry, MAC file with %d channels is not supported.\n", pd->channels);
+@@ -218,19 +221,19 @@
+ 	fdec->file_lib = MAC_LIB;
+ 
+ 	switch (pd->compression_level) {
+-	case COMPRESSION_LEVEL_FAST:
++	case APE_COMPRESSION_LEVEL_FAST:
+ 		comp_level = _("Compression: Fast");
+ 		break;
+-	case COMPRESSION_LEVEL_NORMAL:
++	case APE_COMPRESSION_LEVEL_NORMAL:
+ 		comp_level = _("Compression: Normal");
+ 		break;
+-	case COMPRESSION_LEVEL_HIGH:
++	case APE_COMPRESSION_LEVEL_HIGH:
+ 		comp_level = _("Compression: High");
+ 		break;
+-	case COMPRESSION_LEVEL_EXTRA_HIGH:
++	case APE_COMPRESSION_LEVEL_EXTRA_HIGH:
+ 		comp_level = _("Compression: Extra High");
+ 		break;
+-	case COMPRESSION_LEVEL_INSANE:
++	case APE_COMPRESSION_LEVEL_INSANE:
+ 		comp_level = _("Compression: Insane");
+ 		break;
+ 	default:
+@@ -255,7 +258,7 @@
+ mac_decoder_close(decoder_t * dec) {
+ 
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 
+ 	delete(pdecompress);
+ 	rb_free(pd->rb);
+@@ -294,7 +297,7 @@
+ 	
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 	char flush_dest;
+ 
+ 	pdecompress->Seek(seek_to_pos);

diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch b/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch
new file mode 100644
index 000000000000..3296bd67ad7e
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch
@@ -0,0 +1,73 @@
+From d2c88317b6042a05c236faf3c09f600337c6379e Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Tue, 5 Sep 2023 17:48:00 +0100
+Subject: [PATCH] Fix the Monkey's Audio decoder to work with current Monkey's
+ Audio (Fixes #33)
+
+Using g_utf8_to_utf16 doesn't work because current Monkey's Audio
+expects a different endianness of the multibyte character string.
+Using GetUTF16FromANSI works for compiling only if namedspaced
+correctly, and if namespaced correctly, it cannot link. Use a
+similar approach for building the correct multibyte string.
+
+Remove the DLLEXPORT define, to avoid a warning when including
+the MAC headers.
+
+Tested using the Monkey's Audio 10.20 SDK.
+---
+ src/decoder/dec_mac.cpp | 25 ++++++++++---------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index b007f74..6d4b658 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -27,14 +27,9 @@
+ #include <glib.h>
+ 
+ 
+-/* expand this to nothing so there's no error when including MACLib.h */
+-/* -- talkin' about cross-platform libraries? */
+-#define DLLEXPORT
+-
+ #include "../undef_ac_pkg.h"
+ #include <MAC/All.h>
+ #include <MAC/MACLib.h>
+-#include <MAC/CharacterHelper.h>
+ #include "../undef_ac_pkg.h"
+ #include <config.h>	/* re-establish undefined autoconf macros */
+ 
+@@ -48,7 +43,6 @@
+ 
+ extern size_t sample_size;
+ 
+-
+ #define BLOCKS_PER_READ 2048
+ 
+ 
+@@ -176,15 +170,16 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+ 
+ 
+ 	int ret = 0;
+-#ifdef __OpenBSD__
+-        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-        pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+-        free(pUTF16);
+-#else
+-        gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
+-        pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret, FALSE, FALSE, FALSE);
+-        g_free(pUTF16);
+-#endif
++        int filename_len = strlen(filename);
++        int i;
++        APE::str_utfn * filename_utf16 = new APE::str_utfn [static_cast<size_t>(filename_len) + 1];
++
++        for (i = 0; i < filename_len; i++)
++            filename_utf16[i] = (APE::str_utfn)(APE::str_utf8)filename[i];
++        filename_utf16[i] = 0;
++
++        pdecompress = CreateIAPEDecompress(filename_utf16, &ret, FALSE, FALSE, FALSE);
++        delete [] filename_utf16;
+ 
+         if (!pdecompress || ret != ERROR_SUCCESS) {
+                 return DECODER_OPEN_BADLIB;

diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch b/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch
new file mode 100644
index 000000000000..59aee6432581
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch
@@ -0,0 +1,22 @@
+From 1c2a295a72e1e3abc6df40714d9753e311541550 Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Wed, 6 Sep 2023 09:02:31 +0100
+Subject: [PATCH] Remove now unnecessary glib include in mac decoder
+
+Pointed out by Daniel Pielmeier.
+---
+ src/decoder/dec_mac.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index 6d4b658..f89450d 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -24,7 +24,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib.h>
+ 
+ 
+ #include "../undef_ac_pkg.h"


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/
@ 2025-03-10 16:57 Daniel Pielmeier
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier @ 2025-03-10 16:57 UTC (permalink / raw
  To: gentoo-commits

commit:     4ea6bbc3fa2bdb3de0c9ab4e06bcd82be54cb5d1
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 10 16:56:53 2025 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 16:56:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea6bbc3

media-sound/aqualung: Add missing patch

Closes: https://bugs.gentoo.org/951105
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../aqualung/files/aqualung-2.0-configure.patch    | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/media-sound/aqualung/files/aqualung-2.0-configure.patch b/media-sound/aqualung/files/aqualung-2.0-configure.patch
new file mode 100644
index 000000000000..6022b1c0f929
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-2.0-configure.patch
@@ -0,0 +1,23 @@
+From ecb4cd11d6eefaf8b4a97d837a986623bcff653a Mon Sep 17 00:00:00 2001
+From: Daniel Pielmeier <billie80@users.noreply.github.com>
+Date: Sun, 9 Mar 2025 14:01:28 +0100
+Subject: [PATCH] Fix typo in configure.ac
+
+The platform defines added  in commit 8e62717 introduced an unnecessary comma which results in a configure warning.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8113679..dac7b39 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@ AQUALUNG_DETECT([lavc], [Libav / FFmpeg],
+ AQUALUNG_DETECT([MAC], [Monkey's Audio Codec],
+     [AC_CHECK_LIB([MAC], [CreateIAPEDecompress],
+         [
+-          AQUALUNG_FOUND([MAC], [-lMAC -lstdc++]),
++          AQUALUNG_FOUND([MAC], [-lMAC -lstdc++])
+           AS_CASE([$host_os],
+             [cygwin*|mingw*], [AC_DEFINE([PLATFORM_WINDOWS], [1], [Defined if Windows])],
+             [darwin*], [AC_DEFINE([PLATFORM_DARWIN], [1], [Defined if Darwin])],


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

end of thread, other threads:[~2025-03-10 16:57 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 16:57 [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/ Daniel Pielmeier
  -- strict thread matches above, loose matches on Subject: below --
2023-09-30 14:48 Daniel Pielmeier
2023-08-13 14:04 Daniel Pielmeier
2018-01-17 16:43 Daniel Pielmeier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox