diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 96c7cc4550..e239e54ea5 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -216,7 +216,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`SDL2-GNUBoy`](SDL2-GNUBoy/) | SDL2 GNUBoy | 1.2.1 | https://github.com/AlexOberhofer/SDL2-GNUBoy | | [`SDL2_gfx`](SDL2_gfx/) | SDL2\_gfx (Graphics primitives add-on for SDL2) | 1.0.4 | https://sourceforge.net/projects/sdl2gfx/ | | [`SDL2_image`](SDL2_image/) | SDL2\_image (Image loading add-on for SDL2) | 2.6.2 | https://github.com/libsdl-org/SDL_image | -| [`SDL2_mixer`](SDL2_mixer/) | SDL2\_mixer (audio mixer add-on for SDL2) | 2.0.4 | https://www.libsdl.org/projects/SDL_mixer/ | +| [`SDL2_mixer`](SDL2_mixer/) | SDL2\_mixer (Audio mixer add-on for SDL2) | 2.6.2 | https://github.com/libsdl-org/SDL_mixer | | [`SDL2_net`](SDL2_net/) | SDL2\_net (network add-on for SDL2) | 2.0.1 | https://www.libsdl.org/projects/SDL_net/ | | [`SDL2_sound`](SDL2_sound/) | SDL2\_sound (Abstract soundfile decoder add-on for SDL2) | | https://github.com/icculus/SDL_sound | | [`SDL2_ttf`](SDL2_ttf/) | SDL2\_ttf (TrueType Font add-on for SDL2) | 2.0.18 | https://www.libsdl.org/projects/SDL_ttf/ | diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh index 88d9d7c22d..aa30acd6d3 100755 --- a/Ports/SDL2_mixer/package.sh +++ b/Ports/SDL2_mixer/package.sh @@ -1,11 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=SDL2_mixer -version=2.0.4 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-scripts/config.sub") -files="https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz SDL2_mixer-${version}.tar.gz b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419" -auth_type=sha256 +port='SDL2_mixer' +version='2.6.2' +useconfigure='true' +files="https://github.com/libsdl-org/SDL_mixer/releases/download/release-${version}/SDL2_mixer-${version}.tar.gz SDL2_mixer-${version}.tar.gz 8cdea810366decba3c33d32b8071bccd1c309b2499a54946d92b48e6922aa371" +auth_type='sha256' depends=("libmodplug" "libmpg123" "libvorbis" "SDL2") configure() { diff --git a/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch deleted file mode 100644 index 48951efc19..0000000000 --- a/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Andreas Kling -Date: Mon, 8 Mar 2021 13:15:35 +0100 -Subject: [PATCH] Skip building the playmus and playwav utilities - ---- - Makefile.in | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 2ff24b2..0e120a1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -38,7 +38,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@ - PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@ - PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@ - --DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_opus.c music_opus.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc -+DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_opus.c music_opus.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi timidity version.rc - - LT_AGE = @LT_AGE@ - LT_CURRENT = @LT_CURRENT@ -@@ -46,7 +46,7 @@ LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ - LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE) -+all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) - - $(srcdir)/configure: $(srcdir)/configure.in - @echo "Warning, configure.in is out of date" -@@ -64,12 +64,6 @@ $(objects): - $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - --$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(objects)/$(TARGET) $(SDL_LIBS) $(LDFLAGS) -- --$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(objects)/$(TARGET) $(SDL_LIBS) $(LDFLAGS) -- - install: all install-hdrs install-lib #install-bin - install-hdrs: - $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL2 -@@ -84,8 +78,6 @@ install-lib: $(objects) $(objects)/$(TARGET) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) - install-bin: - $(SHELL) $(auxdir)/mkinstalldirs $(bindir) -- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE) -- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) - - uninstall: uninstall-hdrs uninstall-lib uninstall-bin - uninstall-hdrs: -@@ -99,8 +91,6 @@ uninstall-hdrs: - uninstall-lib: - $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET) - uninstall-bin: -- rm -f $(bindir)/playwave$(EXE) -- rm -f $(bindir)/playmus$(EXE) - - clean: - rm -rf $(objects) diff --git a/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwave-utilities.patch b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwave-utilities.patch new file mode 100644 index 0000000000..f702c1eca7 --- /dev/null +++ b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwave-utilities.patch @@ -0,0 +1,71 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andreas Kling +Date: Mon, 8 Mar 2021 13:15:35 +0100 +Subject: [PATCH] Skip building the playmus and playwave utilities + +--- + Makefile.in | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 006a8fb..8cbee0c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -37,8 +37,6 @@ SDL_LIBS = @SDL_LIBS@ + TARGET = libSDL2_mixer.la + OBJECTS = @OBJECTS@ + VERSION_OBJECTS = @VERSION_OBJECTS@ +-PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@ +-PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@ + + SRC_DIST = \ + .gitmodules \ +@@ -64,8 +62,6 @@ SRC_DIST = \ + external/download.sh \ + include/SDL_mixer.h \ + mingw \ +- playmus.c \ +- playwave.c \ + sdl2_mixer-config-version.cmake.in \ + sdl2_mixer-config.cmake.in \ + src \ +@@ -80,7 +76,7 @@ LT_REVISION = @LT_REVISION@ + LT_EXTRA = @LT_EXTRA@ + LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA) + +-all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE) ++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) + + $(srcdir)/configure: $(srcdir)/configure.ac + @echo "Warning, configure is out of date, please re-run autogen.sh" +@@ -97,12 +93,6 @@ $(objects)/.created: + $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDL_LIBS) $(MIXER_LIBS) + +-$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(objects)/$(TARGET) $(SDL_LIBS) $(LDFLAGS) +- +-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(objects)/$(TARGET) $(SDL_LIBS) $(LDFLAGS) +- + install: all install-hdrs install-lib #install-bin + install-hdrs: + $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL2 +@@ -120,8 +110,6 @@ install-lib: $(objects)/$(TARGET) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) + install-bin: + $(SHELL) $(auxdir)/mkinstalldirs $(bindir) +- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE) +- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) + + uninstall: uninstall-hdrs uninstall-lib uninstall-bin + uninstall-hdrs: +@@ -139,8 +127,6 @@ uninstall-hdrs: + uninstall-lib: + $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET) + uninstall-bin: +- rm -f $(bindir)/playwave$(EXE) +- rm -f $(bindir)/playmus$(EXE) + + clean: + rm -rf $(objects) diff --git a/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch index b77f01ad3a..854dd3d6d3 100644 --- a/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch +++ b/Ports/SDL2_mixer/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -13,15 +13,15 @@ Fix that by just adding the appropriate configuration options for automatically using libtool, without having to manually link the static library into a shared library. --- - configure | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) + configure | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) diff --git a/configure b/configure -index 4df0be5..9a5f606 100755 +index a4d59fc..dddffd3 100755 --- a/configure +++ b/configure -@@ -4480,6 +4480,10 @@ sysv4 | sysv4.3*) - tpf*) +@@ -5503,6 +5503,10 @@ tpf*) + os2*) lt_cv_deplibs_check_method=pass_all ;; + @@ -31,7 +31,7 @@ index 4df0be5..9a5f606 100755 esac fi -@@ -7268,6 +7272,10 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8176,6 +8180,10 @@ printf %s "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-Bstatic' ;; @@ -42,7 +42,7 @@ index 4df0be5..9a5f606 100755 *) lt_prog_compiler_can_build_shared=no ;; -@@ -8504,6 +8512,10 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9464,6 +9472,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ hardcode_shlibpath_var=no ;; @@ -53,7 +53,25 @@ index 4df0be5..9a5f606 100755 *) ld_shlibs=no ;; -@@ -9406,6 +9418,17 @@ uts4*) +@@ -10389,6 +10401,17 @@ uts4*) + shlibpath_var=LD_LIBRARY_PATH + ;; + ++serenity*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}${versuffix} ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}${major}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ dynamic_linker='SerenityOS LibELF' ++ ;; ++ + *) + dynamic_linker=no + ;; +@@ -15570,6 +15593,17 @@ uts4*) shlibpath_var=LD_LIBRARY_PATH ;; diff --git a/Ports/SDL2_mixer/patches/ReadMe.md b/Ports/SDL2_mixer/patches/ReadMe.md index 4509c5b1cd..ac0af91fee 100644 --- a/Ports/SDL2_mixer/patches/ReadMe.md +++ b/Ports/SDL2_mixer/patches/ReadMe.md @@ -1,8 +1,8 @@ # Patches for SDL2_mixer on SerenityOS -## `0001-Skip-building-the-playmus-and-playwav-utilities.patch` +## `0001-Skip-building-the-playmus-and-playwave-utilities.patch` -Skip building the playmus and playwav utilities +Skip building the playmus and playwave utilities ## `0002-libtool-Enable-shared-library-support-for-SerenityOS.patch`