bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sdl_mixer: update to latest git tree

Browse Source 
The latest officially released version of SDL_mixer is 1.2.12, released
in 2012. Since then, there have been many bugfixes on master.

SDL's canonical source is now on GitHub. This commit points to the
SDL-1.2 branch from 15 Mar 2021.

Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
[yann.morin.1998@free.fr:
  - use full-length commit hash
  - two spaces in hash file
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Gleb Mazovetskiy
2021-03-21 07:17:04 +00:00
committed by Yann E. MORIN
parent 1ea69180e2
commit c8e27f3baa
6 changed files with 22 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file
In order to support static linking, SDL_mixer.pc should include a In order to support static linking, SDL_mixer.pc should include a
'Libs.private' field listing all the libraries that SDL_mixer requires. 'Libs.private' field listing all the libraries that SDL_mixer requires.
This patch adds such a field and also modifies configure.in so that This patch adds such a field and also modifies configure.ac so that
EXTRA_LDFLAGS (which is now also used as the value of 'Libs.private') EXTRA_LDFLAGS (which is now also used as the value of 'Libs.private')
no longer includes SDL_LIBS. This is done so as to prevent libraries no longer includes SDL_LIBS. This is done so as to prevent libraries
required by SDL from being listed twice when 'pkg-config --libs --static required by SDL from being listed twice when 'pkg-config --libs --static
@@ -20,14 +20,14 @@ Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
--- ---
Makefile.in | 2 +- Makefile.in | 2 +-
SDL_mixer.pc.in | 1 + SDL_mixer.pc.in | 1 +
configure.in | 1 - configure.ac | 1 -
3 files changed, 2 insertions(+), 2 deletions(-) 3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 3d10565..ce4efd4 100644 index 027a99b..18015a2 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -63,7 +63,7 @@ $(objects): @@ -61,7 +61,7 @@ $(objects):
.PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
@@ -35,7 +35,7 @@ index 3d10565..ce4efd4 100644
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in
index 1c4965d..d793521 100644 index 1c4965d..d793521 100644
--- a/SDL_mixer.pc.in --- a/SDL_mixer.pc.in
@@ -47,11 +47,11 @@ index 1c4965d..d793521 100644
+Libs.private: @EXTRA_LDFLAGS@ +Libs.private: @EXTRA_LDFLAGS@
Cflags: -I${includedir}/SDL Cflags: -I${includedir}/SDL
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
index 2272b29..442eca6 100644 index 01a3d83..3ad3b4f 100644
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -202,7 +202,6 @@ AM_PATH_SDL($SDL_VERSION, @@ -200,7 +200,6 @@ AM_PATH_SDL($SDL_VERSION,
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
) )
EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS"
@@ -60,5 +60,4 @@ index 2272b29..442eca6 100644
dnl Check for math library dnl Check for math library
AC_CHECK_LIB(m, pow, [LIBM="-lm"]) AC_CHECK_LIB(m, pow, [LIBM="-lm"])
-- --
2.1.4 2.27.0

29
package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch
View File

@@ -1,29 +0,0 @@
Pass LDFLAGS while creating binaries.
Fixes following linking error with uClibc-ng:
br/output/host/usr/lib/gcc/powerpc-buildroot-linux-uclibc/5.4.0/libgcc.a(unwind-dw2-fde-dip.o): In function `_Unwind_Find_FDE':
br/output/build/host-gcc-final-5.4.0/build/powerpc-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde-dip.c:465: undefined reference to `dl_iterate_phdr'
collect2: error: ld returned 1 exit status
Since uClibc-ng 1.0.18 a circular dependency between libc and libgcc
exist, when static linking is used. It can be resolved by the compiler
when -static is correctly passed in the linking step.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff -Nur SDL_mixer-1.2.12.orig/Makefile.in SDL_mixer-1.2.12/Makefile.in
--- SDL_mixer-1.2.12.orig/Makefile.in 2012-01-15 23:01:04.000000000 +0100
+++ SDL_mixer-1.2.12/Makefile.in 2016-12-07 08:29:22.479786596 +0100
@@ -66,10 +66,10 @@
$(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) $(SDL_LIBS) $(objects)/$(TARGET)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
install: all install-hdrs install-lib #install-bin
install-hdrs:

6
package/sdl_mixer/0004-configure__set_macro_directory.patch → package/sdl_mixer/0002-configure__set_macro_directory.patch
View File

@@ -21,9 +21,9 @@ Fixes:
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(README) AC_INIT(README)

33
package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
View File

@@ -1,33 +0,0 @@
From fb8e7c535a88838cc8ae364cd2a099df6316d3b0 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul@crapouillou.net>
Date: Tue, 30 Apr 2019 23:12:15 +0200
Subject: [PATCH] Fix include of modplug.h
The include path should be <libmodplug/modplug.h>, since the library
doesn't provide any specific include path in its pkg-config file.
This patch was obtained from this bug report:
https://bugzilla.libsdl.org/show_bug.cgi?id=4893
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
music_modplug.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/music_modplug.h b/music_modplug.h
index 92cbafd..49abbb0 100644
--- a/music_modplug.h
+++ b/music_modplug.h
@@ -1,6 +1,7 @@
#ifdef MODPLUG_MUSIC
-#include "modplug.h"
+#include <libmodplug/modplug.h>
+
#include "SDL_rwops.h"
#include "SDL_audio.h"
#include "SDL_mixer.h"
--
2.21.0.593.g511ec345e18

4
package/sdl_mixer/sdl_mixer.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SDL_mixer-1.2.12.tar.gz sha256 b3c0f36500b23a6f5832d472f3e07b74f1d3f6bd00bf6700bc5e99babc9ba2ab sdl_mixer-d1725fcb7c4e987aeb7ecdc94cb8b6375b702170.tar.gz
sha256 bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e COPYING sha256 bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e COPYING

9
package/sdl_mixer/sdl_mixer.mk
View File

@@ -4,9 +4,12 @@
# #
################################################################################ ################################################################################
SDL_MIXER_VERSION = 1.2.12 # The latest officially released version of SDL_mixer is 1.2.12, released in 2012.
SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz # Since then, there have been many bugfixes on master.
SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release #
# This commit points to the SDL-1.2 branch from 15 Mar 2021.
SDL_MIXER_VERSION = d1725fcb7c4e987aeb7ecdc94cb8b6375b702170
SDL_MIXER_SITE = $(call github,libsdl-org,SDL_mixer,$(SDL_MIXER_VERSION))
SDL_MIXER_LICENSE = Zlib SDL_MIXER_LICENSE = Zlib
SDL_MIXER_LICENSE_FILES = COPYING SDL_MIXER_LICENSE_FILES = COPYING