Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

audacious*: update to 4.4.2, fix big-endian back #26547

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions audio/audacious-core/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name audacious-core
set real_name audacious

# Please keep audacious, audacious-core and audacious-plugins synchronized.
version 4.4.1
version 4.4.2
revision 0

license BSD
Expand All @@ -30,9 +30,9 @@ long_description ${description} It is free, lightweight, based on GTK3, \
master_sites https://distfiles.audacious-media-player.org
distname ${real_name}-${version}
use_bzip2 yes
checksums rmd160 8504f58e4b0fcc95520ae9cc31858bb4401525d1 \
sha256 260d988d168e558f041bbb56692e24c535a96437878d60dfd01efdf6b1226416 \
size 636301
checksums rmd160 7a195d96a2b4f8d449c2e182a964059ff862f65a \
sha256 34509504f8c93b370420d827703519f0681136672e42d56335f26f7baec95005 \
size 636838

universal_variant no

Expand All @@ -54,6 +54,11 @@ configure.args -Ddbus=true \
depends_build-append \
path:bin/pkg-config:pkgconfig

# This issue was supposed to be fixed, but it did not work as intended.
# Temporarily revert upstream commit and restore our patch. This is tested.
# https://github.com/audacious-media-player/audacious-plugins/pull/166
patchfiles-append patch-big-endian.diff

post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${real_name}
move ${destroot}${prefix}/share/${real_name}/AUTHORS \
Expand Down
12 changes: 12 additions & 0 deletions audio/audacious-core/files/patch-big-endian.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Reverts https://github.com/audacious-media-player/audacious/commit/9e51ffa0c0ec79b537cc970158d51557273970ea

--- src/config.h.meson 2024-11-04 04:00:44.000000000 +0800
+++ src/config.h.meson 2024-11-11 02:05:46.000000000 +0800
@@ -5,7 +5,6 @@
#mesondefine EXPORT
#mesondefine PLUGIN_SUFFIX
#mesondefine VALGRIND_FRIENDLY
-#mesondefine WORDS_BIGENDIAN

#define PACKAGE_VERSION VERSION
#define ICONV_CONST
19 changes: 15 additions & 4 deletions audio/audacious-plugins/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup active_variants 1.1
name audacious-plugins

# Please keep audacious, audacious-core and audacious-plugins synchronized.
version 4.4.1
version 4.4.2
revision 0

# FIXME: probably more licenses involved here...
Expand All @@ -27,9 +27,9 @@ long_description This ports bundles most of the functionality for audacious.

master_sites https://distfiles.audacious-media-player.org
use_bzip2 yes
checksums rmd160 0e7622a61287868735a8bf9be8bfcceb1ace4f07 \
sha256 484ed416b1cf1569ce2cc54208e674b9c516118485b94ce577d7bc5426d05976 \
size 1815238
checksums rmd160 3ce31585b2721e32d219f987864b7369c7bbcc93 \
sha256 50f494693b6b316380fa718c667c128aa353c01e954cd77a65c9d8aedf18d4bd \
size 1816431

universal_variant no

Expand Down Expand Up @@ -128,6 +128,17 @@ configure.args-append \
configure.args-append \
-Dmoonstone=false

# This issue was supposed to be fixed, but it did not work as intended.
# Temporarily revert upstream commit and restore our patch. This is tested.
# https://github.com/audacious-media-player/audacious-plugins/pull/166
patchfiles-append 0001-xsf-desmume-types.h-ensure-LOCAL_BE-gets-defined-on-.patch \
patch-big-endian.diff

# SPInvocationGrabbing.m: error: '-fobjc-exceptions' is required to enable Objective-C exception syntax
# SPInvocationGrabbing.m: error: 'for' loop initial declarations are only allowed in C99 or C11 mode
# SPInvocationGrabbing.m: note: use option '-std=c99', '-std=gnu99', '-std=c11' or '-std=gnu11' to compile your code
# patchfiles-append 0002-mac-media-keys-use-correct-objc-flags.patch

# Even if we disable blocks to make it build with GCC, it is broken
# and outputs only hiss. Use SDL audio out instead, until fixed.
# FIXME: https://github.com/audacious-media-player/audacious/issues/1440
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 343d20c6ece2d48dba06a8ba4f474499a8a3a1f0 Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <[email protected]>
Date: Thu, 25 Jul 2024 23:33:55 +0800
Subject: [PATCH] xsf/desmume/types.h: ensure LOCAL_BE gets defined on
Big-endian platforms

---
src/xsf/desmume/types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git src/xsf/desmume/types.h src/xsf/desmume/types.h
index 61d858cec..d3113fccd 100644
--- src/xsf/desmume/types.h
+++ src/xsf/desmume/types.h
@@ -96,7 +96,7 @@ using s8 = int8_t;

/*----------------------*/

-#ifdef __BIG_ENDIAN__
+#if defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
# ifndef WORDS_BIGENDIAN
# define WORDS_BIGENDIAN
# endif
12 changes: 12 additions & 0 deletions audio/audacious-plugins/files/patch-big-endian.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Reverts https://github.com/audacious-media-player/audacious-plugins/commit/c175d8b9cece8a53d86ce54fc252454287814e9e

--- src/config.h.meson 2024-11-04 04:02:39.000000000 +0800
+++ src/config.h.meson 2024-11-11 02:06:51.000000000 +0800
@@ -3,7 +3,6 @@
#mesondefine COPYRIGHT
#mesondefine EXPORT
#mesondefine PLUGIN_SUFFIX
-#mesondefine WORDS_BIGENDIAN

#define PACKAGE_VERSION VERSION
#define ICONV_CONST
2 changes: 1 addition & 1 deletion audio/audacious/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PortSystem 1.0
name audacious

# Please keep audacious, audacious-core and audacious-plugins synchronized.
version 4.4.1
version 4.4.2
revision 0

license BSD GPL-2+
Expand Down